X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fserial.h;h=b2194821e2691278877d473f8e30b552b3a42de7;hp=069789c85097a69e8510d347ca43a02630009a2a;hb=1e545df21512e2d41dd16b337eca3944c1ab52aa;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/io/serial.h b/source/io/serial.h
index 069789c..b219482 100644
--- a/source/io/serial.h
+++ b/source/io/serial.h
@@ -1,12 +1,14 @@
 #ifndef MSP_IO_SERIAL_H_
 #define MSP_IO_SERIAL_H_
 
-#include "base.h"
+#include "eventobject.h"
+#include "eventreader.h"
+#include "handle.h"
 
 namespace Msp {
 namespace IO {
 
-class Serial: public Base
+class Serial: public EventObject
 {
 public:
 	enum Parity
@@ -17,10 +19,16 @@ public:
 	};
 
 private:
+	struct DeviceState;
+
 	Handle handle;
+	EventReader reader;
 
 public:
 	Serial(const std::string &);
+private:
+	void platform_init(const std::string &);
+public:
 	virtual ~Serial();
 
 private:
@@ -40,7 +48,8 @@ private:
 	virtual unsigned do_read(char *, unsigned);
 
 public:
-	virtual Handle get_event_handle();
+	virtual const Handle &get_handle(Mode);
+	virtual const Handle &get_event_handle() { return reader.get_event(); }
 };
 
 } // namespace IO