summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2012-12-23 15:19:32 +0100
committerNicolas Schodet2012-12-23 15:32:51 +0100
commit87e67c28d9bbc17517481d6c90c0af40b5638b81 (patch)
tree488d2a766dbd8e589e21fe913ce4c2a3284dcde9
parent91e17a6aa0060edf354285e25de6c18c89b69e95 (diff)
digital/ucoolib/ucoolib/arch: add HostStream
To be used to implement various streams host version.
-rw-r--r--digital/ucoolib/ucoolib/arch/Module3
-rw-r--r--digital/ucoolib/ucoolib/arch/host_stream.hh52
-rw-r--r--digital/ucoolib/ucoolib/arch/host_stream.host.cc103
3 files changed, 157 insertions, 1 deletions
diff --git a/digital/ucoolib/ucoolib/arch/Module b/digital/ucoolib/ucoolib/arch/Module
index 6c23a203..65e88b6b 100644
--- a/digital/ucoolib/ucoolib/arch/Module
+++ b/digital/ucoolib/ucoolib/arch/Module
@@ -1 +1,2 @@
-arch_SOURCES := arch.host.cc arch.stm32.cc syscalls.newlib.cc syscalls.cc
+arch_SOURCES := arch.host.cc arch.stm32.cc syscalls.newlib.cc syscalls.cc \
+ host_stream.host.cc
diff --git a/digital/ucoolib/ucoolib/arch/host_stream.hh b/digital/ucoolib/ucoolib/arch/host_stream.hh
new file mode 100644
index 00000000..53512250
--- /dev/null
+++ b/digital/ucoolib/ucoolib/arch/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_stream.host.cc b/digital/ucoolib/ucoolib/arch/host_stream.host.cc
new file mode 100644
index 00000000..6bf5f8b9
--- /dev/null
+++ b/digital/ucoolib/ucoolib/arch/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 <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+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