X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=serialport.c;h=4dc1b83d0146917fcfc5927db51df905645351f5;hb=0666ccc7ca446ce2960630e2707389852c812284;hp=7ab8258511aed5fdb801ac8539f0b451cd73ec58;hpb=bccc7c9fa0f00b762392438bea16d4672a984526;p=libserialport.git

diff --git a/serialport.c b/serialport.c
index 7ab8258..4dc1b83 100644
--- a/serialport.c
+++ b/serialport.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2010-2012 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2013 Martin Ling <martin-libserialport@earth.li>
  * Copyright (C) 2013 Matthias Heidbrink <m-sigrok@heidbrink.biz>
+ * Copyright (C) 2014 Aurelien Jacobs <aurel@gnuage.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,93 +21,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef _WIN32
-#include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
-#else
-#include <termios.h>
-#include <sys/ioctl.h>
-#endif
-#ifdef __APPLE__
-#include <IOKit/IOKitLib.h>
-#include <IOKit/serial/IOSerialKeys.h>
-#include <IOKit/serial/ioss.h>
-#include <sys/syslimits.h>
-#endif
-#ifdef __linux__
-#include "libudev.h"
-#include "linux/serial.h"
-#include "linux_termios.h"
-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_TERMIOX)
-#define USE_TERMIOX
-#endif
-#endif
-
-#ifndef _WIN32
-#include "linux_termios.h"
-#endif
-
 #include "libserialport.h"
-
-struct sp_port {
-	char *name;
-	int nonblocking;
-#ifdef _WIN32
-	HANDLE hdl;
-	OVERLAPPED write_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;
-#else
-	struct termios term;
-	int controlbits;
-	int termiox_supported;
-	int flow;
-#endif
-};
-
-/* Standard baud rates. */
-#ifdef _WIN32
-#define BAUD_TYPE DWORD
-#define BAUD(n) {CBR_##n, n}
-#else
-#define BAUD_TYPE speed_t
-#define BAUD(n) {B##n, n}
-#endif
-
-struct std_baudrate {
-	BAUD_TYPE index;
-	int value;
-};
+#include "libserialport_internal.h"
 
 const struct std_baudrate std_baudrates[] = {
 #ifdef _WIN32
@@ -130,48 +46,18 @@ const struct std_baudrate std_baudrates[] = {
 
 void (*sp_debug_handler)(const char *format, ...) = sp_default_debug_handler;
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#define NUM_STD_BAUDRATES ARRAY_SIZE(std_baudrates)
-
-/* Debug output macros. */
-#define DEBUG(fmt, ...) do { if (sp_debug_handler) sp_debug_handler(fmt ".\n", ##__VA_ARGS__); } while (0)
-#define DEBUG_ERROR(err, msg) DEBUG("%s returning " #err ": " msg, __func__)
-#define DEBUG_FAIL(msg) do { \
-	char *errmsg = sp_last_error_message(); \
-	DEBUG("%s returning SP_ERR_FAIL: " msg ": %s", __func__, errmsg); \
-	sp_free_error_message(errmsg); \
-} while (0);
-#define RETURN() do { DEBUG("%s returning", __func__); return; } while(0)
-#define RETURN_CODE(x) do { DEBUG("%s returning " #x, __func__); return x; } while (0)
-#define RETURN_CODEVAL(x) do { \
-	switch (x) { \
-		case SP_OK: RETURN_CODE(SP_OK); \
-		case SP_ERR_ARG: RETURN_CODE(SP_ERR_ARG); \
-		case SP_ERR_FAIL: RETURN_CODE(SP_ERR_FAIL); \
-		case SP_ERR_MEM: RETURN_CODE(SP_ERR_MEM); \
-		case SP_ERR_SUPP: RETURN_CODE(SP_ERR_SUPP); \
-	} \
-} while (0)
-#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 SET_ERROR(val, err, msg) do { DEBUG_ERROR(err, 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)
-
-/* Helper functions. */
-static struct sp_port **list_append(struct sp_port **list, const char *portname);
 static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 	struct sp_port_config *config);
+
 static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 	const struct sp_port_config *config);
 
-enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
+SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
 {
 	struct sp_port *port;
+#ifndef NO_PORT_METADATA
+	enum sp_return ret;
+#endif
 	int len;
 
 	TRACE("%s, %p", portname, port_ptr);
@@ -184,7 +70,7 @@ enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_p
 	if (!portname)
 		RETURN_ERROR(SP_ERR_ARG, "Null port name");
 
-	DEBUG("Building structure for port %s", portname);
+	DEBUG_FMT("Building structure for port %s", portname);
 
 	if (!(port = malloc(sizeof(struct sp_port))))
 		RETURN_ERROR(SP_ERR_MEM, "Port structure malloc failed");
@@ -204,25 +90,141 @@ enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_p
 	port->fd = -1;
 #endif
 
+	port->description = NULL;
+	port->transport = SP_TRANSPORT_NATIVE;
+	port->usb_bus = -1;
+	port->usb_address = -1;
+	port->usb_vid = -1;
+	port->usb_pid = -1;
+	port->usb_manufacturer = NULL;
+	port->usb_product = NULL;
+	port->usb_serial = NULL;
+	port->bluetooth_address = NULL;
+
+#ifndef NO_PORT_METADATA
+	if ((ret = get_port_details(port)) != SP_OK) {
+		sp_free_port(port);
+		return ret;
+	}
+#endif
+
 	*port_ptr = port;
 
 	RETURN_OK();
 }
 
-char *sp_get_port_name(const struct sp_port *port)
+SP_API char *sp_get_port_name(const struct sp_port *port)
 {
 	TRACE("%p", port);
 
 	if (!port)
 		return NULL;
 
-	RETURN_VALUE("%s", port->name);
+	RETURN_STRING(port->name);
+}
+
+SP_API char *sp_get_port_description(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port || !port->description)
+		return NULL;
+
+	RETURN_STRING(port->description);
+}
+
+SP_API enum sp_transport sp_get_port_transport(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port)
+		RETURN_ERROR(SP_ERR_ARG, "Null port");
+
+	RETURN_INT(port->transport);
 }
 
