X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fserial.h;h=a07cd1fd43e404b3a0e82e603abff93388bd1cc0;hp=98b16674b464d098f7c051e72b5837c68d1fa797;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=c21ab7e49852585df01b4cc19599e25a918b581b

diff --git a/source/io/serial.h b/source/io/serial.h
index 98b1667..a07cd1f 100644
--- 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,17 +19,24 @@ public:
 	};
 
 private:
+	struct DeviceState;
+
 	Handle handle;
+	EventReader reader;
 
 public:
 	Serial(const std::string &);
-	virtual ~Serial();
+private:
+	void platform_init(const std::string &);
+public:
+	~Serial() override;
 
 private:
 	void close();
 
 public:
-	virtual void set_block(bool);
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 
 	void set_baud_rate(unsigned);
 	void set_data_bits(unsigned);
@@ -37,11 +45,12 @@ public:
 	void set_parameters(const std::string &);
 
 private:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 
 public:
-	virtual const Handle &get_event_handle();
+	const Handle &get_handle(Mode) override;
+	const Handle &get_event_handle() override { return reader.get_event(); }
 };
 
 } // namespace IO