X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=serialport.c;h=e935464013e2fb82db3f3bdb7955225ed70e8220;hb=537942c9edb37ebfc88d8b06fd330e8492d36bee;hp=f7518880876783e8de49b90c38f3ce70ae20b59d;hpb=70cd37def2518cfa4c1170b16c94527b196a72a8;p=libserialport.git

diff --git a/serialport.c b/serialport.c
index f751888..e935464 100644
--- a/serialport.c
+++ b/serialport.c
@@ -34,8 +34,11 @@
 #include <tchar.h>
 #include <stdio.h>
 #else
+#include <limits.h>
 #include <termios.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
+#include <limits.h>
 #endif
 #ifdef __APPLE__
 #include <IOKit/IOKitLib.h>
@@ -44,20 +47,60 @@
 #include <sys/syslimits.h>
 #endif
 #ifdef __linux__
+#ifdef HAVE_LIBUDEV
 #include "libudev.h"
+#endif
+#ifndef __ANDROID__
 #include "linux/serial.h"
+#endif
 #include "linux_termios.h"
+
+/* TCGETX/TCSETX is not available everywhere. */
 #if defined(TCGETX) && defined(TCSETX) && defined(HAVE_TERMIOX)
 #define USE_TERMIOX
 #endif
 #endif
 
+/* TIOCINQ/TIOCOUTQ is not available everywhere. */
+#if !defined(TIOCINQ) && defined(FIONREAD)
+#define TIOCINQ FIONREAD
+#endif
+#if !defined(TIOCOUTQ) && defined(FIONWRITE)
+#define TIOCOUTQ FIONWRITE
+#endif
+
 #ifndef _WIN32
 #include "linux_termios.h"
 #endif
 
 #include "libserialport.h"
 
+struct sp_port {
+	char *name;
+#ifdef _WIN32
+	HANDLE hdl;
+	COMMTIMEOUTS timeouts;
+	OVERLAPPED write_ovl;
+	OVERLAPPED read_ovl;
+	BYTE pending_byte;
+	BOOL writing;
+#else
+	int fd;
+#endif
+};
+
+struct sp_port_config {
+	int baudrate;
+	int bits;
+	enum sp_parity parity;
+	int stopbits;
+	enum sp_rts rts;
+	enum sp_cts cts;
+	enum sp_dtr dtr;
+	enum sp_dsr dsr;
+	enum sp_xonxoff xon_xoff;
+};
+
 struct port_data {
 #ifdef _WIN32
 	DCB dcb;
@@ -130,9 +173,13 @@ void (*sp_debug_handler)(const char *format, ...) = sp_default_debug_handler;
 #define RETURN_OK() RETURN_CODE(SP_OK);
 #define RETURN_ERROR(err, msg) do { DEBUG_ERROR(err, msg); return err; } while (0)
 #define RETURN_FAIL(msg) do { DEBUG_FAIL(msg); return SP_ERR_FAIL; } while (0)
-#define RETURN_VALUE(fmt, x) do { DEBUG("%s returning " fmt, __func__, x); return x; } while (0)
+#define RETURN_VALUE(fmt, x) do { \
+	typeof(x) _x = x; \
+	DEBUG("%s returning " fmt, __func__, _x); \
+	return _x; \
+} while (0)
 #define SET_ERROR(val, err, msg) do { DEBUG_ERROR(err, msg); val = err; } while (0)
-#define SET_FAIL(val, msg) do { DEBUG_FAIL(msg); val = err; } while (0)
+#define SET_FAIL(val, msg) do { DEBUG_FAIL(msg); val = SP_ERR_FAIL; } while (0)
 #define TRACE(fmt, ...) DEBUG("%s(" fmt ") called", __func__, ##__VA_ARGS__)
 
 #define TRY(x) do { int ret = x; if (ret != SP_OK) RETURN_CODEVAL(ret); } while (0)
@@ -184,6 +231,34 @@ enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_p
 	RETURN_OK();
 }
 