-enum sp_return sp_get_port_handle(const struct sp_port *port, void *result_ptr)
+SP_API enum sp_return sp_get_port_usb_bus_address(const struct sp_port *port,
+                                                  int *usb_bus,int *usb_address)
 {
 	TRACE("%p", port);
 
+	if (!port)
+		RETURN_ERROR(SP_ERR_ARG, "Null port");
+	if (port->transport != SP_TRANSPORT_USB)
+		RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport");
+	if (port->usb_bus < 0 || port->usb_address < 0)
+		RETURN_ERROR(SP_ERR_SUPP, "Bus and address values are not available");
+
+	if (usb_bus)      *usb_bus     = port->usb_bus;
+	if (usb_address)  *usb_address = port->usb_address;
+
+	RETURN_OK();
+}
+
+SP_API enum sp_return sp_get_port_usb_vid_pid(const struct sp_port *port,
+                                              int *usb_vid, int *usb_pid)
+{
+	TRACE("%p", port);
+
+	if (!port)
+		RETURN_ERROR(SP_ERR_ARG, "Null port");
+	if (port->transport != SP_TRANSPORT_USB)
+		RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport");
+	if (port->usb_vid < 0 || port->usb_pid < 0)
+		RETURN_ERROR(SP_ERR_SUPP, "VID:PID values are not available");
+
+	if (usb_vid)  *usb_vid = port->usb_vid;
+	if (usb_pid)  *usb_pid = port->usb_pid;
+
+	RETURN_OK();
+}
+
+SP_API char *sp_get_port_usb_manufacturer(const struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_manufacturer)
+		return NULL;
+
+	RETURN_STRING(port->usb_manufacturer);
+}
+
+SP_API char *sp_get_port_usb_product(const struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_product)
+		return NULL;
+
+	RETURN_STRING(port->usb_product);
+}
+
+SP_API char *sp_get_port_usb_serial(const struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_serial)
+		return NULL;
+
+	RETURN_STRING(port->usb_serial);
+}
+
+SP_API char *sp_get_port_bluetooth_address(const struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	if (!port || port->transport != SP_TRANSPORT_BLUETOOTH
+	    || !port->bluetooth_address)
+		return NULL;
+
+	RETURN_STRING(port->bluetooth_address);
+}
+
+SP_API 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");
 
@@ -237,7 +239,8 @@ enum sp_return sp_get_port_handle(const struct sp_port *port, void *result_ptr)
 	RETURN_OK();
 }
 
-enum sp_return sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
+SP_API enum sp_return sp_copy_port(const struct sp_port *port,
+                                   struct sp_port **copy_ptr)
 {
 	TRACE("%p, %p", port, copy_ptr);
 
@@ -254,15 +257,14 @@ enum sp_return sp_copy_port(const struct sp_port *port, struct sp_port **copy_pt
 
 	DEBUG("Copying port structure");
 
-	RETURN_VALUE("%p", sp_get_port_by_name(port->name, copy_ptr));
+	RETURN_INT(sp_get_port_by_name(port->name, copy_ptr));
 }
 
-void sp_free_port(struct sp_port *port)
+SP_API void sp_free_port(struct sp_port *port)
 {
 	TRACE("%p", port);
 
-	if (!port)
-	{
+	if (!port) {
 		DEBUG("Null port");
 		RETURN();
 	}
@@ -271,13 +273,28 @@ void sp_free_port(struct sp_port *port)
 
 	if (port->name)
 		free(port->name);
+	if (port->description)
+		free(port->description);
+	if (port->usb_manufacturer)
+		free(port->usb_manufacturer);
+	if (port->usb_product)
+		free(port->usb_product);
+	if (port->usb_serial)
+		free(port->usb_serial);
+	if (port->bluetooth_address)
+		free(port->bluetooth_address);
+#ifdef _WIN32
+	if (port->usb_path)
+		free(port->usb_path);
+#endif
 
 	free(port);
 
 	RETURN();
 }
 
-static struct sp_port **list_append(struct sp_port **list, const char *portname)
+SP_PRIV struct sp_port **list_append(struct sp_port **list,
+                                     const char *portname)
 {
 	void *tmp;
 	unsigned int count;
@@ -296,10 +313,10 @@ fail:
 	return NULL;
 }
 
-enum sp_return sp_list_ports(struct sp_port ***list_ptr)
+SP_API enum sp_return sp_list_ports(struct sp_port ***list_ptr)
 {
 	struct sp_port **list;
-	int ret = SP_ERR_SUPP;
+	int ret;
 
 	TRACE("%p", list_ptr);
 
@@ -313,206 +330,10 @@ enum sp_return sp_list_ports(struct sp_port ***list_ptr)
 
 	list[0] = NULL;
 
-#ifdef _WIN32
-	HKEY key;
-	TCHAR *value, *data;
-	DWORD max_value_len, max_data_size, max_data_len;
-	DWORD value_len, data_size, data_len;
-	DWORD type, index = 0;
-	char *name;
-	int name_len;
-
-	ret = SP_OK;
-
-	DEBUG("Opening registry key");
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"),
-			0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) {
-		SET_FAIL(ret, "RegOpenKeyEx() failed");
-		goto out_done;
-	}
-	DEBUG("Querying registry key value and data sizes");
-	if (RegQueryInfoKey(key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-				&max_value_len, &max_data_size, NULL, NULL) != ERROR_SUCCESS) {
-		SET_FAIL(ret, "RegQueryInfoKey() failed");
-		goto out_close;
-	}
-	max_data_len = max_data_size / sizeof(TCHAR);
-	if (!(value = malloc((max_value_len + 1) * sizeof(TCHAR)))) {
-		SET_ERROR(ret, SP_ERR_MEM, "registry value malloc failed");
-		goto out_close;
-	}
-	if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR)))) {
-		SET_ERROR(ret, SP_ERR_MEM, "registry data malloc failed");
-		goto out_free_value;
-	}
-	DEBUG("Iterating over values");
-	while (
-		value_len = max_value_len + 1,
-		data_size = max_data_size,
-		RegEnumValue(key, index, value, &value_len,
-			NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS)
-	{
-		data_len = data_size / sizeof(TCHAR);
-		data[data_len] = '\0';
-#ifdef UNICODE
-		name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL)
+#ifdef NO_ENUMERATION
+	ret = SP_ERR_SUPP;
 #else
-		name_len = data_len + 1;
-#endif
-		if (!(name = malloc(name_len))) {
-			SET_ERROR(ret, SP_ERR_MEM, "registry port name malloc failed");
-			goto out;
-		}
-#ifdef UNICODE
-		WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
-#else
-		strcpy(name, data);
-#endif
-		if (type == REG_SZ) {
-			DEBUG("Found port %s", name);
-			if (!(list = list_append(list, name))) {
-				SET_ERROR(ret, SP_ERR_MEM, "list append failed");
-				goto out;
-			}
-		}
-		index++;
-	}
-out:
-	free(data);
-out_free_value:
-	free(value);
-out_close:
-	RegCloseKey(key);
-out_done:
-#endif
-#ifdef __APPLE__
-	mach_port_t master;
-	CFMutableDictionaryRef classes;
-	io_iterator_t iter;
-	char *path;
-	io_object_t port;
-	CFTypeRef cf_path;
-	Boolean result;
-
-	ret = SP_OK;
-
-	DEBUG("Getting IOKit master port");
-	if (IOMasterPort(MACH_PORT_NULL, &master) != KERN_SUCCESS) {
-		SET_FAIL(ret, "IOMasterPort() failed");
-		goto out_done;
-	}
-
-	DEBUG("Creating matching dictionary");
-	if (!(classes = IOServiceMatching(kIOSerialBSDServiceValue))) {
-		SET_FAIL(ret, "IOServiceMatching() failed");
-		goto out_done;
-	}
-
-	CFDictionarySetValue(classes,
-			CFSTR(kIOSerialBSDTypeKey), CFSTR(kIOSerialBSDAllTypes));
-
-	DEBUG("Getting matching services");
-	if (IOServiceGetMatchingServices(master, classes, &iter) != KERN_SUCCESS) {
-		SET_FAIL(ret, "IOServiceGetMatchingServices() failed");
-		goto out_done;
-	}
-
-	if (!(path = malloc(PATH_MAX))) {
-		SET_ERROR(ret, SP_ERR_MEM, "device path malloc failed");
-		goto out_release;
-	}
-
-	DEBUG("Iterating over results");
-	while ((port = IOIteratorNext(iter))) {
-		cf_path = IORegistryEntryCreateCFProperty(port,
-				CFSTR(kIOCalloutDeviceKey), kCFAllocatorDefault, 0);
-		if (cf_path) {
-			result = CFStringGetCString(cf_path,
-					path, PATH_MAX, kCFStringEncodingASCII);
-			CFRelease(cf_path);
-			if (result) {
-				DEBUG("Found port %s", path);
-				if (!(list = list_append(list, path))) {
-					SET_ERROR(ret, SP_ERR_MEM, "list append failed");
-					IOObjectRelease(port);
-					goto out;
-				}
-			}
-		}
-		IOObjectRelease(port);
-	}
-out:
-	free(path);
-out_release:
-	IOObjectRelease(iter);
-out_done:
-#endif
-#ifdef __linux__
-	struct udev *ud;
-	struct udev_enumerate *ud_enumerate;
-	struct udev_list_entry *ud_list;
-	struct udev_list_entry *ud_entry;
-	const char *path;
-	struct udev_device *ud_dev, *ud_parent;
-	const char *name;
-	const char *driver;
-	int fd, ioctl_result;
-	struct serial_struct serial_info;
-
-	ret = SP_OK;
-
-	DEBUG("Enumerating tty devices");
-	ud = udev_new();
-	ud_enumerate = udev_enumerate_new(ud);
-	udev_enumerate_add_match_subsystem(ud_enumerate, "tty");
-	udev_enumerate_scan_devices(ud_enumerate);
-	ud_list = udev_enumerate_get_list_entry(ud_enumerate);
-	DEBUG("Iterating over results");
-	udev_list_entry_foreach(ud_entry, ud_list) {
-		path = udev_list_entry_get_name(ud_entry);
-		DEBUG("Found device %s", path);
-		ud_dev = udev_device_new_from_syspath(ud, path);
-		/* If there is no parent device, this is a virtual tty. */
-		ud_parent = udev_device_get_parent(ud_dev);
-		if (ud_parent == NULL) {
-			DEBUG("No parent device, assuming virtual tty");
-			udev_device_unref(ud_dev);
-			continue;
-		}
-		name = udev_device_get_devnode(ud_dev);
-		/* The serial8250 driver has a hardcoded number of ports.
-		 * The only way to tell which actually exist on a given system
-		 * is to try to open them and make an ioctl call. */
-		driver = udev_device_get_driver(ud_parent);
-		if (driver && !strcmp(driver, "serial8250")) {
-			DEBUG("serial8250 device, attempting to open");
-			if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) {
-				DEBUG("open failed, skipping");
-				goto skip;
-			}
-			ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info);
-			close(fd);
-			if (ioctl_result != 0) {
-				DEBUG("ioctl failed, skipping");
-				goto skip;
-			}
-			if (serial_info.type == PORT_UNKNOWN) {
-				DEBUG("port type is unknown, skipping");
-				goto skip;
-			}
-		}
-		DEBUG("Found port %s", name);
-		list = list_append(list, name);
-skip:
-		udev_device_unref(ud_dev);
-		if (!list) {
-			SET_ERROR(ret, SP_ERR_MEM, "list append failed");
-			goto out;
-		}
-	}
-out:
-	udev_enumerate_unref(ud_enumerate);
-	udev_unref(ud);
+	ret = list_ports(&list);
 #endif
 
 	switch (ret) {
@@ -520,7 +341,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);
@@ -529,7 +350,7 @@ out:
 	}
 }
 
