X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fserial.cpp;h=9df797109d840cc3554136035410977926bc802e;hp=5d5871ef74f1f85855e75fb228a6b4e7e8149b68;hb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;hpb=378ec811c8df431f5b4e7094eb1949476d3a79fe

diff --git a/source/io/serial.cpp b/source/io/serial.cpp
index 5d5871e..9df7971 100644
--- a/source/io/serial.cpp
+++ b/source/io/serial.cpp
@@ -7,6 +7,7 @@
 #endif
 #include <msp/strings/format.h>
 #include <msp/core/systemerror.h>
+#include "handle_private.h"
 #include "serial.h"
 
 using namespace std;
@@ -22,22 +23,22 @@ typedef DCB DeviceState;
 typedef termios DeviceState;
 #endif
 
-void get_state(Handle handle, DeviceState &state)
+void get_state(const Handle &handle, DeviceState &state)
 {
 #ifdef WIN32
-	GetCommState(handle, &state);
+	GetCommState(*handle, &state);
 #else
-	tcgetattr(handle, &state);
+	tcgetattr(*handle, &state);
 #endif
 }
 
-void set_state(Handle handle, DeviceState &state)
+void set_state(const Handle &handle, DeviceState &state)
 {
 #ifdef WIN32
-	if(SetCommState(handle, &state)==0)
+	if(SetCommState(*handle, &state)==0)
 		throw system_error("SetCommState");
 #else
-	if(tcsetattr(handle, TCSADRAIN, &state)==-1)
+	if(tcsetattr(*handle, TCSADRAIN, &state)==-1)
 		throw system_error("tcsetattr");
 #endif
 }
@@ -156,8 +157,8 @@ Serial::Serial(const string &descr)
 #ifdef WIN32
 	port = "\\\\.\\"+port;
 
-	handle = CreateFile(port.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-	if(handle==INVALID_HANDLE_VALUE)
+	*handle = CreateFile(port.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	if(!handle)
 		throw system_error(format("CreateFile(%s)", port));
 	mode = M_READ|M_WRITE;
 
@@ -167,21 +168,21 @@ Serial::Serial(const string &descr)
 	timeouts.ReadTotalTimeoutConstant = MAXDWORD-1;
 	timeouts.WriteTotalTimeoutMultiplier = 0;
 	timeouts.WriteTotalTimeoutConstant = 0;
-	SetCommTimeouts(handle, &timeouts);
+	SetCommTimeouts(*handle, &timeouts);
 #else
 	if(port.compare(0, 5, "/dev/"))
 		port = "/dev/"+port;
 
-	handle = open(port.c_str(), O_RDWR);
-	if(handle==-1)
+	*handle = open(port.c_str(), O_RDWR);
+	if(!handle)
 		throw system_error(format("open(%s)", port));
 	mode = M_READ|M_WRITE;
 
 	termios t;
-	tcgetattr(handle, &t);
+	tcgetattr(*handle, &t);
 	t.c_lflag &= ~(ECHO|ICANON);
 	t.c_oflag &= ~OPOST;
-	tcsetattr(handle, TCSADRAIN, &t);
+	tcsetattr(*handle, TCSADRAIN, &t);
 #endif
 
 	if(comma!=string::npos)
@@ -208,9 +209,9 @@ Serial::~Serial()
 void Serial::close()
 {
 #ifdef WIN32
-	CloseHandle(handle);
+	CloseHandle(*handle);
 #else
-	::close(handle);
+	::close(*handle);
 #endif
 }
 
@@ -222,8 +223,8 @@ void Serial::set_block(bool b)
 		mode = mode&~M_NONBLOCK;
 
 #ifndef WIN32
-	int flags = fcntl(handle, F_GETFD);
-	fcntl(handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
+	int flags = fcntl(*handle, F_GETFD);
+	fcntl(*handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
 #endif
 }
 
@@ -288,10 +289,10 @@ unsigned Serial::do_write(const char *buf, unsigned size)
 
 #ifdef WIN32
 	DWORD ret;
-	if(WriteFile(handle, buf, size, &ret, 0)==0)
+	if(WriteFile(*handle, buf, size, &ret, 0)==0)
 		throw system_error("WriteFile");
 #else
-	int ret = ::write(handle, buf, size);
+	int ret = ::write(*handle, buf, size);
 	if(ret==-1)
 	{
 		if(errno==EAGAIN)
@@ -311,10 +312,10 @@ unsigned Serial::do_read(char *buf, unsigned size)
 
 #ifdef WIN32
 	DWORD ret;
-	if(ReadFile(handle, buf, size, &ret, 0)==0)
+	if(ReadFile(*handle, buf, size, &ret, 0)==0)
 		throw system_error("ReadFile");
 #else
-	int ret = ::read(handle, buf, size);
+	int ret = ::read(*handle, buf, size);
 	if(ret==-1)
 	{
 		if(errno==EAGAIN)
@@ -327,7 +328,7 @@ unsigned Serial::do_read(char *buf, unsigned size)
 	return ret;
 }
 
-Handle Serial::get_event_handle()
+const Handle &Serial::get_event_handle()
 {
 #ifdef WIN32
 	throw logic_error("Serial port events not supported on win32 yet");