X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.h;h=efdf3b2edd633b72fe54a1f0471b75d45269bef4;hb=32316772d422223827833366a7ee2d0a76d76ff1;hp=a4eed30d4bcf0cda32e28c80ee2748c786d7872a;hpb=247742fbc1c27bfc9fdef4630afcdc2408cdd550;p=r2c2.git

diff --git a/source/libr2c2/intellibox.h b/source/libr2c2/intellibox.h
index a4eed30..efdf3b2 100644
--- a/source/libr2c2/intellibox.h
+++ b/source/libr2c2/intellibox.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_INTELLIBOX_H_
 #define LIBR2C2_INTELLIBOX_H_
 
 #include <map>
+#include <msp/io/serial.h>
 #include <msp/time/timestamp.h>
 #include "driver.h"
 
@@ -68,7 +62,7 @@ private:
 		ERR_NO_I2C_SPACE,
 		ERR_LOW_TURNOUT_SPACE=0x40,
 		ERR_LOK_HALTED,
-		ERR_LOK_POWER_OFF,
+		ERR_LOK_POWER_OFF
 	};
 
 	enum Protocol
@@ -96,6 +90,7 @@ private:
 		unsigned bits;
 		unsigned state;
 		bool active;
+		bool synced;
 		unsigned pending;
 		Msp::Time::TimeStamp off_timeout;
 
@@ -118,7 +113,7 @@ private:
 		unsigned length;
 	};
 
-	int serial_fd;
+	Msp::IO::Serial serial;
 	bool power;
 	bool halted;
 	std::map<unsigned, Locomotive> locos;