-void sp_free_port_list(struct sp_port **list)
+SP_API void sp_free_port_list(struct sp_port **list)
 {
 	unsigned int i;
 
@@ -571,41 +392,37 @@ void sp_free_port_list(struct sp_port **list)
 	CHECK_PORT_HANDLE(); \
 } while (0)
 
-enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
+SP_API enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 {
 	struct port_data data;
 	struct sp_port_config config;
 	enum sp_return ret;
 
-	TRACE("%p, %x", port, flags);
+	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);
-
-	port->nonblocking = (flags & SP_MODE_NONBLOCK) ? 1 : 0;
+	DEBUG_FMT("Opening port %s", port->name);
 
 #ifdef _WIN32
-	DWORD desired_access = 0, flags_and_attributes = 0;
-	COMMTIMEOUTS timeouts;
+	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))))
+	if (!(escaped_port_name = malloc(strlen(port->name) + 5)))
 		RETURN_ERROR(SP_ERR_MEM, "Escaped port name malloc failed");
 	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);
@@ -613,33 +430,53 @@ 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");
-
-	/* All timeouts disabled. */
-	timeouts.ReadIntervalTimeout = 0;
-	timeouts.ReadTotalTimeoutMultiplier = 0;
-	timeouts.ReadTotalTimeoutConstant = 0;
-	timeouts.WriteTotalTimeoutMultiplier = 0;
-	timeouts.WriteTotalTimeoutConstant = 0;
-
-	if (port->nonblocking) {
-		/* Set read timeout such that all reads return immediately. */
-		timeouts.ReadIntervalTimeout = MAXDWORD;
-		/* Prepare OVERLAPPED structure for non-blocking writes. */
-		memset(&port->write_ovl, 0, sizeof(port->write_ovl));
-		if (!(port->write_ovl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) {
-			sp_close(port);
-			RETURN_FAIL("CreateEvent() failed");
-		}
-		port->writing = FALSE;
-	}
+		RETURN_FAIL("port CreateFile() failed");
 
-	if (SetCommTimeouts(port->hdl, &timeouts) == 0) {
+	/* 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. */
+#define INIT_OVERLAPPED(ovl) do { \
+	memset(&port->ovl, 0, sizeof(port->ovl)); \
+	port->ovl.hEvent = INVALID_HANDLE_VALUE; \
+	if ((port->ovl.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL)) \
+			== INVALID_HANDLE_VALUE) { \
+		sp_close(port); \
+		RETURN_FAIL(#ovl "CreateEvent() failed"); \
+	} \
+} while (0)
+
+	INIT_OVERLAPPED(read_ovl);
+	INIT_OVERLAPPED(write_ovl);
+	INIT_OVERLAPPED(wait_ovl);
+
+	/* Set event mask for RX and error events. */
+	if (SetCommMask(port->hdl, EV_RXCHAR | EV_ERR) == 0) {
+		sp_close(port);
+		RETURN_FAIL("SetCommMask() failed");
+	}
+
+	/* Start background operation for RX and error events. */
+	if (WaitCommEvent(port->hdl, &port->events, &port->wait_ovl) == 0) {
+		if (GetLastError() != ERROR_IO_PENDING) {
+			sp_close(port);
+			RETURN_FAIL("WaitCommEvent() failed");
+		}
+	}
+
+	port->writing = FALSE;
+
 #else
-	int flags_local = 0;
+	int flags_local = O_NONBLOCK | O_NOCTTY;
 
 	/* Map 'flags' to the OS-specific settings. */
 	if (flags & (SP_MODE_READ | SP_MODE_WRITE))
@@ -648,8 +485,6 @@ 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");
@@ -671,12 +506,36 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	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|IUCLC|IMAXBEL);
-	data.term.c_oflag &= ~(OPOST|OLCUC|ONLCR|OCRNL|ONOCR|ONLRET|NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
+	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
-	data.term.c_lflag &= ~(ISIG|ICANON|ECHO|IEXTEN);
+	data.term.c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN);
 	data.term.c_cc[VMIN] = 0;
 	data.term.c_cc[VTIME] = 0;
 