+char *sp_get_port_name(const struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port)
+		return NULL;
+
+	RETURN_VALUE("%s", port->name);
+}
+
+enum sp_return sp_get_port_handle(const struct sp_port *port, void *result_ptr)
+{
+	TRACE("%p, %p", port, result_ptr);
+
+	if (!port)
+		RETURN_ERROR(SP_ERR_ARG, "Null port");
+
+#ifdef _WIN32
+	HANDLE *handle_ptr = result_ptr;
+	*handle_ptr = port->hdl;
+#else
+	int *fd_ptr = result_ptr;
+	*fd_ptr = port->fd;
+#endif
+
+	RETURN_OK();
+}
+
 enum sp_return sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
 {
 	TRACE("%p, %p", port, copy_ptr);
@@ -208,8 +283,7 @@ void sp_free_port(struct sp_port *port)
 {
 	TRACE("%p", port);
 
-	if (!port)
-	{
+	if (!port) {
 		DEBUG("Null port");
 		RETURN();
 	}
@@ -394,7 +468,7 @@ out_release:
 	IOObjectRelease(iter);
 out_done:
 #endif
-#ifdef __linux__
+#if defined(__linux__) && defined(HAVE_LIBUDEV)
 	struct udev *ud;
 	struct udev_enumerate *ud_enumerate;
 	struct udev_list_entry *ud_list;
@@ -467,7 +541,7 @@ out:
 		*list_ptr = list;
 		RETURN_OK();
 	case SP_ERR_SUPP:
-		DEBUG_ERROR(SP_ERR_SUPP, "Enumeration not supported on this platform.");
+		DEBUG_ERROR(SP_ERR_SUPP, "Enumeration not supported on this platform");
 	default:
 		if (list)
 			sp_free_port_list(list);
@@ -520,18 +594,23 @@ void sp_free_port_list(struct sp_port **list)
 
 enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 {
-	TRACE("%p, %x", port, flags);
+	struct port_data data;
+	struct sp_port_config config;
+	enum sp_return ret;
+
+	TRACE("%p, 0x%x", port, flags);
 
 	CHECK_PORT();
 
-	if (flags > (SP_MODE_READ | SP_MODE_WRITE | SP_MODE_NONBLOCK))
+	if (flags > (SP_MODE_READ | SP_MODE_WRITE))
 		RETURN_ERROR(SP_ERR_ARG, "Invalid flags");
 
 	DEBUG("Opening port %s", port->name);
 
 #ifdef _WIN32
-	DWORD desired_access = 0, flags_and_attributes = 0;
+	DWORD desired_access = 0, flags_and_attributes = 0, errors;
 	char *escaped_port_name;
+	COMSTAT status;
 
 	/* Prefix port name with '\\.\' to work with ports above COM9. */
 	if (!(escaped_port_name = malloc(strlen(port->name + 5))))
@@ -539,13 +618,11 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	sprintf(escaped_port_name, "\\\\.\\%s", port->name);
 
 	/* Map 'flags' to the OS-specific settings. */
-	flags_and_attributes = FILE_ATTRIBUTE_NORMAL;
+	flags_and_attributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED;
 	if (flags & SP_MODE_READ)
 		desired_access |= GENERIC_READ;
 	if (flags & SP_MODE_WRITE)
 		desired_access |= GENERIC_WRITE;
-	if (flags & SP_MODE_NONBLOCK)
-		flags_and_attributes |= FILE_FLAG_OVERLAPPED;
 
 	port->hdl = CreateFile(escaped_port_name, desired_access, 0, 0,
 			 OPEN_EXISTING, flags_and_attributes, 0);
@@ -553,12 +630,38 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	free(escaped_port_name);
 
 	if (port->hdl == INVALID_HANDLE_VALUE)
-		RETURN_FAIL("CreateFile() failed");
+		RETURN_FAIL("port CreateFile() failed");
+
+	/* All timeouts initially disabled. */
+	port->timeouts.ReadIntervalTimeout = 0;
+	port->timeouts.ReadTotalTimeoutMultiplier = 0;
+	port->timeouts.ReadTotalTimeoutConstant = 0;
+	port->timeouts.WriteTotalTimeoutMultiplier = 0;
+	port->timeouts.WriteTotalTimeoutConstant = 0;
+
+	if (SetCommTimeouts(port->hdl, &port->timeouts) == 0) {
+		sp_close(port);
+		RETURN_FAIL("SetCommTimeouts() failed");
+	}
+
+	/* Prepare OVERLAPPED structures. */
+	memset(&port->read_ovl, 0, sizeof(port->read_ovl));
+	memset(&port->write_ovl, 0, sizeof(port->write_ovl));
+	port->read_ovl.hEvent = INVALID_HANDLE_VALUE;
+	port->write_ovl.hEvent = INVALID_HANDLE_VALUE;
+	if ((port->read_ovl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL)) == INVALID_HANDLE_VALUE) {
+		sp_close(port);
+		RETURN_FAIL("read event CreateEvent() failed");
+	}
+	if ((port->write_ovl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL)) == INVALID_HANDLE_VALUE) {
+		sp_close(port);
+		RETURN_FAIL("write event CreateEvent() failed");
+	}
+
+	port->writing = FALSE;
+
 #else
-	int flags_local = 0;
-	struct port_data data;
-	struct sp_port_config config;
-	int ret;
+	int flags_local = O_NONBLOCK | O_NOCTTY;
 
 	/* Map 'flags' to the OS-specific settings. */
 	if (flags & (SP_MODE_READ | SP_MODE_WRITE))
@@ -567,11 +670,10 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 		flags_local |= O_RDONLY;
 	else if (flags & SP_MODE_WRITE)
 		flags_local |= O_WRONLY;
-	if (flags & SP_MODE_NONBLOCK)
-		flags_local |= O_NONBLOCK;
 
 	if ((port->fd = open(port->name, flags_local)) < 0)
 		RETURN_FAIL("open() failed");
+#endif
 
 	ret = get_config(port, &data, &config);
 
@@ -580,17 +682,55 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 		RETURN_CODEVAL(ret);
 	}
 
-	/* Turn off all serial port cooking. */
-	data.term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
-	data.term.c_oflag &= ~(ONLCR | OCRNL | ONOCR);
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+	/* Set sane port settings. */
+#ifdef _WIN32
+	data.dcb.fBinary = TRUE;
+	data.dcb.fDsrSensitivity = FALSE;
+	data.dcb.fErrorChar = FALSE;
+	data.dcb.fNull = FALSE;
+	data.dcb.fAbortOnError = TRUE;
+#else
+	/* Turn off all fancy termios tricks, give us a raw channel. */
+	data.term.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IMAXBEL);
+#ifdef IUCLC
+	data.term.c_iflag &= ~IUCLC;
+#endif
+	data.term.c_oflag &= ~(OPOST | ONLCR | OCRNL | ONOCR | ONLRET);
+#ifdef OLCUC
+	data.term.c_oflag &= ~OLCUC;
+#endif
+#ifdef NLDLY
+	data.term.c_oflag &= ~NLDLY;
+#endif
+#ifdef CRDLY
+	data.term.c_oflag &= ~CRDLY;
+#endif
+#ifdef TABDLY
+	data.term.c_oflag &= ~TABDLY;
+#endif
+#ifdef BSDLY
+	data.term.c_oflag &= ~BSDLY;
+#endif
+#ifdef VTDLY
+	data.term.c_oflag &= ~VTDLY;
+#endif
+#ifdef FFDLY
+	data.term.c_oflag &= ~FFDLY;
+#endif
+#ifdef OFILL
 	data.term.c_oflag &= ~OFILL;
 #endif
