X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fserial.c;h=a6ad955179205d6fcdd750c3a670402f297ae3f1;hb=9f6fa83d53ec04dde5c07d21ca3a640024e00095;hp=c0d2dbdae9fab589a295a44bd69b2f93b30f7a4f;hpb=2007998771b1c4d9e762943676d7959daaf74385;p=mono.git diff --git a/support/serial.c b/support/serial.c index c0d2dbdae9f..a6ad9551792 100644 --- a/support/serial.c +++ b/support/serial.c @@ -9,7 +9,12 @@ #include #include #include +#include +#if defined(__APPLE__) +#include "fakepoll.h" +#else #include +#endif #include #include @@ -19,6 +24,11 @@ #include #endif +/* sys/time.h (for timeval) is required when using osx 10.3 (but not 10.4) */ +#ifdef __APPLE__ +#include +#endif + /* This is a copy of System.IO.Ports.Handshake */ typedef enum { NoneHandshake = 0, @@ -58,28 +68,16 @@ 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); + 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 @@ -92,29 +90,49 @@ read_serial (int fd, guchar *buffer, int offset, int 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 @@ -134,72 +152,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; @@ -209,12 +269,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; @@ -229,18 +316,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) { @@ -321,8 +412,14 @@ 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) +poll_serial (int fd, gint32 *error, int timeout) { struct pollfd pinfo; @@ -332,9 +429,12 @@ poll_serial (int fd, gint32 *error) pinfo.events = POLLIN; pinfo.revents = 0; - if (poll (&pinfo, 1, 0) == -1) { - *error = -1; - return FALSE; + 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;