@@ -684,6 +543,11 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	data.term.c_cflag |= (CLOCAL | CREAD | HUPCL);
 #endif
 
+#ifdef _WIN32
+	if (ClearCommError(port->hdl, &errors, &status) == 0)
+		RETURN_FAIL("ClearCommError() failed");
+#endif
+
 	ret = set_config(port, &data, &config);
 
 	if (ret < 0) {
@@ -694,24 +558,30 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	RETURN_OK();
 }
 
-enum sp_return sp_close(struct sp_port *port)
+SP_API enum sp_return sp_close(struct sp_port *port)
 {
 	TRACE("%p", port);
 
 	CHECK_OPEN_PORT();
 
-	DEBUG("Closing port %s", port->name);
+	DEBUG_FMT("Closing port %s", port->name);
 
 #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;
-	if (port->nonblocking) {
-		/* Close event handle created for overlapped writes. */
-		if (CloseHandle(port->write_ovl.hEvent) == 0)
-			RETURN_FAIL("CloseHandle() failed");
-	}
+
+	/* Close event handles for overlapped structures. */
+#define CLOSE_OVERLAPPED(ovl) do { \
+	if (port->ovl.hEvent != INVALID_HANDLE_VALUE && \
+		CloseHandle(port->ovl.hEvent) == 0) \
+		RETURN_FAIL(# ovl "event CloseHandle() failed"); \
+} while (0)
+	CLOSE_OVERLAPPED(read_ovl);
+	CLOSE_OVERLAPPED(write_ovl);
+	CLOSE_OVERLAPPED(wait_ovl);
+
 #else
 	/* Returns 0 upon success, -1 upon failure. */
 	if (close(port->fd) == -1)
@@ -722,9 +592,9 @@ enum sp_return sp_close(struct sp_port *port)
 	RETURN_OK();
 }
 
-enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
+SP_API 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();
 
@@ -733,7 +603,8 @@ enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
 
 	const char *buffer_names[] = {"no", "input", "output", "both"};
 
-	DEBUG("Flushing %s buffers on port %s", buffer_names[buffers], port->name);
+	DEBUG_FMT("Flushing %s buffers on port %s",
+		buffer_names[buffers], port->name);
 
 #ifdef _WIN32
 	DWORD flags = 0;
@@ -761,28 +632,161 @@ enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
 	RETURN_OK();
 }
 
-enum sp_return sp_drain(struct sp_port *port)
+SP_API enum sp_return sp_drain(struct sp_port *port)
 {
 	TRACE("%p", port);
 
 	CHECK_OPEN_PORT();
 
-	DEBUG("Draining port %s", port->name);
+	DEBUG_FMT("Draining port %s", port->name);
 
 #ifdef _WIN32
 	/* 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();
+SP_API 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_FMT("Writing %d bytes to port %s, timeout %d ms",
+			count, port->name, timeout);
+	else
+		DEBUG_FMT("Writing %d bytes to port %s, no timeout",
+			count, port->name);
+
+	if (count == 0)
+		RETURN_INT(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_FMT("Write completed, %d/%d bytes written", bytes_written, count);
+			RETURN_INT(bytes_written);
+		} else {
+			RETURN_FAIL("WriteFile() failed");
+		}
+	} else {
+		DEBUG("Write completed immediately");
+		RETURN_INT(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_INT(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_INT(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_INT(bytes_written);
+#endif
 }
 
-enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
+SP_API enum sp_return sp_nonblocking_write(struct sp_port *port,
+                                           const void *buf, size_t count)
 {
 	TRACE("%p, %p, %d", port, buf, count);
 
@@ -791,63 +795,65 @@ enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
 	if (!buf)
 		RETURN_ERROR(SP_ERR_ARG, "Null buffer");
 
-	DEBUG("Writing up to %d bytes to port %s", count, port->name);
+	DEBUG_FMT("Writing up to %d bytes to port %s", count, port->name);
 
 	if (count == 0)
-		RETURN_VALUE("0", 0);
+		RETURN_INT(0);
 
 #ifdef _WIN32
 	DWORD written = 0;
 	BYTE *ptr = (BYTE *) buf;
 
-	if (port->nonblocking) {
-		/* Non-blocking write. */
-
-		/* 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);
-			}
+	/* 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_INT(0);
 		}
+	}
 
-		/* 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) {
-					DEBUG("Asynchronous write started");
-					port->writing = 1;
-					RETURN_VALUE("%d", ++written);
+	/* 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 {
-					/* Actual failure of some kind. */
-					RETURN_FAIL("WriteFile() failed");
+					DEBUG("Asynchronous write running");
+					port->writing = 1;
+					RETURN_INT(++written);
 				}
 			} else {
-				DEBUG("Single byte written immediately.");
-				written++;
+				/* Actual failure of some kind. */
+				RETURN_FAIL("WriteFile() failed");
 			}