-	/* Disable canonical mode, and don't echo input characters. */
-	data.term.c_lflag &= ~(ICANON | ECHO);
+	data.term.c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN);
+	data.term.c_cc[VMIN] = 0;
+	data.term.c_cc[VTIME] = 0;
+
+	/* Ignore modem status lines; enable receiver; leave control lines alone on close. */
+	data.term.c_cflag |= (CLOCAL | CREAD | HUPCL);
+#endif
 
-	/* Ignore modem status lines; enable receiver */
-	data.term.c_cflag |= (CLOCAL | CREAD);
+#ifdef _WIN32
+	ClearCommError(port->hdl, &errors, &status);
+#endif
 
 	ret = set_config(port, &data, &config);
 
@@ -598,7 +738,6 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 		sp_close(port);
 		RETURN_CODEVAL(ret);
 	}
-#endif
 
 	RETURN_OK();
 }
@@ -614,8 +753,14 @@ enum sp_return sp_close(struct sp_port *port)
 #ifdef _WIN32
 	/* Returns non-zero upon success, 0 upon failure. */
 	if (CloseHandle(port->hdl) == 0)
-		RETURN_FAIL("CloseHandle() failed");
+		RETURN_FAIL("port CloseHandle() failed");
 	port->hdl = INVALID_HANDLE_VALUE;
+	/* Close event handle created for overlapped reads. */
+	if (port->read_ovl.hEvent != INVALID_HANDLE_VALUE && CloseHandle(port->read_ovl.hEvent) == 0)
+		RETURN_FAIL("read event CloseHandle() failed");
+	/* Close event handle created for overlapped writes. */
+	if (port->write_ovl.hEvent != INVALID_HANDLE_VALUE && CloseHandle(port->write_ovl.hEvent) == 0)
+		RETURN_FAIL("write event CloseHandle() failed");
 #else
 	/* Returns 0 upon success, -1 upon failure. */
 	if (close(port->fd) == -1)
@@ -628,14 +773,14 @@ enum sp_return sp_close(struct sp_port *port)
 
 enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
 {
-	TRACE("%p, %x", port, buffers);
+	TRACE("%p, 0x%x", port, buffers);
 
 	CHECK_OPEN_PORT();
 
 	if (buffers > SP_BUF_BOTH)
 		RETURN_ERROR(SP_ERR_ARG, "Invalid buffer selection");
 
-	const char *buffer_names[] = {"input", "output", "both"};
+	const char *buffer_names[] = {"no", "input", "output", "both"};
 
 	DEBUG("Flushing %s buffers on port %s", buffer_names[buffers], port->name);
 
@@ -677,16 +822,145 @@ enum sp_return sp_drain(struct sp_port *port)
 	/* Returns non-zero upon success, 0 upon failure. */
 	if (FlushFileBuffers(port->hdl) == 0)
 		RETURN_FAIL("FlushFileBuffers() failed");
+	RETURN_OK();
 #else
-	/* Returns 0 upon success, -1 upon failure. */
-	if (tcdrain(port->fd) < 0)
-		RETURN_FAIL("tcdrain() failed");
+	int result;
+	while (1) {
+#ifdef __ANDROID__
+		int arg = 1;
+		result = ioctl(port->fd, TCSBRK, &arg);
+#else
+		result = tcdrain(port->fd);
 #endif
+		if (result < 0) {
+			if (errno == EINTR) {
+				DEBUG("tcdrain() was interrupted");
+				continue;
+			} else {
+				RETURN_FAIL("tcdrain() failed");
+			}
+		} else {
+			RETURN_OK();
+		}
+	}
+#endif
+}
 
