* Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
* 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>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
#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
#include "libserialport.h"
#else
struct termios term;
int controlbits;
+#ifdef USE_TERMIOX
+ int flow;
+#endif
#endif
};
*/
BAUD(110), BAUD(300), BAUD(600), BAUD(1200), BAUD(2400), BAUD(4800),
BAUD(9600), BAUD(14400), BAUD(19200), BAUD(38400), BAUD(57600),
- BAUD(115200), BAUD(128000), BAUD(256000)
+ BAUD(115200), BAUD(128000), BAUD(256000),
#else
- BAUD(50), BAUD(75), BAUD(110), BAUD(134), BAUD(150), BAUD(200), BAUD(300),
- BAUD(600), BAUD(1200), BAUD(1800), BAUD(2400), BAUD(4800), BAUD(9600),
- BAUD(19200), BAUD(38400), BAUD(57600), BAUD(115200), BAUD(230400),
+ BAUD(50), BAUD(75), BAUD(110), BAUD(134), BAUD(150), BAUD(200),
+ BAUD(300), BAUD(600), BAUD(1200), BAUD(1800), BAUD(2400), BAUD(4800),
+ BAUD(9600), BAUD(19200), BAUD(38400), BAUD(57600), BAUD(115200),
+ BAUD(230400),
#if !defined(__APPLE__) && !defined(__OpenBSD__)
- BAUD(460800)
+ BAUD(460800),
#endif
#endif
};
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define NUM_STD_BAUDRATES ARRAY_SIZE(std_baudrates)
+#define TRY(x) do { int ret = x; if (ret != SP_OK) return ret; } while (0)
+
/* Helper functions. */
-static int validate_port(struct sp_port *port);
+static enum sp_return validate_port(struct sp_port *port);
static struct sp_port **list_append(struct sp_port **list, const char *portname);
-static int get_config(struct sp_port *port, struct port_data *data, struct sp_port_config *config);
-static int set_config(struct sp_port *port, struct port_data *data, struct sp_port_config *config);
+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);
-int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
+enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
{
struct sp_port *port;
int len;
len = strlen(portname) + 1;
- if (!(port->name = malloc(len)))
- {
+ if (!(port->name = malloc(len))) {
free(port);
return SP_ERR_MEM;
}
return SP_OK;
}
-int sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
+enum sp_return sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
{
if (!copy_ptr)
return SP_ERR_ARG;
return NULL;
}
-int sp_list_ports(struct sp_port ***list_ptr)
+enum sp_return sp_list_ports(struct sp_port ***list_ptr)
{
struct sp_port **list;
int ret = SP_OK;
int name_len;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"),
- 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS)
- {
+ 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) {
ret = SP_ERR_FAIL;
goto out_done;
}
if (RegQueryInfoKey(key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- &max_value_len, &max_data_size, NULL, NULL) != ERROR_SUCCESS)
- {
+ &max_value_len, &max_data_size, NULL, NULL) != ERROR_SUCCESS) {
ret = SP_ERR_FAIL;
goto out_close;
}
max_data_len = max_data_size / sizeof(TCHAR);
- if (!(value = malloc((max_value_len + 1) * sizeof(TCHAR))))
- {
+ if (!(value = malloc((max_value_len + 1) * sizeof(TCHAR)))) {
ret = SP_ERR_MEM;
goto out_close;
}
- if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR))))
- {
+ if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR)))) {
ret = SP_ERR_MEM;
goto out_free_value;
}
#else
name_len = data_len + 1;
#endif
- if (!(name = malloc(name_len)))
- {
+ if (!(name = malloc(name_len))) {
ret = SP_ERR_MEM;
goto out;
}
#else
strcpy(name, data);
#endif
- if (type == REG_SZ && !(list = list_append(list, name)))
- {
+ if (type == REG_SZ && !(list = list_append(list, name))) {
ret = SP_ERR_MEM;
goto out;
}
CFTypeRef cf_path;
Boolean result;
- if (IOMasterPort(MACH_PORT_NULL, &master) != KERN_SUCCESS)
- {
+ if (IOMasterPort(MACH_PORT_NULL, &master) != KERN_SUCCESS) {
ret = SP_ERR_FAIL;
goto out_done;
}
- if (!(classes = IOServiceMatching(kIOSerialBSDServiceValue)))
- {
+ if (!(classes = IOServiceMatching(kIOSerialBSDServiceValue))) {
ret = SP_ERR_FAIL;
goto out_done;
}
CFDictionarySetValue(classes,
CFSTR(kIOSerialBSDTypeKey), CFSTR(kIOSerialBSDAllTypes));
- if (IOServiceGetMatchingServices(master, classes, &iter) != KERN_SUCCESS)
- {
+ if (IOServiceGetMatchingServices(master, classes, &iter) != KERN_SUCCESS) {
ret = SP_ERR_FAIL;
goto out_done;
}
- if (!(path = malloc(PATH_MAX)))
- {
+ if (!(path = malloc(PATH_MAX))) {
ret = SP_ERR_MEM;
goto out_release;
}
result = CFStringGetCString(cf_path,
path, PATH_MAX, kCFStringEncodingASCII);
CFRelease(cf_path);
- if (result && !(list = list_append(list, path)))
- {
+ if (result && !(list = list_append(list, path))) {
ret = SP_ERR_MEM;
IOObjectRelease(port);
goto out;
udev_enumerate_add_match_subsystem(ud_enumerate, "tty");
udev_enumerate_scan_devices(ud_enumerate);
ud_list = udev_enumerate_get_list_entry(ud_enumerate);
- udev_list_entry_foreach(ud_entry, ud_list)
- {
+ udev_list_entry_foreach(ud_entry, ud_list) {
path = udev_list_entry_get_name(ud_entry);
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)
- {
+ if (ud_parent == NULL) {
udev_device_unref(ud_dev);
continue;
}
* 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"))
- {
+ if (driver && !strcmp(driver, "serial8250")) {
if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0)
goto skip;
ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info);
list = list_append(list, name);
skip:
udev_device_unref(ud_dev);
- if (!list)
- {
+ if (!list) {
ret = SP_ERR_MEM;
goto out;
}
udev_unref(ud);
#endif
- if (ret == SP_OK)
- {
+ if (ret == SP_OK) {
*list_ptr = list;
- }
- else
- {
+ } else {
if (list)
sp_free_port_list(list);
-
*list_ptr = NULL;
}
free(list);
}
-static int validate_port(struct sp_port *port)
+static enum sp_return validate_port(struct sp_port *port)
{
if (port == NULL)
return 0;
#define CHECK_PORT() do { if (!validate_port(port)) return SP_ERR_ARG; } while (0)
-int sp_open(struct sp_port *port, int flags)
+enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
{
if (!port)
return SP_ERR_ARG;
sprintf(escaped_port_name, "\\\\.\\%s", port->name);
/* Map 'flags' to the OS-specific settings. */
- desired_access |= GENERIC_READ;
flags_and_attributes = FILE_ATTRIBUTE_NORMAL;
- if (flags & SP_MODE_RDWR)
+ 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;
int ret;
/* Map 'flags' to the OS-specific settings. */
- if (flags & SP_MODE_RDWR)
+ if (flags & (SP_MODE_READ | SP_MODE_WRITE))
flags_local |= O_RDWR;
- if (flags & SP_MODE_RDONLY)
+ else if (flags & SP_MODE_READ)
flags_local |= O_RDONLY;
+ else if (flags & SP_MODE_WRITE)
+ flags_local |= O_WRONLY;
if (flags & SP_MODE_NONBLOCK)
flags_local |= O_NONBLOCK;
ret = get_config(port, &data, &config);
- if (ret < 0)
- {
+ if (ret < 0) {
sp_close(port);
return ret;
}
ret = set_config(port, &data, &config);
- if (ret < 0)
- {
+ if (ret < 0) {
sp_close(port);
return ret;
}
return SP_OK;
}
-int sp_close(struct sp_port *port)
+enum sp_return sp_close(struct sp_port *port)
{
CHECK_PORT();
return SP_OK;
}
-int sp_flush(struct sp_port *port)
+enum sp_return sp_flush(struct sp_port *port, enum sp_buffer buffers)
{
CHECK_PORT();
#ifdef _WIN32
+ DWORD flags = 0;
+ if (buffers & SP_BUF_INPUT)
+ flags |= PURGE_RXCLEAR;
+ if (buffers & SP_BUF_OUTPUT)
+ flags |= PURGE_TXCLEAR;
+
/* Returns non-zero upon success, 0 upon failure. */
- if (PurgeComm(port->hdl, PURGE_RXCLEAR | PURGE_TXCLEAR) == 0)
+ if (PurgeComm(port->hdl, flags) == 0)
+ return SP_ERR_FAIL;
+#else
+ int flags = 0;
+ if (buffers & SP_BUF_BOTH)
+ flags = TCIOFLUSH;
+ else if (buffers & SP_BUF_INPUT)
+ flags = TCIFLUSH;
+ if (buffers & SP_BUF_OUTPUT)
+ flags = TCOFLUSH;
+
+ /* Returns 0 upon success, -1 upon failure. */
+ if (tcflush(port->fd, flags) < 0)
+ return SP_ERR_FAIL;
+#endif
+ return SP_OK;
+}
+
+enum sp_return sp_drain(struct sp_port *port)
+{
+ CHECK_PORT();
+
+#ifdef _WIN32
+ /* Returns non-zero upon success, 0 upon failure. */
+ if (FlushFileBuffers(port->hdl) == 0)
return SP_ERR_FAIL;
#else
/* Returns 0 upon success, -1 upon failure. */
- if (tcflush(port->fd, TCIOFLUSH) < 0)
+ if (tcdrain(port->fd) < 0)
return SP_ERR_FAIL;
#endif
+
return SP_OK;
}
-int sp_write(struct sp_port *port, const void *buf, size_t count)
+enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
{
CHECK_PORT();
#endif
}
-int sp_read(struct sp_port *port, void *buf, size_t count)
+enum sp_return sp_read(struct sp_port *port, void *buf, size_t count)
{
CHECK_PORT();
#endif
}
-static int get_config(struct sp_port *port, struct port_data *data, struct sp_port_config *config)
+#ifdef __linux__
+static enum sp_return get_baudrate(int fd, int *baudrate)
+{
+ void *data;
+
+ if (!(data = malloc(get_termios_size())))
+ return SP_ERR_MEM;
+
+ if (ioctl(fd, get_termios_get_ioctl(), data) < 0)
+ return SP_ERR_FAIL;
+
+ *baudrate = get_termios_speed(data);
+
+ return SP_OK;
+}
+
+static enum sp_return set_baudrate(int fd, int baudrate)
+{
+ void *data;
+
+ if (!(data = malloc(get_termios_size())))
+ return SP_ERR_MEM;
+
+ if (ioctl(fd, get_termios_get_ioctl(), data) < 0)
+ return SP_ERR_FAIL;
+
+ set_termios_speed(data, baudrate);
+
+ if (ioctl(fd, get_termios_set_ioctl(), data) < 0)
+ return SP_ERR_FAIL;
+
+ return SP_OK;
+}
+
+#ifdef USE_TERMIOX
+static enum sp_return get_flow(int fd, int *flow)
+{
+ void *data;
+
+ if (!(data = malloc(get_termiox_size())))
+ return SP_ERR_MEM;
+
+ if (ioctl(fd, TCGETX, data) < 0)
+ return SP_ERR_FAIL;
+
+ *flow = get_termiox_flow(data);
+
+ return SP_OK;
+}
+
+static enum sp_return set_flow(int fd, int flow)
+{
+ void *data;
+
+ if (!(data = malloc(get_termiox_size())))
+ return SP_ERR_MEM;
+
+ if (ioctl(fd, TCGETX, data) < 0)
+ return SP_ERR_FAIL;
+
+ set_termiox_flow(data, flow);
+
+ if (ioctl(fd, TCSETX, data) < 0)
+ return SP_ERR_FAIL;
+
+ return SP_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)
{
unsigned int i;
}
switch (data->dcb.fRtsControl) {
- case RTS_CONTROL_DISABLE:
- config->rts = SP_RTS_OFF;
- break;
- case RTS_CONTROL_ENABLE:
- config->rts = SP_RTS_ON;
- break;
- case RTS_CONTROL_HANDSHAKE:
- config->rts = SP_RTS_FLOW_CONTROL;
- break;
- default:
- config->rts = -1;
+ case RTS_CONTROL_DISABLE:
+ config->rts = SP_RTS_OFF;
+ break;
+ case RTS_CONTROL_ENABLE:
+ config->rts = SP_RTS_ON;
+ break;
+ case RTS_CONTROL_HANDSHAKE:
+ config->rts = SP_RTS_FLOW_CONTROL;
+ break;
+ default:
+ config->rts = -1;
}
config->cts = data->dcb.fOutxCtsFlow ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
switch (data->dcb.fDtrControl) {
- case DTR_CONTROL_DISABLE:
- config->dtr = SP_DTR_OFF;
- break;
- case DTR_CONTROL_ENABLE:
- config->dtr = SP_DTR_ON;
- break;
- case DTR_CONTROL_HANDSHAKE:
- config->dtr = SP_DTR_FLOW_CONTROL;
- break;
- default:
- config->dtr = -1;
+ case DTR_CONTROL_DISABLE:
+ config->dtr = SP_DTR_OFF;
+ break;
+ case DTR_CONTROL_ENABLE:
+ config->dtr = SP_DTR_ON;
+ break;
+ case DTR_CONTROL_HANDSHAKE:
+ config->dtr = SP_DTR_FLOW_CONTROL;
+ break;
+ default:
+ config->dtr = -1;
}
config->dsr = data->dcb.fOutxDsrFlow ? SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
if (ioctl(port->fd, TIOCMGET, &data->controlbits) < 0)
return SP_ERR_FAIL;
+
+#ifdef USE_TERMIOX
+ TRY(get_flow(port->fd, &data->flow));
+#endif
+
for (i = 0; i < NUM_STD_BAUDRATES; i++) {
if (cfgetispeed(&data->term) == std_baudrates[i].index) {
config->baudrate = std_baudrates[i].value;
}
}
- if (i == NUM_STD_BAUDRATES)
+ if (i == NUM_STD_BAUDRATES) {
+#ifdef __APPLE__
+ config->baudrate = (int)data->term.c_ispeed;
+#elif defined(__linux__)
+ TRY(get_baudrate(port->fd, &config->baudrate));
+#else
config->baudrate = -1;
+#endif
+ }
switch (data->term.c_cflag & CSIZE) {
case CS8:
config->rts = SP_RTS_FLOW_CONTROL;
config->cts = SP_CTS_FLOW_CONTROL;
} else {
+#ifdef USE_TERMIOX
+ if (data->flow & RTS_FLOW)
+ config->rts = SP_RTS_FLOW_CONTROL;
+ else
+ config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
+
+ config->cts = (data->flow & CTS_FLOW) ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
+#else
config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
config->cts = SP_CTS_IGNORE;
+#endif
}
+#ifdef USE_TERMIOX
+ if (data->flow & DTR_FLOW)
+ config->dtr = SP_DTR_FLOW_CONTROL;
+ else
+ config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
+
+ config->dsr = (data->flow & DSR_FLOW) ? SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
+#else
config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
config->dsr = SP_DSR_IGNORE;
#endif
+ if (data->term.c_iflag & IXOFF) {
+ if (data->term.c_iflag & IXON)
+ config->xon_xoff = SP_XONXOFF_INOUT;
+ else
+ config->xon_xoff = SP_XONXOFF_IN;
+ } else {
+ if (data->term.c_iflag & IXON)
+ config->xon_xoff = SP_XONXOFF_OUT;
+ else
+ config->xon_xoff = SP_XONXOFF_DISABLED;
+ }
+#endif
+
return SP_OK;
}
-static int set_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)
{
unsigned int i;
+#ifdef __APPLE__
+ BAUD_TYPE baud_nonstd;
+
+ baud_nonstd = B0;
+#endif
+#ifdef __linux__
+ int baud_nonstd = 0;
+#endif
#ifdef _WIN32
- if (config->baudrate >= 0)
- {
+ if (config->baudrate >= 0) {
for (i = 0; i < NUM_STD_BAUDRATES; i++) {
if (config->baudrate == std_baudrates[i].value) {
data->dcb.BaudRate = std_baudrates[i].index;
if (!SetCommState(port->hdl, &data->dcb))
return SP_ERR_FAIL;
-#else // !_WIN32
+#else /* !_WIN32 */
- if (config->baudrate >= 0)
- {
+ int controlbits;
+
+ if (config->baudrate >= 0) {
for (i = 0; i < NUM_STD_BAUDRATES; i++) {
if (config->baudrate == std_baudrates[i].value) {
if (cfsetospeed(&data->term, std_baudrates[i].index) < 0)
}
}
- if (i == NUM_STD_BAUDRATES)
+ /* Non-standard baud rate */
+ if (i == NUM_STD_BAUDRATES) {
+#ifdef __APPLE__
+ /* Set "dummy" baud rate */
+ if (cfsetspeed(&data->term, B9600) < 0)
+ return SP_ERR_FAIL;
+ baud_nonstd = config->baudrate;
+#elif defined(__linux__)
+ baud_nonstd = 1;
+#else
return SP_ERR_ARG;
+#endif
+ }
}
if (config->bits >= 0) {
case 6:
data->term.c_cflag |= CS6;
break;
+ case 5:
+ data->term.c_cflag |= CS5;
+ break;
default:
return SP_ERR_ARG;
}
}
}
- if (config->rts >= 0 || config->cts >= 0)
- {
- /* Asymmetric use of RTS/CTS not supported yet. */
+ if (config->rts >= 0 || config->cts >= 0) {
+#ifdef USE_TERMIOX
+ data->flow &= ~(RTS_FLOW | CTS_FLOW);
+ switch (config->rts) {
+ case SP_RTS_OFF:
+ case SP_RTS_ON:
+ controlbits = TIOCM_RTS;
+ if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC,
+ &controlbits) < 0)
+ return SP_ERR_FAIL;
+ break;
+ case SP_RTS_FLOW_CONTROL:
+ data->flow |= RTS_FLOW;
+ break;
+ default:
+ break;
+ }
+ if (config->cts == SP_CTS_FLOW_CONTROL)
+ data->flow |= CTS_FLOW;
+ if (data->flow & (RTS_FLOW | CTS_FLOW))
+ data->term.c_iflag |= CRTSCTS;
+ else
+ data->term.c_iflag &= ~CRTSCTS;
+#else
+ /* Asymmetric use of RTS/CTS not supported. */
if (data->term.c_iflag & CRTSCTS) {
/* Flow control can only be disabled for both RTS & CTS together. */
if (config->rts >= 0 && config->rts != SP_RTS_FLOW_CONTROL) {
if (config->rts == SP_RTS_FLOW_CONTROL) {
data->term.c_iflag |= CRTSCTS;
} else {
- int controlbits = TIOCM_RTS;
+ controlbits = TIOCM_RTS;
if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC,
&controlbits) < 0)
return SP_ERR_FAIL;
}
}
+#endif
}
- if (config->dtr >= 0 || config->dsr >= 0)
- {
- /* DTR/DSR flow control not supported yet. */
+ if (config->dtr >= 0 || config->dsr >= 0) {
+#ifdef USE_TERMIOX
+ data->flow &= ~(DTR_FLOW | DSR_FLOW);
+ switch (config->dtr) {
+ case SP_DTR_OFF:
+ case SP_DTR_ON:
+ controlbits = TIOCM_DTR;
+ if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC,
+ &controlbits) < 0)
+ return SP_ERR_FAIL;
+ break;
+ case SP_DTR_FLOW_CONTROL:
+ data->flow |= DTR_FLOW;
+ break;
+ default:
+ break;
+ }
+ if (config->dsr == SP_DSR_FLOW_CONTROL)
+ data->flow |= DSR_FLOW;
+#else
+ /* DTR/DSR flow control not supported. */
if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL)
return SP_ERR_ARG;
if (config->dtr >= 0) {
- int controlbits = TIOCM_DTR;
+ controlbits = TIOCM_DTR;
if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC,
&controlbits) < 0)
return SP_ERR_FAIL;
}
+#endif
}
if (config->xon_xoff >= 0) {
if (tcsetattr(port->fd, TCSADRAIN, &data->term) < 0)
return SP_ERR_FAIL;
+
+#ifdef __APPLE__
+ if (baud_nonstd != B0) {
+ if (ioctl(port->fd, IOSSIOSPEED, &baud_nonstd) == -1)
+ return SP_ERR_FAIL;
+ /* Set baud rates in data->term to correct, but incompatible
+ * with tcsetattr() value, same as delivered by tcgetattr(). */
+ if (cfsetspeed(&data->term, baud_nonstd) < 0)
+ return SP_ERR_FAIL;
+ }
+#elif defined(__linux__)
+ if (baud_nonstd)
+ TRY(set_baudrate(port->fd, config->baudrate));
+#ifdef USE_TERMIOX
+ TRY(set_flow(port->fd, data->flow));
+#endif
#endif
+#endif /* !_WIN32 */
+
return SP_OK;
}
-#define TRY(x) do { int ret = x; if (ret != SP_OK) return ret; } while (0)
-
-int sp_set_config(struct sp_port *port, struct sp_port_config *config)
+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;
+ CHECK_PORT();
+
+ if (!config)
+ return SP_ERR_ARG;
+
TRY(get_config(port, &data, &prev_config));
TRY(set_config(port, &data, config));
return SP_OK;
}
-#define CREATE_SETTER(x) int sp_set_##x(struct sp_port *port, int x) { \
+#define CREATE_SETTER(x, type) int sp_set_##x(struct sp_port *port, type x) { \
struct port_data data; \
struct sp_port_config config; \
+ CHECK_PORT(); \
TRY(get_config(port, &data, &config)); \
config.x = x; \
TRY(set_config(port, &data, &config)); \
return SP_OK; \
}
-CREATE_SETTER(baudrate)
-CREATE_SETTER(bits)
-CREATE_SETTER(parity)
-CREATE_SETTER(stopbits)
-CREATE_SETTER(rts)
-CREATE_SETTER(cts)
-CREATE_SETTER(dtr)
-CREATE_SETTER(dsr)
-CREATE_SETTER(xon_xoff)
-
-int sp_set_flowcontrol(struct sp_port *port, int flowcontrol)
+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)
{
struct port_data data;
struct sp_port_config config;
+ CHECK_PORT();
+
TRY(get_config(port, &data, &config));
if (flowcontrol == SP_FLOWCONTROL_XONXOFF)
projects / libserialport.git / blobdiff