-		}
-
-		DEBUG("All bytes written immediately.");
-
-	} else {
-		/* Blocking write. */
-		if (WriteFile(port->hdl, buf, count, &written, NULL) == 0) {
-			RETURN_FAIL("WriteFile() failed");
+		} else {
+			DEBUG("Single byte written immediately");
+			written++;
 		}
 	}
 
-	RETURN_VALUE("%d", written);
+	DEBUG("All bytes written immediately");
+
+	RETURN_INT(written);
 #else
 	/* Returns the number of bytes written, or -1 upon failure. */
 	ssize_t written = write(port->fd, buf, count);
@@ -855,45 +861,406 @@ enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
 	if (written < 0)
 		RETURN_FAIL("write() failed");
 	else
-		RETURN_VALUE("%d", written);
+		RETURN_INT(written);
 #endif
 }
 
-enum sp_return sp_read(struct sp_port *port, void *buf, size_t count)
+SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
+                                       size_t count, unsigned int timeout)
 {
-	TRACE("%p, %p, %d", port, buf, count);
+	TRACE("%p, %p, %d, %d", port, buf, count, timeout);
 
 	CHECK_OPEN_PORT();
 
 	if (!buf)
 		RETURN_ERROR(SP_ERR_ARG, "Null buffer");
 
-	DEBUG("Reading up to %d bytes from port %s", count, port->name);
+	if (timeout)
+		DEBUG_FMT("Reading %d bytes from port %s, timeout %d ms",
+			count, port->name, timeout);
+	else
+		DEBUG_FMT("Reading %d bytes from port %s, no timeout",
+			count, port->name);
+
+	if (count == 0)
+		RETURN_INT(0);
 
 #ifdef _WIN32
 	DWORD bytes_read = 0;
 
-	/* Returns non-zero upon success, 0 upon failure. */
-	if (ReadFile(port->hdl, buf, count, &bytes_read, NULL) == 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_FMT("Read completed, %d/%d bytes read", bytes_read, count);
+		} else {
+			RETURN_FAIL("ReadFile() failed");
+		}
+	} else {
+		DEBUG("Read completed immediately");
+		bytes_read = count;
+	}
+
+	/* Start background operation for subsequent events. */
+	if (WaitCommEvent(port->hdl, &port->events, &port->wait_ovl) == 0) {
+		if (GetLastError() != ERROR_IO_PENDING)
+			RETURN_FAIL("WaitCommEvent() failed");
+	}
+
+	RETURN_INT(bytes_read);
+
+#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_INT(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_INT(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_INT(bytes_read);
+#endif
+}
+
+SP_API enum sp_return sp_nonblocking_read(struct sp_port *port, void *buf,
+                                          size_t count)
+{
+	TRACE("%p, %p, %d", port, buf, count);
+
+	CHECK_OPEN_PORT();
+
+	if (!buf)
+		RETURN_ERROR(SP_ERR_ARG, "Null buffer");
+
+	DEBUG_FMT("Reading up to %d bytes from port %s", count, port->name);
+
+#ifdef _WIN32
+	DWORD bytes_read;
+
+	/* 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");
-	RETURN_VALUE("%d", bytes_read);
+
+	/* Get number of bytes read. */
+	if (GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0)
+		RETURN_FAIL("GetOverlappedResult() failed");
+
+	if (bytes_read > 0) {
+		/* Start background operation for subsequent events. */
+		if (WaitCommEvent(port->hdl, &port->events, &port->wait_ovl) == 0) {
+			if (GetLastError() != ERROR_IO_PENDING)
+				RETURN_FAIL("WaitCommEvent() failed");
+		}
+	}
+
+	RETURN_INT(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) {
-		if (port->nonblocking && errno == EAGAIN)
-			/* Port is opened in nonblocking mode and there are no bytes available. */
+		if (errno == EAGAIN)
+			/* No bytes available. */
 			bytes_read = 0;
 		else
 			/* This is an actual failure. */
 			RETURN_FAIL("read() failed");
 	}
-	RETURN_VALUE("%d", bytes_read);
+	RETURN_INT(bytes_read);
+#endif
+}
+
+SP_API enum sp_return sp_input_waiting(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	CHECK_OPEN_PORT();
+
+	DEBUG_FMT("Checking input bytes waiting on port %s", port->name);
+
+#ifdef _WIN32
+	DWORD errors;
+	COMSTAT comstat;
+
+	if (ClearCommError(port->hdl, &errors, &comstat) == 0)
+		RETURN_FAIL("ClearCommError() failed");
+	RETURN_INT(comstat.cbInQue);
+#else
+	int bytes_waiting;
+	if (ioctl(port->fd, TIOCINQ, &bytes_waiting) < 0)
+		RETURN_FAIL("TIOCINQ ioctl failed");
+	RETURN_INT(bytes_waiting);
 #endif
 }
 