-	RETURN_OK();
+enum sp_return sp_blocking_write(struct sp_port *port, const void *buf, size_t count, unsigned int timeout)
+{
+	TRACE("%p, %p, %d, %d", port, buf, count, timeout);
+
+	CHECK_OPEN_PORT();
+
+	if (!buf)
+		RETURN_ERROR(SP_ERR_ARG, "Null buffer");
+
+	if (timeout)
+		DEBUG("Writing %d bytes to port %s, timeout %d ms", count, port->name, timeout);
+	else
+		DEBUG("Writing %d bytes to port %s, no timeout", count, port->name);
+
+	if (count == 0)
+		RETURN_VALUE("0", 0);
+
+#ifdef _WIN32
+	DWORD bytes_written = 0;
+	BOOL result;
+
+	/* Wait for previous non-blocking write to complete, if any. */
+	if (port->writing) {
+		DEBUG("Waiting for previous write to complete");
+		result = GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
+		port->writing = 0;
+		if (!result)
+			RETURN_FAIL("Previous write failed to complete");
+		DEBUG("Previous write completed");
+	}
+
+	/* Set timeout. */
+	port->timeouts.WriteTotalTimeoutConstant = timeout;
+	if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
+		RETURN_FAIL("SetCommTimeouts() failed");
+
+	/* Start write. */
+	if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl) == 0) {
+		if (GetLastError() == ERROR_IO_PENDING) {
+			DEBUG("Waiting for write to complete");
+			GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
+			DEBUG("Write completed, %d/%d bytes written", bytes_written, count);
+			RETURN_VALUE("%d", bytes_written);
+		} else {
+			RETURN_FAIL("WriteFile() failed");
+		}
+	} else {
+		DEBUG("Write completed immediately");
+		RETURN_VALUE("%d", count);
+	}
+#else
+	size_t bytes_written = 0;
+	unsigned char *ptr = (unsigned char *) buf;
+	struct timeval start, delta, now, end = {0, 0};
+	fd_set fds;
+	int result;
+
+	if (timeout) {
+		/* Get time at start of operation. */
+		gettimeofday(&start, NULL);
+		/* Define duration of timeout. */
+		delta.tv_sec = timeout / 1000;
+		delta.tv_usec = (timeout % 1000) * 1000;
+		/* Calculate time at which we should give up. */
+		timeradd(&start, &delta, &end);
+	}
+
+	/* Loop until we have written the requested number of bytes. */
+	while (bytes_written < count)
+	{
+		/* Wait until space is available. */
+		FD_ZERO(&fds);
+		FD_SET(port->fd, &fds);
+		if (timeout) {
+			gettimeofday(&now, NULL);
+			if (timercmp(&now, &end, >)) {
+				DEBUG("write timed out");
+				RETURN_VALUE("%d", bytes_written);
+			}
+			timersub(&end, &now, &delta);
+		}
+		result = select(port->fd + 1, NULL, &fds, NULL, timeout ? &delta : NULL);
+		if (result < 0) {
+			if (errno == EINTR) {
+				DEBUG("select() call was interrupted, repeating");
+				continue;
+			} else {
+				RETURN_FAIL("select() failed");
+			}
+		} else if (result == 0) {
+			DEBUG("write timed out");
+			RETURN_VALUE("%d", bytes_written);
+		}
+
+		/* Do write. */
+		result = write(port->fd, ptr, count - bytes_written);
+
+		if (result < 0) {
+			if (errno == EAGAIN)
+				/* This shouldn't happen because we did a select() first, but handle anyway. */
+				continue;
+			else
+				/* This is an actual failure. */
+				RETURN_FAIL("write() failed");
+		}
+
+		bytes_written += result;
+		ptr += result;
+	}
+
+	RETURN_VALUE("%d", bytes_written);
+#endif
 }
 
-enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
+enum sp_return sp_nonblocking_write(struct sp_port *port, const void *buf, size_t count)
 {
 	TRACE("%p, %p, %d", port, buf, count);
 
@@ -697,12 +971,62 @@ enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
 
 	DEBUG("Writing up to %d bytes to port %s", count, port->name);
 
+	if (count == 0)
+		RETURN_VALUE("0", 0);
+
 #ifdef _WIN32
 	DWORD written = 0;
+	BYTE *ptr = (BYTE *) buf;
+
+	/* Check whether previous write is complete. */
+	if (port->writing) {
+		if (HasOverlappedIoCompleted(&port->write_ovl)) {
+			DEBUG("Previous write completed");
+			port->writing = 0;
+		} else {
+			DEBUG("Previous write not complete");
+			/* Can't take a new write until the previous one finishes. */
+			RETURN_VALUE("0", 0);
+		}
+	}
+
+	/* Set timeout. */
+	port->timeouts.WriteTotalTimeoutConstant = 0;
+	if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
+		RETURN_FAIL("SetCommTimeouts() failed");
+
+	/* Keep writing data until the OS has to actually start an async IO for it.
+	 * At that point we know the buffer is full. */
+	while (written < count)
+	{
+		/* Copy first byte of user buffer. */
+		port->pending_byte = *ptr++;
+
+		/* Start asynchronous write. */
+		if (WriteFile(port->hdl, &port->pending_byte, 1, NULL, &port->write_ovl) == 0) {
+			if (GetLastError() == ERROR_IO_PENDING) {
+				if (HasOverlappedIoCompleted(&port->write_ovl)) {
+					DEBUG("Asynchronous write completed immediately");
+					port->writing = 0;
+					written++;
+					continue;
+				} else {
+					DEBUG("Asynchronous write running");
+					port->writing = 1;
+					RETURN_VALUE("%d", ++written);
+				}
+			} else {
+				/* Actual failure of some kind. */
+				RETURN_FAIL("WriteFile() failed");
+			}
+		} else {
+			DEBUG("Single byte written immediately");
+			written++;
+		}
+	}
+
+	DEBUG("All bytes written immediately");
 
-	/* Returns non-zero upon success, 0 upon failure. */
-	if (WriteFile(port->hdl, buf, count, &written, NULL) == 0)
-		RETURN_FAIL("WriteFile() failed");
 	RETURN_VALUE("%d", written);
 #else
 	/* Returns the number of bytes written, or -1 upon failure. */
@@ -715,7 +1039,110 @@ enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
 #endif
 }
 
-enum sp_return sp_read(struct sp_port *port, void *buf, size_t count)
+enum sp_return sp_blocking_read(struct sp_port *port, void *buf, size_t count, unsigned int timeout)
+{
+	TRACE("%p, %p, %d, %d", port, buf, count, timeout);
+
+	CHECK_OPEN_PORT();
+
+	if (!buf)
+		RETURN_ERROR(SP_ERR_ARG, "Null buffer");
+
+	if (timeout)
+		DEBUG("Reading %d bytes from port %s, timeout %d ms", count, port->name, timeout);
+	else
+		DEBUG("Reading %d bytes from port %s, no timeout", count, port->name);
+
+	if (count == 0)
+		RETURN_VALUE("0", 0);
+
+#ifdef _WIN32
+	DWORD bytes_read = 0;
+
+	/* Set timeout. */
+	port->timeouts.ReadIntervalTimeout = 0;
+	port->timeouts.ReadTotalTimeoutConstant = timeout;
+	if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
+		RETURN_FAIL("SetCommTimeouts() failed");
+
+	/* Start read. */
+	if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0) {
+		if (GetLastError() == ERROR_IO_PENDING) {
+			DEBUG("Waiting for read to complete");
+			GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE);
+			DEBUG("Read completed, %d/%d bytes read", bytes_read, count);
+			RETURN_VALUE("%d", bytes_read);
+		} else {
+			RETURN_FAIL("ReadFile() failed");
+		}
+	} else {
+		DEBUG("Read completed immediately");
+		RETURN_VALUE("%d", count);
+	}
+#else
+	size_t bytes_read = 0;
+	unsigned char *ptr = (unsigned char *) buf;
+	struct timeval start, delta, now, end = {0, 0};
+	fd_set fds;
+	int result;
+
+	if (timeout) {
+		/* Get time at start of operation. */
+		gettimeofday(&start, NULL);
+		/* Define duration of timeout. */
+		delta.tv_sec = timeout / 1000;
+		delta.tv_usec = (timeout % 1000) * 1000;
+		/* Calculate time at which we should give up. */
+		timeradd(&start, &delta, &end);
+	}
+
+	/* Loop until we have the requested number of bytes. */
+	while (bytes_read < count)
+	{
+		/* Wait until data is available. */
+		FD_ZERO(&fds);
+		FD_SET(port->fd, &fds);
+		if (timeout) {
+			gettimeofday(&now, NULL);
+			if (timercmp(&now, &end, >))
+				/* Timeout has expired. */
+				RETURN_VALUE("%d", bytes_read);
+			timersub(&end, &now, &delta);
+		}
+		result = select(port->fd + 1, &fds, NULL, NULL, timeout ? &delta : NULL);
+		if (result < 0) {
+			if (errno == EINTR) {
+				DEBUG("select() call was interrupted, repeating");
+				continue;
+			} else {
+				RETURN_FAIL("select() failed");
+			}
+		} else if (result == 0) {
+			DEBUG("read timed out");
+			RETURN_VALUE("%d", bytes_read);
+		}
+
+		/* Do read. */
+		result = read(port->fd, ptr, count - bytes_read);
+
+		if (result < 0) {
+			if (errno == EAGAIN)
+				/* This shouldn't happen because we did a select() first, but handle anyway. */
+				continue;
+			else
+				/* This is an actual failure. */
+				RETURN_FAIL("read() failed");
+		}
+
+		bytes_read += result;
+		ptr += result;
+	}
+
+	RETURN_VALUE("%d", bytes_read);
+#endif
+}
+
+enum sp_return sp_nonblocking_read(struct sp_port *port, void *buf, size_t count)
 {
 	TRACE("%p, %p, %d", port, buf, count);
 
@@ -727,22 +1154,85 @@ enum sp_return sp_read(struct sp_port *port, void *buf, size_t count)
 	DEBUG("Reading up to %d bytes from port %s", count, port->name);
 
 #ifdef _WIN32
-	DWORD bytes_read = 0;
+	DWORD bytes_read;
 
-	/* Returns non-zero upon success, 0 upon failure. */
-	if (ReadFile(port->hdl, buf, count, &bytes_read, NULL) == 0)
+	/* Set timeout. */
+	port->timeouts.ReadIntervalTimeout = MAXDWORD;
+	port->timeouts.ReadTotalTimeoutConstant = 0;
+	if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
+		RETURN_FAIL("SetCommTimeouts() failed");
+
+	/* Do read. */
+	if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0)
 		RETURN_FAIL("ReadFile() failed");
