Encapsulate serial device state into a struct

[libs/core.git] / source / io / serial.h

diff --git a/source/io/serial.h b/source/io/serial.h
index 98b16674b464d098f7c051e72b5837c68d1fa797..49ecefbc8fd02f30dea512610cb40ae966781a06 100644 (file)
--- a/source/io/serial.h
+++ b/source/io/serial.h
@@ -2,6 +2,7 @@
 #define MSP_IO_SERIAL_H_
 
 #include "eventobject.h"
+#include "eventreader.h"
 #include "handle.h"
 
 namespace Msp {
@@ -18,7 +19,10 @@ public:
        };
 
 private:
+       struct DeviceState;
+
        Handle handle;
+       EventReader reader;
 
 public:
        Serial(const std::string &);
@@ -41,7 +45,7 @@ private:
        virtual unsigned do_read(char *, unsigned);
 
 public:
-       virtual const Handle &get_event_handle();
+       virtual const Handle &get_event_handle() { return reader.get_event(); }
 };
 
 } // namespace IO