-#ifdef __linux__
+SP_API enum sp_return sp_output_waiting(struct sp_port *port)
+{
+	TRACE("%p", port);
+
+	CHECK_OPEN_PORT();
+
+	DEBUG_FMT("Checking output bytes waiting on port %s", port->name);
+
+#ifdef _WIN32
+	DWORD errors;
+	COMSTAT comstat;
+
+	if (ClearCommError(port->hdl, &errors, &comstat) == 0)
+		RETURN_FAIL("ClearCommError() failed");
+	RETURN_INT(comstat.cbOutQue);
+#else
+	int bytes_waiting;
+	if (ioctl(port->fd, TIOCOUTQ, &bytes_waiting) < 0)
+		RETURN_FAIL("TIOCOUTQ ioctl failed");
+	RETURN_INT(bytes_waiting);
+#endif
+}
+
+SP_API enum sp_return sp_new_event_set(struct sp_event_set **result_ptr)
+{
+	struct sp_event_set *result;
+
+	TRACE("%p", result_ptr);
+
+	if (!result_ptr)
+		RETURN_ERROR(SP_ERR_ARG, "Null result");
+
+	*result_ptr = NULL;
+
+	if (!(result = malloc(sizeof(struct sp_event_set))))
+		RETURN_ERROR(SP_ERR_MEM, "sp_event_set malloc() failed");
+
+	memset(result, 0, sizeof(struct sp_event_set));
+
+	*result_ptr = result;
+
+	RETURN_OK();
+}
+
+static enum sp_return add_handle(struct sp_event_set *event_set,
+		event_handle handle, enum sp_event mask)
+{
+	void *new_handles;
+	enum sp_event *new_masks;
+
+	TRACE("%p, %d, %d", event_set, handle, mask);
+
+	if (!(new_handles = realloc(event_set->handles,
+			sizeof(event_handle) * (event_set->count + 1))))
+		RETURN_ERROR(SP_ERR_MEM, "handle array realloc() failed");
+
+	if (!(new_masks = realloc(event_set->masks,
+			sizeof(enum sp_event) * (event_set->count + 1))))
+		RETURN_ERROR(SP_ERR_MEM, "mask array realloc() failed");
+
+	event_set->handles = new_handles;
+	event_set->masks = new_masks;
+
+	((event_handle *) event_set->handles)[event_set->count] = handle;
+	event_set->masks[event_set->count] = mask;
+
+	event_set->count++;
+
+	RETURN_OK();
+}
+
+SP_API enum sp_return sp_add_port_events(struct sp_event_set *event_set,
+	const struct sp_port *port, enum sp_event mask)
+{
+	TRACE("%p, %p, %d", event_set, port, mask);
+
+	if (!event_set)
+		RETURN_ERROR(SP_ERR_ARG, "Null event set");
+
+	if (!port)
+		RETURN_ERROR(SP_ERR_ARG, "Null port");
+
+	if (mask > (SP_EVENT_RX_READY | SP_EVENT_TX_READY | SP_EVENT_ERROR))
+		RETURN_ERROR(SP_ERR_ARG, "Invalid event mask");
+
+	if (!mask)
+		RETURN_OK();
+
+#ifdef _WIN32
+	enum sp_event handle_mask;
+	if ((handle_mask = mask & SP_EVENT_TX_READY))
+		TRY(add_handle(event_set, port->write_ovl.hEvent, handle_mask));
+	if ((handle_mask = mask & (SP_EVENT_RX_READY | SP_EVENT_ERROR)))
+		TRY(add_handle(event_set, port->wait_ovl.hEvent, handle_mask));
+#else
+	TRY(add_handle(event_set, port->fd, mask));
+#endif
+
+	RETURN_OK();
+}
+
+SP_API void sp_free_event_set(struct sp_event_set *event_set)
+{
+	TRACE("%p", event_set);
+
+	if (!event_set) {
+		DEBUG("Null event set");
+		RETURN();
+	}
+
+	DEBUG("Freeing event set");
+
+	if (event_set->handles)
+		free(event_set->handles);
+	if (event_set->masks)
+		free(event_set->masks);
+
+	free(event_set);
+
+	RETURN();
+}
+
+SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
+                              unsigned int timeout)
+{
+	TRACE("%p, %d", event_set, timeout);
+
+	if (!event_set)
+		RETURN_ERROR(SP_ERR_ARG, "Null event set");
+
+#ifdef _WIN32
+	if (WaitForMultipleObjects(event_set->count, event_set->handles, FALSE,
+			timeout ? timeout : INFINITE) == WAIT_FAILED)
+		RETURN_FAIL("WaitForMultipleObjects() failed");
+
+	RETURN_OK();
+#else
+	struct timeval start, delta, now, end = {0, 0};
+	int result, timeout_remaining;
+	struct pollfd *pollfds;
+	unsigned int i;
+
+	if (!(pollfds = malloc(sizeof(struct pollfd) * event_set->count)))
+		RETURN_ERROR(SP_ERR_MEM, "pollfds malloc() failed");
+
+	for (i = 0; i < event_set->count; i++) {
+		pollfds[i].fd = ((int *) event_set->handles)[i];
+		pollfds[i].events = 0;
+		pollfds[i].revents = 0;
+		if (event_set->masks[i] & SP_EVENT_RX_READY)
+			pollfds[i].events |= POLLIN;
+		if (event_set->masks[i] & SP_EVENT_TX_READY)
+			pollfds[i].events |= POLLOUT;
+		if (event_set->masks[i] & SP_EVENT_ERROR)
+			pollfds[i].events |= POLLERR;
+	}
+
+	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 an event occurs. */
+	while (1)
+	{
+		if (timeout) {
+			gettimeofday(&now, NULL);
+			if (timercmp(&now, &end, >)) {
+				DEBUG("wait timed out");
+				break;
+			}
+			timersub(&end, &now, &delta);
+			timeout_remaining = delta.tv_sec * 1000 + delta.tv_usec / 1000;
+		}
+
+		result = poll(pollfds, event_set->count, timeout ? timeout_remaining : -1);
+
+		if (result < 0) {
+			if (errno == EINTR) {
+				DEBUG("poll() call was interrupted, repeating");
+				continue;
+			} else {
+				free(pollfds);
+				RETURN_FAIL("poll() failed");
+			}
+		} else if (result == 0) {
+			DEBUG("poll() timed out");
+			break;
+		} else {
+			DEBUG("poll() completed");
+			break;
+		}
+	}
+
+	free(pollfds);
+	RETURN_OK();
+#endif
+}
+
+#ifdef USE_TERMIOS_SPEED
 static enum sp_return get_baudrate(int fd, int *baudrate)
 {
 	void *data;
@@ -946,62 +1313,64 @@ static enum sp_return set_baudrate(int fd, int baudrate)
 
 	RETURN_OK();
 }
+#endif /* USE_TERMIOS_SPEED */
 
 #ifdef USE_TERMIOX