+
+	/* Get number of bytes read. */
+	if (GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0)
+		RETURN_FAIL("GetOverlappedResult() failed");
+
 	RETURN_VALUE("%d", bytes_read);
 #else
 	ssize_t bytes_read;
 
 	/* Returns the number of bytes read, or -1 upon failure. */
-	if ((bytes_read = read(port->fd, buf, count)) < 0)
-		RETURN_FAIL("read() failed");
+	if ((bytes_read = read(port->fd, buf, count)) < 0) {
+		if (errno == EAGAIN)
+			/* No bytes available. */
+			bytes_read = 0;
+		else
+			/* This is an actual failure. */
+			RETURN_FAIL("read() failed");
+	}
 	RETURN_VALUE("%d", bytes_read);
 #endif
 }
 
+enum sp_return sp_input_waiting(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	CHECK_OPEN_PORT();
+
+	DEBUG("Checking input bytes waiting on port %s", port->name);
+
+#ifdef _WIN32
+	DWORD errors;
+	COMSTAT comstat;
+
+	if (ClearCommError(port->hdl, &errors, &comstat) == 0)
+		RETURN_FAIL("ClearComError() failed");
+	RETURN_VALUE("%d", comstat.cbInQue);
+#else
+	int bytes_waiting;
+	if (ioctl(port->fd, TIOCINQ, &bytes_waiting) < 0)
+		RETURN_FAIL("TIOCINQ ioctl failed");
+	RETURN_VALUE("%d", bytes_waiting);
+#endif
+}
+
+enum sp_return sp_output_waiting(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	CHECK_OPEN_PORT();
+
+	DEBUG("Checking output bytes waiting on port %s", port->name);
+
+#ifdef _WIN32
+	DWORD errors;
+	COMSTAT comstat;
+
+	if (ClearCommError(port->hdl, &errors, &comstat) == 0)
+		RETURN_FAIL("ClearComError() failed");
+	RETURN_VALUE("%d", comstat.cbOutQue);
+#else
+	int bytes_waiting;
+	if (ioctl(port->fd, TIOCOUTQ, &bytes_waiting) < 0)
+		RETURN_FAIL("TIOCOUTQ ioctl failed");
+	RETURN_VALUE("%d", bytes_waiting);
+#endif
+}
+
 #ifdef __linux__
 static enum sp_return get_baudrate(int fd, int *baudrate)
 {
@@ -884,11 +1374,17 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 		case NOPARITY:
 			config->parity = SP_PARITY_NONE;
 			break;
+		case ODDPARITY:
+			config->parity = SP_PARITY_ODD;
+			break;
 		case EVENPARITY:
 			config->parity = SP_PARITY_EVEN;
 			break;
-		case ODDPARITY:
-			config->parity = SP_PARITY_ODD;
+		case MARKPARITY:
+			config->parity = SP_PARITY_MARK;
+			break;
+		case SPACEPARITY:
+			config->parity = SP_PARITY_SPACE;
 			break;
 		default:
 			config->parity = -1;
@@ -1010,6 +1506,10 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 		config->parity = SP_PARITY_NONE;
 	else if (!(data->term.c_cflag & PARENB) || (data->term.c_iflag & IGNPAR))
 		config->parity = -1;
+#ifdef CMSPAR
+	else if (data->term.c_cflag & CMSPAR)
+		config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_MARK : SP_PARITY_SPACE;
+#endif
 	else
 		config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_ODD : SP_PARITY_EVEN;
 
@@ -1087,15 +1587,20 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
 	if (config->parity >= 0) {
 		switch (config->parity) {
-		/* Note: There's also SPACEPARITY, MARKPARITY (unneeded so far). */
 		case SP_PARITY_NONE:
 			data->dcb.Parity = NOPARITY;
 			break;
+		case SP_PARITY_ODD:
+			data->dcb.Parity = ODDPARITY;
+			break;
 		case SP_PARITY_EVEN:
 			data->dcb.Parity = EVENPARITY;
 			break;
-		case SP_PARITY_ODD:
-			data->dcb.Parity = ODDPARITY;
+		case SP_PARITY_MARK:
+			data->dcb.Parity = MARKPARITY;
+			break;
+		case SP_PARITY_SPACE:
+			data->dcb.Parity = SPACEPARITY;
 			break;
 		default:
 			RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
@@ -1254,6 +1759,9 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 	if (config->parity >= 0) {
 		data->term.c_iflag &= ~IGNPAR;
 		data->term.c_cflag &= ~(PARENB | PARODD);
+#ifdef CMSPAR
+		data->term.c_cflag &= ~CMSPAR;
+#endif
 		switch (config->parity) {
 		case SP_PARITY_NONE:
 			data->term.c_iflag |= IGNPAR;
@@ -1264,6 +1772,20 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 		case SP_PARITY_ODD:
 			data->term.c_cflag |= PARENB | PARODD;
 			break;
+#ifdef CMSPAR
+		case SP_PARITY_MARK:
+			data->term.c_cflag |= PARENB | PARODD;
+			data->term.c_cflag |= CMSPAR;
+			break;
+		case SP_PARITY_SPACE:
+			data->term.c_cflag |= PARENB;
+			data->term.c_cflag |= CMSPAR;
+			break;
+#else
+		case SP_PARITY_MARK:
+		case SP_PARITY_SPACE:
+			RETURN_ERROR(SP_ERR_SUPP, "Mark/space parity not supported");
+#endif
 		default:
 			RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
 		}
@@ -1389,7 +1911,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 		}
 	}
 
-	if (tcsetattr(port->fd, TCSADRAIN, &data->term) < 0)
+	if (tcsetattr(port->fd, TCSANOW, &data->term) < 0)
 		RETURN_FAIL("tcsetattr() failed");
 
 #ifdef __APPLE__
@@ -1415,6 +1937,46 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 	RETURN_OK();
 }
 
+enum sp_return sp_new_config(struct sp_port_config **config_ptr)
+{
+	struct sp_port_config *config;
+
+	TRACE("%p", config_ptr);
+
+	if (!config_ptr)
+		RETURN_ERROR(SP_ERR_ARG, "Null result pointer");
+
+	*config_ptr = NULL;
+
+	if (!(config = malloc(sizeof(struct sp_port_config))))
+		RETURN_ERROR(SP_ERR_MEM, "config malloc failed");
+
+	config->baudrate = -1;
+	config->bits = -1;
+	config->parity = -1;
+	config->stopbits = -1;
+	config->rts = -1;
+	config->cts = -1;
+	config->dtr = -1;
+	config->dsr = -1;
+
+	*config_ptr = config;
+
+	RETURN_OK();
+}
+
+void sp_free_config(struct sp_port_config *config)
+{
+	TRACE("%p", config);
+
+	if (!config)
+		DEBUG("Null config");
+	else
+		free(config);
+
+	RETURN();
+}
+
 enum sp_return sp_get_config(struct sp_port *port, struct sp_port_config *config)
 {
 	struct port_data data;
@@ -1424,7 +1986,7 @@ enum sp_return sp_get_config(struct sp_port *port, struct sp_port_config *config
 	CHECK_OPEN_PORT();
 
 	if (!config)
-		RETURN_ERROR(SP_ERR_ARG, "Null result pointer");
+		RETURN_ERROR(SP_ERR_ARG, "Null config");
 
 	TRY(get_config(port, &data, config));
 
@@ -1449,7 +2011,8 @@ enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *
 	RETURN_OK();
 }
 
-#define CREATE_SETTER(x, type) int sp_set_##x(struct sp_port *port, type x) { \
+#define CREATE_ACCESSORS(x, type) \
+enum sp_return sp_set_##x(struct sp_port *port, type x) { \
 	struct port_data data; \
 	struct sp_port_config config; \
 	TRACE("%p, %d", port, x); \
@@ -1458,55 +2021,79 @@ enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *
 	config.x = x; \
 	TRY(set_config(port, &data, &config)); \
 	RETURN_OK(); \
+} \
+enum sp_return sp_get_config_##x(const struct sp_port_config *config, type *x) { \
+	TRACE("%p, %p", config, x); \
+	if (!config) \
+		RETURN_ERROR(SP_ERR_ARG, "Null config"); \
+	*x = config->x; \
+	RETURN_OK(); \
+} \
+enum sp_return sp_set_config_##x(struct sp_port_config *config, type x) { \
+	TRACE("%p, %d", config, x); \
+	if (!config) \
+		RETURN_ERROR(SP_ERR_ARG, "Null config"); \
+	config->x = x; \
+	RETURN_OK(); \
 }
 
