X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fserial.c;h=7968fbb30d059ea5eb844be5a9ade5d775df3d7c;hb=e7622f2f4a9062916adeb8a00f1410cd6f367eb6;hp=e4dfcc0a4c8265ace54196b7f05ff8b49d55b96e;hpb=948dbf8d4581ac17f5420cc4f7dc375e3c502576;p=mono.git

diff --git a/support/serial.c b/support/serial.c
index e4dfcc0a4c8..7968fbb30d0 100644
--- a/support/serial.c
+++ b/support/serial.c
@@ -11,9 +11,20 @@
 #include <string.h>
 #include <sys/poll.h>
 #include <sys/ioctl.h>
+#include <errno.h>
 
 #include <glib.h>
 
+/* This is for FIONREAD on solaris */
+#if defined(sun)
+#include <sys/filio.h>
+#endif
+
+/* sys/time.h (for timeval) is required when using osx 10.3 (but not 10.4) */
+#ifdef __APPLE__
+#include <sys/time.h>
+#endif
+
 /* This is a copy of System.IO.Ports.Handshake */
 typedef enum {
 	NoneHandshake = 0,
@@ -41,86 +52,95 @@ typedef enum {
 
 /* This is a copy of System.IO.Ports.SerialSignal */
 typedef enum {
-	Cd = 0, /* Carrier detect */
-	Cts = 1, /* Clear to send */
-	Dsr = 2, /* Data set ready */
-	Dtr = 3, /* Data terminal ready */
-	Rts = 4  /* Request to send */
+	NoneSignal,
+	Cd = 1, /* Carrier detect */
+	Cts = 2, /* Clear to send */
+	Dsr = 4, /* Data set ready */
+	Dtr = 8, /* Data terminal ready */
+	Rts = 16  /* Request to send */
 } MonoSerialSignal;
 
 int
 open_serial (char* devfile)
 {
 	int fd;
-	struct termios newtio;
-
-	fd = open (devfile, O_RDWR);
-
-	if (fd == -1)
-		return -1;
-
-	newtio.c_cflag = CLOCAL | CREAD;
-	newtio.c_iflag = 0;
-	newtio.c_oflag = 0;
-	newtio.c_lflag = 0;
-
-	tcflush(fd, TCIOFLUSH);
-	tcsetattr(fd,TCSANOW,&newtio);
-
-	fcntl (fd, F_SETFL, O_NONBLOCK);
+	fd = open (devfile, O_RDWR | O_NOCTTY | O_NONBLOCK);
 
 	return fd;
 }
 
-void
+int
 close_serial (int unix_fd)
 {
-	close (unix_fd);
+	// Linus writes: do not retry close after EINTR
+	return close (unix_fd);
 }
 
 guint32
-read_serial (int fd, guchar *buffer, int offset, int count, int timeout)
+read_serial (int fd, guchar *buffer, int offset, int count)
 {
 	guint32 n;
-	struct pollfd ufd;
-
-	ufd.fd = fd;
-	ufd.events = POLLHUP | POLLIN | POLLERR;
-
-	poll (&ufd, 1, timeout);
-
-	if ((ufd.revents & POLLIN) != POLLIN) {
-		return -1;
-	}
  
 	n = read (fd, buffer + offset, count);
 
 	return (guint32) n;
 }
 
-void
+int
 write_serial (int fd, guchar *buffer, int offset, int count, int timeout)
 {
+	struct pollfd pinfo;
 	guint32 n;
 
-	struct pollfd ufd;
-
-	ufd.fd = fd;
-	ufd.events = POLLHUP | POLLOUT | POLLERR;
-
-	poll (&ufd, 1, timeout);
-
-	if ((ufd.revents & POLLOUT) != POLLOUT) {
-		return;
+	pinfo.fd = fd;
+	pinfo.events = POLLOUT;
+	pinfo.revents = POLLOUT;
+
+	n = count;
+
+	while (n > 0)
+	{
+		size_t t;
+			
+		if (timeout != 0) {
+			int c;
+			
+			while ((c = poll (&pinfo, 1, timeout)) == -1 && errno == EINTR)
+				;
+			if (c == -1)
+				return -1;
+		}		
+
+		do {
+			t = write (fd, buffer + offset, n);
+		} while (t == -1 && errno == EINTR);
+
+		if (t < 0)
+			return -1;
+		
+		offset += t;
+		n -= t; 
 	}
  
-	n = write (fd, buffer + offset, count);
+	return 0;
 }
 
-void
+int
 discard_buffer (int fd, gboolean input)
 {
-	tcflush(fd, input ? TCIFLUSH : TCOFLUSH);
+	return tcflush(fd, input ? TCIFLUSH : TCOFLUSH);
+}
+
+gint32
+get_bytes_in_buffer (int fd, gboolean input)
+{
+	gint32 retval;
+
+	if (ioctl (fd, input ? FIONREAD : TIOCOUTQ, &retval) == -1) {
+		return -1;
+	}
+
+	return retval;
 }
 
 gboolean
@@ -128,72 +148,114 @@ set_attributes (int fd, int baud_rate, MonoParity parity, int dataBits, MonoStop
 {
 	struct termios newtio;
 
-	tcgetattr (fd, &newtio);
-
-	switch (baud_rate) {
-	case 230400: baud_rate = B230400; break;
-	case 115200: baud_rate = B115200; break;
-	case 57600: baud_rate = B57600; break;
-	case 38400: baud_rate = B38400; break;
-	case 19200: baud_rate = B19200; break;
-	case 9600: baud_rate = B9600; break;
-	case 4800: baud_rate = B4800; break;
-	case 2400: baud_rate = B2400; break;
-	case 1800: baud_rate = B1800; break;
-	case 1200: baud_rate = B1200; break;
-	case 600: baud_rate = B600; break;
-	case 300: baud_rate = B300; break;
-	case 200: baud_rate = B200; break;
-	case 150: baud_rate = B150; break;
-	case 134: baud_rate = B134; break;
-	case 110: baud_rate = B110; break;
-	case 75: baud_rate = B75; break;
-	case 50:
-	case 0:
-	default:
+	if (tcgetattr (fd, &newtio) == -1)
+		return FALSE;
+
+	newtio.c_cflag |=  (CLOCAL | CREAD);
+	newtio.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL | ISIG | IEXTEN );
+	newtio.c_oflag &= ~(OPOST);
+	newtio.c_iflag = IGNBRK;
+
+	/* setup baudrate */
+	switch (baud_rate)
+	{
+/*Some values are not defined on OSX and *BSD */
+#if defined(B921600)
+	case 921600:
+	    baud_rate = B921600;
+	    break;
+#endif
+#if defined(B460800)
+	case 460800:
+	    baud_rate = B460800;
+	    break;
+#endif
+	case 230400: 
+	    baud_rate = B230400;
+	    break;
+	case 115200: 
+	    baud_rate = B115200;
+	    break;
+	case 57600:
+	    baud_rate = B57600;
+	    break;
+	case 38400: 
+	    baud_rate = B38400;
+	    break;
+	case 19200: 
+	    baud_rate = B19200;
+	    break;
+	case 9600: 
 		baud_rate = B9600;
 		break;
-	}
-
-	switch (parity) {
-	case NoneParity: /* None */
-		newtio.c_iflag |= IGNPAR;
-		newtio.c_cflag &= ~(PARENB | PARODD);
+	case 4800: 
+	    baud_rate = B4800;
 		break;
-	case Odd: /* Odd */
-		newtio.c_iflag &= ~IGNPAR;
-		newtio.c_cflag |= PARENB | PARODD;
+	case 2400: 
+	    baud_rate = B2400;
 		break;
-	case Even: /* Even */
-		newtio.c_iflag &= ~(IGNPAR | PARODD);
-		newtio.c_cflag |= PARENB;
+	case 1800: 
+	    baud_rate = B1800;
 		break;
-	case Mark: /* Mark */
-		/* XXX unhandled */
+	case 1200: 
+	    baud_rate = B1200;
 		break;
-	case Space: /* Space */
-		/* XXX unhandled */
+	case 600: 
+	    baud_rate = B600;
+	    break;
+	case 300: 
+	    baud_rate = B300;
+	    break;
+	case 200: 
+	    baud_rate = B200;
+	    break;
+	case 150: 
+	    baud_rate = B150;
+	    break;
+	case 134: 
+	    baud_rate = B134;
+	    break;
+	case 110: 
+	    baud_rate = B110;
+	    break;
+	case 75: 
+	    baud_rate = B75;
+	    break;
+	case 50:
+	case 0:
+	default:
+	    baud_rate = B9600;
 		break;
 	}
 
+	/* char lenght */
 	newtio.c_cflag &= ~CSIZE;
-	switch (dataBits) {
-	case 5: newtio.c_cflag |= CS5; break;
-	case 6: newtio.c_cflag |= CS6; break;
-	case 7: newtio.c_cflag |= CS7; break;
+	switch (dataBits)
+	{
+	case 5: 
+	    newtio.c_cflag |= CS5;
+	    break;
+	case 6: 
+	    newtio.c_cflag |= CS6;
+	    break;
+	case 7: 
+	    newtio.c_cflag |= CS7;
+	    break;
 	case 8:
 	default:
 		newtio.c_cflag |= CS8;
 		break;
 	}
 
-	newtio.c_cflag &= ~CSTOPB;
-	switch (stopBits) {
+	/* stopbits */
+	switch (stopBits)
+	{
 	case NoneStopBits:
 		/* Unhandled */
 		break;
 	case One: /* One */
 		/* do nothing, the default is one stop bit */
+	    newtio.c_cflag &= ~CSTOPB;
 		break;
 	case Two: /* Two */
 		newtio.c_cflag |= CSTOPB;
@@ -203,12 +265,39 @@ set_attributes (int fd, int baud_rate, MonoParity parity, int dataBits, MonoStop
 		break;
 	}
 
-	newtio.c_iflag &= ~IXOFF;
-	newtio.c_oflag &= ~IXON;
+	/* parity */
+	newtio.c_iflag &= ~(INPCK | ISTRIP );
+
+	switch (parity)
+	{
+	case NoneParity: /* None */
+	    newtio.c_cflag &= ~(PARENB | PARODD);
+	    break;
+	    
+	case Odd: /* Odd */
+	    newtio.c_cflag |= PARENB | PARODD;
+	    break;
+	    
+	case Even: /* Even */
+	    newtio.c_cflag &= ~(PARODD);
+	    newtio.c_cflag |= (PARENB);
+	    break;
+	    
+	case Mark: /* Mark */
+	    /* XXX unhandled */
+	    break;
+	case Space: /* Space */
+	    /* XXX unhandled */
+	    break;
+	}
+
+   	newtio.c_iflag &= ~(IXOFF | IXON);
 #ifdef CRTSCTS
 	newtio.c_cflag &= ~CRTSCTS;
 #endif /* def CRTSCTS */
-	switch (handshake) {
+
+	switch (handshake)
+	{
 	case NoneHandshake: /* None */
 		/* do nothing */
 		break;
@@ -223,18 +312,22 @@ set_attributes (int fd, int baud_rate, MonoParity parity, int dataBits, MonoStop
 #endif /* def CRTSCTS */
 		/* fall through */
 	case XOnXOff: /* XOnXOff */
-		newtio.c_iflag |= IXOFF;
-		//		newtio.c_oflag |= IXON;
+	    newtio.c_iflag |= IXOFF | IXON;
 		break;
 	}
 	
 	if (cfsetospeed (&newtio, baud_rate) < 0 || cfsetispeed (&newtio, baud_rate) < 0 ||
-			tcsetattr (fd, TCSADRAIN, &newtio) < 0)
+	    tcsetattr (fd, TCSANOW, &newtio) < 0)
+	{
 		return FALSE;
-
+	}
+	else
+	{
 	return TRUE;
+	}
 }
 
+
 static gint32
 get_signal_code (MonoSerialSignal signal)
 {
@@ -249,22 +342,46 @@ get_signal_code (MonoSerialSignal signal)
 			return TIOCM_DTR;
 		case Rts:
 			return TIOCM_RTS;
+		default:
+			return 0;
 	}
 
 	/* Not reached */
 	return 0;
 }
 
-gint32
-get_signal (int fd, MonoSerialSignal signal)
+static MonoSerialSignal
+get_mono_signal_codes (int signals)
 {
-	int signals, expected;
+	MonoSerialSignal retval = NoneSignal;
+
+	if ((signals & TIOCM_CAR) != 0)
+		retval |= Cd;
+	if ((signals & TIOCM_CTS) != 0)
+		retval |= Cts;
+	if ((signals & TIOCM_DSR) != 0)
+		retval |= Dsr;
+	if ((signals & TIOCM_DTR) != 0)
+		retval |= Dtr;
+	if ((signals & TIOCM_RTS) != 0)
+		retval |= Rts;
+
+	return retval;
+}
 
-	expected = get_signal_code (signal);
-	if (ioctl (fd, TIOCMGET, &signals) == -1)
-		return -1;
+MonoSerialSignal
+get_signals (int fd, gint32 *error)
+{
+	int signals;
+
+	*error = 0;
 	
-	return (expected & signals) != 0;
+	if (ioctl (fd, TIOCMGET, &signals) == -1) {
+		*error = -1;
+		return NoneSignal;
+	}
+	
+	return get_mono_signal_codes (signals);
 }
 
 gint32
@@ -291,6 +408,34 @@ set_signal (int fd, MonoSerialSignal signal, gboolean value)
 	return 1;
 }
 
+int
+breakprop (int fd)
+{
+	return tcsendbreak (fd, 0);
+}
+
+gboolean
+poll_serial (int fd, gint32 *error, int timeout)
+{
+	struct pollfd pinfo;
+	
+	*error = 0;
+	
+	pinfo.fd = fd;
+	pinfo.events = POLLIN;
+	pinfo.revents = 0;
+
+	while (poll (&pinfo, 1, timeout) == -1 && errno == EINTR) {
+		/* EINTR is an OK condition, we should not throw in the upper layer an IOException */
+		if (errno != EINTR){
+			*error = -1;
+			return FALSE;
+		}
+	}
+
+	return (pinfo.revents & POLLIN) != 0 ? 1 : 0;
+}
+
 /*
  * mono internals should not be used here.
  * this serial stuff needs to be implemented with icalls.