-static enum sp_return get_flow(int fd, int *flow)
+static enum sp_return get_flow(int fd, struct port_data *data)
 {
-	void *data;
+	void *termx;
 
-	TRACE("%d, %p", fd, flow);
+	TRACE("%d, %p", fd, data);
 
 	DEBUG("Getting advanced flow control");
 
-	if (!(data = malloc(get_termiox_size())))
+	if (!(termx = malloc(get_termiox_size())))
 		RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed");
 
-	if (ioctl(fd, TCGETX, data) < 0) {
-		free(data);
+	if (ioctl(fd, TCGETX, termx) < 0) {
+		free(termx);
 		RETURN_FAIL("getting termiox failed");
 	}
 
-	*flow = get_termiox_flow(data);
+	get_termiox_flow(termx, &data->rts_flow, &data->cts_flow,
+			&data->dtr_flow, &data->dsr_flow);
 
-	free(data);
+	free(termx);
 
 	RETURN_OK();
 }
 
-static enum sp_return set_flow(int fd, int flow)
+static enum sp_return set_flow(int fd, struct port_data *data)
 {
-	void *data;
+	void *termx;
 
-	TRACE("%d, %d", fd, flow);
+	TRACE("%d, %p", fd, data);
 
 	DEBUG("Getting advanced flow control");
 
-	if (!(data = malloc(get_termiox_size())))
+	if (!(termx = malloc(get_termiox_size())))
 		RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed");
 
-	if (ioctl(fd, TCGETX, data) < 0) {
-		free(data);
+	if (ioctl(fd, TCGETX, termx) < 0) {
+		free(termx);
 		RETURN_FAIL("getting termiox failed");
 	}
 
 	DEBUG("Setting advanced flow control");
 
-	set_termiox_flow(data, flow);
+	set_termiox_flow(termx, data->rts_flow, data->cts_flow,
+			data->dtr_flow, data->dsr_flow);
 
-	if (ioctl(fd, TCSETX, data) < 0) {
-		free(data);
+	if (ioctl(fd, TCSETX, termx) < 0) {
+		free(termx);
 		RETURN_FAIL("setting termiox failed");
 	}
 
-	free(data);
+	free(termx);
 
 	RETURN_OK();
 }
 #endif /* USE_TERMIOX */
-#endif /* __linux__ */
 
 static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 	struct sp_port_config *config)
@@ -1010,7 +1379,7 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 
 	TRACE("%p, %p, %p", port, data, config);
 
-	DEBUG("Getting configuration for port %s", port->name);
+	DEBUG_FMT("Getting configuration for port %s", port->name);
 
 #ifdef _WIN32
 	if (!GetCommState(port->hdl, &data->dcb))
@@ -1116,7 +1485,7 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 		RETURN_FAIL("TIOCMGET ioctl failed");
 
 #ifdef USE_TERMIOX
-	int ret = get_flow(port->fd, &data->flow);
+	int ret = get_flow(port->fd, data);
 
 	if (ret == SP_ERR_FAIL && errno == EINVAL)
 		data->termiox_supported = 0;
@@ -1138,7 +1507,7 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 	if (i == NUM_STD_BAUDRATES) {
 #ifdef __APPLE__
 		config->baudrate = (int)data->term.c_ispeed;
-#elif defined(__linux__)
+#elif defined(USE_TERMIOS_SPEED)
 		TRY(get_baudrate(port->fd, &config->baudrate));
 #else
 		config->baudrate = -1;
@@ -1166,8 +1535,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;
 
@@ -1177,21 +1548,21 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 		config->rts = SP_RTS_FLOW_CONTROL;
 		config->cts = SP_CTS_FLOW_CONTROL;
 	} else {
-		if (data->termiox_supported && data->flow & RTS_FLOW)
+		if (data->termiox_supported && data->rts_flow)
 			config->rts = SP_RTS_FLOW_CONTROL;
 		else
 			config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
 
-		config->cts = (data->termiox_supported && data->flow & CTS_FLOW) ?
+		config->cts = (data->termiox_supported && data->cts_flow) ?
 			SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
 	}
 
-	if (data->termiox_supported && data->flow & DTR_FLOW)
+	if (data->termiox_supported && data->dtr_flow)
 		config->dtr = SP_DTR_FLOW_CONTROL;
 	else
 		config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
 
-	config->dsr = (data->termiox_supported && data->flow & DSR_FLOW) ?
+	config->dsr = (data->termiox_supported && data->dsr_flow) ?
 		SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
 
 	if (data->term.c_iflag & IXOFF) {
@@ -1219,13 +1590,13 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
 	baud_nonstd = B0;
 #endif
-#ifdef __linux__
+#ifdef USE_TERMIOS_SPEED
 	int baud_nonstd = 0;
 #endif
 
 	TRACE("%p, %p, %p", port, data, config);
 
-	DEBUG("Setting configuration for port %s", port->name);
+	DEBUG_FMT("Setting configuration for port %s", port->name);
 
 #ifdef _WIN32
 	if (config->baudrate >= 0) {
@@ -1245,7 +1616,6 @@ 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;
@@ -1387,7 +1757,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 			if (cfsetspeed(&data->term, B9600) < 0)
 				RETURN_FAIL("cfsetspeed() failed");
 			baud_nonstd = config->baudrate;
-#elif defined(__linux__)
+#elif defined(USE_TERMIOS_SPEED)
 			baud_nonstd = 1;
 #else
 			RETURN_ERROR(SP_ERR_SUPP, "Non-standard baudrate not supported");
@@ -1417,7 +1787,10 @@ 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 | CMSPAR);
+		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;
@@ -1428,12 +1801,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 | CMSPAR;
+			data->term.c_cflag |= PARENB | PARODD;
+			data->term.c_cflag |= CMSPAR;
 			break;
 		case SP_PARITY_SPACE:
-			data->term.c_cflag |= PARENB | CMSPAR;
+			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");
 		}
@@ -1455,7 +1836,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
 	if (config->rts >= 0 || config->cts >= 0) {
 		if (data->termiox_supported) {
-			data->flow &= ~(RTS_FLOW | CTS_FLOW);
+			data->rts_flow = data->cts_flow = 0;
 			switch (config->rts) {
 			case SP_RTS_OFF:
 			case SP_RTS_ON:
@@ -1464,15 +1845,15 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 					RETURN_FAIL("Setting RTS signal level failed");
 				break;
 			case SP_RTS_FLOW_CONTROL:
-				data->flow |= RTS_FLOW;
+				data->rts_flow = 1;
 				break;
 			default:
 				break;
 			}
 			if (config->cts == SP_CTS_FLOW_CONTROL)
-				data->flow |= CTS_FLOW;
+				data->cts_flow = 1;
 
-			if (data->flow & (RTS_FLOW | CTS_FLOW))
+			if (data->rts_flow && data->cts_flow)
 				data->term.c_iflag |= CRTSCTS;
 			else
 				data->term.c_iflag &= ~CRTSCTS;
@@ -1510,7 +1891,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 
 	if (config->dtr >= 0 || config->dsr >= 0) {
 		if (data->termiox_supported) {
-			data->flow &= ~(DTR_FLOW | DSR_FLOW);
+			data->dtr_flow = data->dsr_flow = 0;
 			switch (config->dtr) {
 			case SP_DTR_OFF:
 			case SP_DTR_ON:
@@ -1519,13 +1900,13 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 					RETURN_FAIL("Setting DTR signal level failed");
 				break;
 			case SP_DTR_FLOW_CONTROL:
-				data->flow |= DTR_FLOW;
+				data->dtr_flow = 1;
 				break;
 			default:
 				break;
 			}
 			if (config->dsr == SP_DSR_FLOW_CONTROL)
-				data->flow |= DSR_FLOW;
+				data->dsr_flow = 1;
 		} else {
 			/* DTR/DSR flow control not supported. */
 			if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL)
@@ -1572,11 +1953,13 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
 			RETURN_FAIL("cfsetspeed() failed");
 	}
 #elif defined(__linux__)
+#ifdef USE_TERMIOS_SPEED
 	if (baud_nonstd)
 		TRY(set_baudrate(port->fd, config->baudrate));
+#endif
 #ifdef USE_TERMIOX
 	if (data->termiox_supported)
-		TRY(set_flow(port->fd, data->flow));
+		TRY(set_flow(port->fd, data));
 #endif
 #endif
 
@@ -1585,11 +1968,12 @@ 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)
+SP_API enum sp_return sp_new_config(struct sp_port_config **config_ptr)
 {
-	TRACE("%p", config_ptr);
 	struct sp_port_config *config;
 
+	TRACE("%p", config_ptr);
+
 	if (!config_ptr)
 		RETURN_ERROR(SP_ERR_ARG, "Null result pointer");
 
@@ -1612,7 +1996,7 @@ enum sp_return sp_new_config(struct sp_port_config **config_ptr)
 	RETURN_OK();
 }
 
-void sp_free_config(struct sp_port_config *config)
+SP_API void sp_free_config(struct sp_port_config *config)
 {
 	TRACE("%p", config);
 
@@ -1624,7 +2008,8 @@ void sp_free_config(struct sp_port_config *config)
 	RETURN();
 }
 
-enum sp_return sp_get_config(struct sp_port *port, struct sp_port_config *config)
+SP_API enum sp_return sp_get_config(struct sp_port *port,
+                                    struct sp_port_config *config)
 {
 	struct port_data data;
 
@@ -1640,7 +2025,8 @@ enum sp_return sp_get_config(struct sp_port *port, struct sp_port_config *config
 	RETURN_OK();
 }
 
-enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *config)
+SP_API enum sp_return sp_set_config(struct sp_port *port,
+                                    const struct sp_port_config *config)
 {
 	struct port_data data;
 	struct sp_port_config prev_config;
@@ -1659,7 +2045,7 @@ enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *
 }
 
 #define CREATE_ACCESSORS(x, type) \
-enum sp_return sp_set_##x(struct sp_port *port, type x) { \
+SP_API 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); \
@@ -1669,14 +2055,16 @@ enum sp_return sp_set_##x(struct sp_port *port, type 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", config); \
+SP_API 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) { \
+SP_API 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"); \
@@ -1694,7 +2082,8 @@ 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)
+SP_API enum sp_return sp_set_config_flowcontrol(struct sp_port_config *config,
+                                                enum sp_flowcontrol flowcontrol)
 {
 	if (!config)
 		RETURN_ERROR(SP_ERR_ARG, "Null configuration");
@@ -1728,7 +2117,8 @@ enum sp_return sp_set_config_flowcontrol(struct sp_port_config *config, enum sp_
 	RETURN_OK();
 }
 
-enum sp_return sp_set_flowcontrol(struct sp_port *port, enum sp_flowcontrol flowcontrol)
+SP_API enum sp_return sp_set_flowcontrol(struct sp_port *port,
+                                         enum sp_flowcontrol flowcontrol)
 {
 	struct port_data data;
 	struct sp_port_config config;
@@ -1746,7 +2136,8 @@ enum sp_return sp_set_flowcontrol(struct sp_port *port, enum sp_flowcontrol flow
 	RETURN_OK();
 }
 
-enum sp_return sp_get_signals(struct sp_port *port, enum sp_signal *signals)
+SP_API enum sp_return sp_get_signals(struct sp_port *port,
+                                     enum sp_signal *signals)
 {
 	TRACE("%p, %p", port, signals);
 
@@ -1755,7 +2146,7 @@ enum sp_return sp_get_signals(struct sp_port *port, enum sp_signal *signals)
 	if (!signals)
 		RETURN_ERROR(SP_ERR_ARG, "Null result pointer");
 
-	DEBUG("Getting control signals for port %s", port->name);
+	DEBUG_FMT("Getting control signals for port %s", port->name);
 
 	*signals = 0;
 #ifdef _WIN32
@@ -1786,7 +2177,7 @@ enum sp_return sp_get_signals(struct sp_port *port, enum sp_signal *signals)
 	RETURN_OK();
 }
 
-enum sp_return sp_start_break(struct sp_port *port)
+SP_API enum sp_return sp_start_break(struct sp_port *port)
 {
 	TRACE("%p", port);
 
@@ -1802,7 +2193,7 @@ enum sp_return sp_start_break(struct sp_port *port)
 	RETURN_OK();
 }
 
-enum sp_return sp_end_break(struct sp_port *port)
+SP_API enum sp_return sp_end_break(struct sp_port *port)
 {
 	TRACE("%p", port);
 
@@ -1818,19 +2209,19 @@ enum sp_return sp_end_break(struct sp_port *port)
 	RETURN_OK();
 }
 
-int sp_last_error_code(void)
+SP_API int sp_last_error_code(void)
 {
-	TRACE("");
+	TRACE_VOID();
 #ifdef _WIN32
-	RETURN_VALUE("%d", GetLastError());
+	RETURN_INT(GetLastError());
 #else
-	RETURN_VALUE("%d", errno);
+	RETURN_INT(errno);
 #endif
 }
 
-char *sp_last_error_message(void)
+SP_API char *sp_last_error_message(void)
 {
-	TRACE("");
+	TRACE_VOID();
 
 #ifdef _WIN32
 	LPVOID message;
@@ -1846,13 +2237,13 @@ char *sp_last_error_message(void)
 		(LPTSTR) &message,
 		0, NULL );
 
-	RETURN_VALUE("%s", message);
+	RETURN_STRING(message);
 #else
-	RETURN_VALUE("%s", strerror(errno));
+	RETURN_STRING(strerror(errno));
 #endif
 }
 
-void sp_free_error_message(char *message)
+SP_API void sp_free_error_message(char *message)
 {
 	TRACE("%s", message);
 
@@ -1865,7 +2256,7 @@ void sp_free_error_message(char *message)
 	RETURN();
 }
 
-void sp_set_debug_handler(void (*handler)(const char *format, ...))
+SP_API void sp_set_debug_handler(void (*handler)(const char *format, ...))
 {
 	TRACE("%p", handler);
 
@@ -1874,13 +2265,55 @@ void sp_set_debug_handler(void (*handler)(const char *format, ...))
 	RETURN();
 }
 
-void sp_default_debug_handler(const char *format, ...)
+SP_API 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);
 }
+
+SP_API int sp_get_major_package_version(void)
+{
+	return SP_PACKAGE_VERSION_MAJOR;
+}
+
+SP_API int sp_get_minor_package_version(void)
+{
+	return SP_PACKAGE_VERSION_MINOR;
+}
+
+SP_API int sp_get_micro_package_version(void)
+{
+	return SP_PACKAGE_VERSION_MICRO;
+}
+
+SP_API const char *sp_get_package_version_string(void)
+{
+	return SP_PACKAGE_VERSION_STRING;
+}
+
+SP_API int sp_get_current_lib_version(void)
+{
+	return SP_LIB_VERSION_CURRENT;
+}
+
+SP_API int sp_get_revision_lib_version(void)
+{
+	return SP_LIB_VERSION_REVISION;
+}
+
+SP_API int sp_get_age_lib_version(void)
+{
+	return SP_LIB_VERSION_AGE;
+}
+
+SP_API const char *sp_get_lib_version_string(void)
+{
+	return SP_LIB_VERSION_STRING;
+}
+
+/** @} */