-CREATE_SETTER(baudrate, int)
-CREATE_SETTER(bits, int)
-CREATE_SETTER(parity, enum sp_parity)
-CREATE_SETTER(stopbits, int)
-CREATE_SETTER(rts, enum sp_rts)
-CREATE_SETTER(cts, enum sp_cts)
-CREATE_SETTER(dtr, enum sp_dtr)
-CREATE_SETTER(dsr, enum sp_dsr)
-CREATE_SETTER(xon_xoff, enum sp_xonxoff)
-
-enum sp_return sp_set_flowcontrol(struct sp_port *port, enum sp_flowcontrol flowcontrol)
+CREATE_ACCESSORS(baudrate, int)
+CREATE_ACCESSORS(bits, int)
+CREATE_ACCESSORS(parity, enum sp_parity)
+CREATE_ACCESSORS(stopbits, int)
+CREATE_ACCESSORS(rts, enum sp_rts)
+CREATE_ACCESSORS(cts, enum sp_cts)
+CREATE_ACCESSORS(dtr, enum sp_dtr)
+CREATE_ACCESSORS(dsr, enum sp_dsr)
+CREATE_ACCESSORS(xon_xoff, enum sp_xonxoff)
+
+enum sp_return sp_set_config_flowcontrol(struct sp_port_config *config, enum sp_flowcontrol flowcontrol)
 {
-	struct port_data data;
-	struct sp_port_config config;
-
-	TRACE("%p, %d", port, flowcontrol);
-
-	CHECK_OPEN_PORT();
+	if (!config)
+		RETURN_ERROR(SP_ERR_ARG, "Null configuration");
 
 	if (flowcontrol > SP_FLOWCONTROL_DTRDSR)
 		RETURN_ERROR(SP_ERR_ARG, "Invalid flow control setting");
 
-	TRY(get_config(port, &data, &config));
-
 	if (flowcontrol == SP_FLOWCONTROL_XONXOFF)
-		config.xon_xoff = SP_XONXOFF_INOUT;
+		config->xon_xoff = SP_XONXOFF_INOUT;
 	else
-		config.xon_xoff = SP_XONXOFF_DISABLED;
+		config->xon_xoff = SP_XONXOFF_DISABLED;
 
 	if (flowcontrol == SP_FLOWCONTROL_RTSCTS) {
-		config.rts = SP_RTS_FLOW_CONTROL;
-		config.cts = SP_CTS_FLOW_CONTROL;
+		config->rts = SP_RTS_FLOW_CONTROL;
+		config->cts = SP_CTS_FLOW_CONTROL;
 	} else {
-		if (config.rts == SP_RTS_FLOW_CONTROL)
-			config.rts = SP_RTS_ON;
-		config.cts = SP_CTS_IGNORE;
+		if (config->rts == SP_RTS_FLOW_CONTROL)
+			config->rts = SP_RTS_ON;
+		config->cts = SP_CTS_IGNORE;
 	}
 
 	if (flowcontrol == SP_FLOWCONTROL_DTRDSR) {
-		config.dtr = SP_DTR_FLOW_CONTROL;
-		config.dsr = SP_DSR_FLOW_CONTROL;
+		config->dtr = SP_DTR_FLOW_CONTROL;
+		config->dsr = SP_DSR_FLOW_CONTROL;
 	} else {
-		if (config.dtr == SP_DTR_FLOW_CONTROL)
-			config.dtr = SP_DTR_ON;
-		config.dsr = SP_DSR_IGNORE;
+		if (config->dtr == SP_DTR_FLOW_CONTROL)
+			config->dtr = SP_DTR_ON;
+		config->dsr = SP_DSR_IGNORE;
 	}
 
+	RETURN_OK();
+}
+
+enum sp_return sp_set_flowcontrol(struct sp_port *port, enum sp_flowcontrol flowcontrol)
+{
+	struct port_data data;
+	struct sp_port_config config;
+
+	TRACE("%p, %d", port, flowcontrol);
+
+	CHECK_OPEN_PORT();
+
+	TRY(get_config(port, &data, &config));
+
+	TRY(sp_set_config_flowcontrol(&config, flowcontrol));
+
 	TRY(set_config(port, &data, &config));
 
 	RETURN_OK();
@@ -1645,7 +2232,7 @@ void sp_default_debug_handler(const char *format, ...)
 	va_list args;
 	va_start(args, format);
 	if (getenv("LIBSERIALPORT_DEBUG")) {
-		fputs("libserialport: ", stderr);
+		fputs("sp: ", stderr);
 		vfprintf(stderr, format, args);
 	}
 	va_end(args);