From 3ca2477ed2b7d684c3fc13baad39ca8dc064ae67 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Tue, 19 Feb 2013 21:19:18 +0100 Subject: digital/ucoolib/ucoolib/arch: move host file to subdirectory --- digital/ucoolib/build/setup.mk | 2 +- digital/ucoolib/ucoolib/arch/Module | 3 +- digital/ucoolib/ucoolib/arch/host/Module | 1 + digital/ucoolib/ucoolib/arch/host/host_stream.hh | 52 +++++++++++ .../ucoolib/ucoolib/arch/host/host_stream.host.cc | 103 +++++++++++++++++++++ digital/ucoolib/ucoolib/arch/host_stream.hh | 52 ----------- digital/ucoolib/ucoolib/arch/host_stream.host.cc | 103 --------------------- digital/ucoolib/ucoolib/base/test/test.host.cc | 2 +- 8 files changed, 159 insertions(+), 159 deletions(-) create mode 100644 digital/ucoolib/ucoolib/arch/host/Module create mode 100644 digital/ucoolib/ucoolib/arch/host/host_stream.hh create mode 100644 digital/ucoolib/ucoolib/arch/host/host_stream.host.cc delete mode 100644 digital/ucoolib/ucoolib/arch/host_stream.hh delete mode 100644 digital/ucoolib/ucoolib/arch/host_stream.host.cc diff --git a/digital/ucoolib/build/setup.mk b/digital/ucoolib/build/setup.mk index 35d4961e..b2a9de32 100644 --- a/digital/ucoolib/build/setup.mk +++ b/digital/ucoolib/build/setup.mk @@ -4,7 +4,7 @@ TARGETS ?= host -DEFAULT_MODULES ?= intf arch arch/host/mex +DEFAULT_MODULES ?= intf arch arch/host arch/host/mex ALL_PROGS := $(PROGS) $(foreach target,$(TARGETS),$($(target)_PROGS)) diff --git a/digital/ucoolib/ucoolib/arch/Module b/digital/ucoolib/ucoolib/arch/Module index 65e88b6b..6c23a203 100644 --- a/digital/ucoolib/ucoolib/arch/Module +++ b/digital/ucoolib/ucoolib/arch/Module @@ -1,2 +1 @@ -arch_SOURCES := arch.host.cc arch.stm32.cc syscalls.newlib.cc syscalls.cc \ - host_stream.host.cc +arch_SOURCES := arch.host.cc arch.stm32.cc syscalls.newlib.cc syscalls.cc diff --git a/digital/ucoolib/ucoolib/arch/host/Module b/digital/ucoolib/ucoolib/arch/host/Module new file mode 100644 index 00000000..64d12a80 --- /dev/null +++ b/digital/ucoolib/ucoolib/arch/host/Module @@ -0,0 +1 @@ +arch_host_SOURCES := host_stream.host.cc diff --git a/digital/ucoolib/ucoolib/arch/host/host_stream.hh b/digital/ucoolib/ucoolib/arch/host/host_stream.hh new file mode 100644 index 00000000..53512250 --- /dev/null +++ b/digital/ucoolib/ucoolib/arch/host/host_stream.hh @@ -0,0 +1,52 @@ +#ifndef ucoolib_arch_host_stream_hh +#define ucoolib_arch_host_stream_hh +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} +#include "ucoolib/intf/stream.hh" + +namespace ucoo { + +class HostStream : public Stream +{ + public: + /// Default constructor, use stdin/stdout. + HostStream (); + /// Close if needed. + ~HostStream (); + /// See Stream::block. + void block (bool block = true); + /// See Stream::read. + int read (char *buf, int count); + /// See Stream::write. + int write (const char *buf, int count); + /// See Stream::poll. + int poll (); + private: + /// Input and output file descriptors. + int fdi_, fdo_; +}; + +} // namespace ucoo + +#endif // ucoolib_arch_host_stream_hh diff --git a/digital/ucoolib/ucoolib/arch/host/host_stream.host.cc b/digital/ucoolib/ucoolib/arch/host/host_stream.host.cc new file mode 100644 index 00000000..6bf5f8b9 --- /dev/null +++ b/digital/ucoolib/ucoolib/arch/host/host_stream.host.cc @@ -0,0 +1,103 @@ +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} +#include "host_stream.hh" + +#include "ucoolib/common.hh" + +#include +#include +#include +#include +#include + +namespace ucoo { + +HostStream::HostStream () + : fdi_ (0), fdo_ (1) +{ +} + +HostStream::~HostStream () +{ + if (fdi_ != -1 && fdi_ != 0) + close (fdi_); + if (fdo_ != -1 && fdo_ != 1) + close (fdo_); +} + +void +HostStream::block (bool block) +{ + Stream::block (block); + // Do not care to use non blocking on output for host. However, if + // fdi_ == fdo_, this will change input and output. + int r = fcntl (fdi_, F_SETFL, block ? 0 : O_NONBLOCK); + assert_perror (r != -1); +} + +int +HostStream::read (char *buf, int count) +{ + int r = ::read (fdi_, buf, count); + if (r == 0) + return -2; + if (r == -1 && errno == EAGAIN) + return 0; + assert_perror (r != -1); + return r; +} + +int +HostStream::write (const char *buf, int count) +{ + int writen = 0; + while (writen < count) + { + int r = ::write (fdo_, buf + writen, count - writen); + if (r == -1 && errno == EAGAIN) + break; + assert_perror (r != -1); + writen += r; + } + return writen; +} + +int +HostStream::poll () +{ + fd_set fds; + struct timeval tv; + int r; + // Use select to poll. + FD_ZERO (&fds); + FD_SET (fdi_, &fds); + tv.tv_sec = 0; + tv.tv_usec = 0; + r = select (FD_SETSIZE, &fds, 0, 0, &tv); + // Check result. + assert_perror (r != -1); + return r; +} + +} // namespace ucoo diff --git a/digital/ucoolib/ucoolib/arch/host_stream.hh b/digital/ucoolib/ucoolib/arch/host_stream.hh deleted file mode 100644 index 53512250..00000000 --- a/digital/ucoolib/ucoolib/arch/host_stream.hh +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef ucoolib_arch_host_stream_hh -#define ucoolib_arch_host_stream_hh -// ucoolib - Microcontroller object oriented library. {{{ -// -// Copyright (C) 2012 Nicolas Schodet -// -// APBTeam: -// Web: http://apbteam.org/ -// Email: team AT apbteam DOT org -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -// }}} -#include "ucoolib/intf/stream.hh" - -namespace ucoo { - -class HostStream : public Stream -{ - public: - /// Default constructor, use stdin/stdout. - HostStream (); - /// Close if needed. - ~HostStream (); - /// See Stream::block. - void block (bool block = true); - /// See Stream::read. - int read (char *buf, int count); - /// See Stream::write. - int write (const char *buf, int count); - /// See Stream::poll. - int poll (); - private: - /// Input and output file descriptors. - int fdi_, fdo_; -}; - -} // namespace ucoo - -#endif // ucoolib_arch_host_stream_hh diff --git a/digital/ucoolib/ucoolib/arch/host_stream.host.cc b/digital/ucoolib/ucoolib/arch/host_stream.host.cc deleted file mode 100644 index 6bf5f8b9..00000000 --- a/digital/ucoolib/ucoolib/arch/host_stream.host.cc +++ /dev/null @@ -1,103 +0,0 @@ -// ucoolib - Microcontroller object oriented library. {{{ -// -// Copyright (C) 2012 Nicolas Schodet -// -// APBTeam: -// Web: http://apbteam.org/ -// Email: team AT apbteam DOT org -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -// }}} -#include "host_stream.hh" - -#include "ucoolib/common.hh" - -#include -#include -#include -#include -#include - -namespace ucoo { - -HostStream::HostStream () - : fdi_ (0), fdo_ (1) -{ -} - -HostStream::~HostStream () -{ - if (fdi_ != -1 && fdi_ != 0) - close (fdi_); - if (fdo_ != -1 && fdo_ != 1) - close (fdo_); -} - -void -HostStream::block (bool block) -{ - Stream::block (block); - // Do not care to use non blocking on output for host. However, if - // fdi_ == fdo_, this will change input and output. - int r = fcntl (fdi_, F_SETFL, block ? 0 : O_NONBLOCK); - assert_perror (r != -1); -} - -int -HostStream::read (char *buf, int count) -{ - int r = ::read (fdi_, buf, count); - if (r == 0) - return -2; - if (r == -1 && errno == EAGAIN) - return 0; - assert_perror (r != -1); - return r; -} - -int -HostStream::write (const char *buf, int count) -{ - int writen = 0; - while (writen < count) - { - int r = ::write (fdo_, buf + writen, count - writen); - if (r == -1 && errno == EAGAIN) - break; - assert_perror (r != -1); - writen += r; - } - return writen; -} - -int -HostStream::poll () -{ - fd_set fds; - struct timeval tv; - int r; - // Use select to poll. - FD_ZERO (&fds); - FD_SET (fdi_, &fds); - tv.tv_sec = 0; - tv.tv_usec = 0; - r = select (FD_SETSIZE, &fds, 0, 0, &tv); - // Check result. - assert_perror (r != -1); - return r; -} - -} // namespace ucoo diff --git a/digital/ucoolib/ucoolib/base/test/test.host.cc b/digital/ucoolib/ucoolib/base/test/test.host.cc index 3b28c92f..f792ede3 100644 --- a/digital/ucoolib/ucoolib/base/test/test.host.cc +++ b/digital/ucoolib/ucoolib/base/test/test.host.cc @@ -23,7 +23,7 @@ // }}} #include "test.hh" -#include "ucoolib/arch/host_stream.hh" +#include "ucoolib/arch/host/host_stream.hh" namespace ucoo { -- cgit v1.2.3