X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fserial.c;h=de97496a8748d698feed02f9eafe8ce47693a099;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=dfc6d5578c87b03c998a4b688dd50f99e0025da6;hpb=afc8e4deb68271ba7696e38cc02053b97cfc1a19;p=libsigrok.git diff --git a/hardware/common/serial.c b/hardware/common/serial.c index dfc6d557..de97496a 100644 --- a/hardware/common/serial.c +++ b/hardware/common/serial.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,21 +17,28 @@ * along with this program. If not, see . */ -#include #include #include #include #include #include +#ifdef _WIN32 +#include +#else +#include #include +#endif #include #include - #include "sigrok.h" +#include "sigrok-internal.h" +// FIXME: Must be moved, or rather passed as function argument. +#ifdef _WIN32 +static HANDLE hdl; +#endif - -char *serial_port_glob[] = { +static const char *serial_port_glob[] = { /* Linux */ "/dev/ttyS*", "/dev/ttyUSB*", @@ -40,86 +47,273 @@ char *serial_port_glob[] = { "/dev/ttys*", "/dev/tty.USB-*", "/dev/tty.Modem-*", - NULL + NULL, }; - -GSList *list_serial_ports(void) +SR_PRIV GSList *list_serial_ports(void) { - glob_t g; GSList *ports; + +#ifdef _WIN32 + /* TODO */ + ports = NULL; + ports = g_slist_append(ports, g_strdup("COM1")); +#else + glob_t g; unsigned int i, j; ports = NULL; - for(i = 0; serial_port_glob[i]; i++) - { - if(!glob(serial_port_glob[i], 0, NULL, &g)) - { - for(j = 0; j < g.gl_pathc; j++) - ports = g_slist_append(ports, strdup(g.gl_pathv[j])); - globfree(&g); - } + for (i = 0; serial_port_glob[i]; i++) { + if (glob(serial_port_glob[i], 0, NULL, &g)) + continue; + for (j = 0; j < g.gl_pathc; j++) + ports = g_slist_append(ports, g_strdup(g.gl_pathv[j])); + globfree(&g); } +#endif return ports; } - -int serial_open(const char *pathname, int flags) +SR_PRIV int serial_open(const char *pathname, int flags) { - +#ifdef _WIN32 + /* FIXME: Don't hardcode COM1. */ + hdl = CreateFile("COM1", GENERIC_READ | GENERIC_WRITE, 0, 0, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hdl == INVALID_HANDLE_VALUE) { + /* TODO: Error handling. */ + } + return 0; +#else return open(pathname, flags); +#endif } +/* + * Close the serial port. + * Returns 0 upon success, -1 upon failure. + */ +SR_PRIV int serial_close(int fd) +{ +#ifdef _WIN32 + /* Returns non-zero upon success, 0 upon failure. */ + return (CloseHandle(hdl) == 0) ? -1 : 0; +#else + /* Returns 0 upon success, -1 upon failure. */ + return close(fd); +#endif +} -int serial_close(int fd) +/* + * Flush serial port buffers (if any). + * Returns 0 upon success, -1 upon failure. + */ +SR_PRIV int serial_flush(int fd) { +#ifdef _WIN32 + /* Returns non-zero upon success, 0 upon failure. */ + return (PurgeComm(hdl, PURGE_RXCLEAR | PURGE_TXCLEAR) == 0) ? -1 : 0; +#else + /* Returns 0 upon success, -1 upon failure. */ + return tcflush(fd, TCIOFLUSH); +#endif +} - return close(fd); +/* + * Write a number of bytes to the specified serial port. + * Returns the number of bytes written, or -1 upon failure. + */ +SR_PRIV int serial_write(int fd, const void *buf, size_t count) +{ +#ifdef _WIN32 + DWORD tmp = 0; + + /* FIXME */ + /* Returns non-zero upon success, 0 upon failure. */ + WriteFile(hdl, buf, count, &tmp, NULL); +#else + /* Returns the number of bytes written, or -1 upon failure. */ + return write(fd, buf, count); +#endif } +/* + * Read a number of bytes from the specified serial port. + * Returns the number of bytes read, or -1 upon failure. + */ +SR_PRIV int serial_read(int fd, void *buf, size_t count) +{ +#ifdef _WIN32 + DWORD tmp = 0; + + /* FIXME */ + /* Returns non-zero upon success, 0 upon failure. */ + return ReadFile(hdl, buf, count, &tmp, NULL); +#else + /* Returns the number of bytes read, or -1 upon failure. */ + return read(fd, buf, count); +#endif +} -void *serial_backup_params(int fd) +SR_PRIV void *serial_backup_params(int fd) { +#ifdef _WIN32 + /* TODO */ +#else struct termios *term; - term = malloc(sizeof(struct termios)); + /* TODO: 'term' is never g_free()'d? */ + if (!(term = g_try_malloc(sizeof(struct termios)))) { + sr_err("serial: %s: term malloc failed", __func__); + return NULL; + } + tcgetattr(fd, term); return term; +#endif } - -void serial_restore_params(int fd, void *backup) +SR_PRIV void serial_restore_params(int fd, void *backup) { +#ifdef _WIN32 + /* TODO */ +#else + tcsetattr(fd, TCSADRAIN, (struct termios *)backup); +#endif +} - tcsetattr(fd, TCSADRAIN, (struct termios *) backup); +/* + * Set serial parameters. + * + * flowcontrol: 1 = rts/cts, 2 = xon/xoff + * parity: 0 = none, 1 = even, 2 = odd + */ +SR_PRIV int serial_set_params(int fd, int speed, int bits, int parity, + int stopbits, int flowcontrol) +{ +#ifdef _WIN32 + DCB dcb; -} + if (!GetCommState(hdl, &dcb)) { + /* TODO: Error handling. */ + return SR_ERR; + } + /* TODO: Rename 'speed' to 'baudrate'. */ + switch(speed) { + /* TODO: Support for higher baud rates. */ + case 115200: + dcb.BaudRate = CBR_115200; + break; + case 57600: + dcb.BaudRate = CBR_57600; + break; + case 38400: + dcb.BaudRate = CBR_38400; + break; + case 19200: + dcb.BaudRate = CBR_19200; + break; + case 9600: + dcb.BaudRate = CBR_9600; + break; + default: + /* TODO: Error handling. */ + break; + } + dcb.ByteSize = bits; + dcb.Parity = NOPARITY; /* TODO: Don't hardcode. */ + dcb.StopBits = ONESTOPBIT; /* TODO: Don't hardcode. */ -/* flowcontrol 1 = rts/cts 2 = xon/xoff */ -int serial_set_params(int fd, int speed, int bits, int parity, int stopbits, int flowcontrol) -{ + if (!SetCommState(hdl, &dcb)) { + /* TODO: Error handling. */ + return SR_ERR; + } +#else struct termios term; + speed_t baud; - /* only supporting what we need really -- currently just the OLS driver */ - if(speed != 115200 || bits != 8 || parity != 0 || stopbits != 1 || flowcontrol != 2) - return SIGROK_ERR; + switch (speed) { + case 9600: + baud = B9600; + break; + case 38400: + baud = B38400; + break; + case 57600: + baud = B57600; + break; + case 115200: + baud = B115200; + break; +#ifndef __APPLE__ + case 460800: + baud = B460800; + break; +#endif + default: + return SR_ERR; + } + + if (tcgetattr(fd, &term) < 0) + return SR_ERR; + if (cfsetispeed(&term, baud) < 0) + return SR_ERR; - if(tcgetattr(fd, &term) < 0) - return SIGROK_ERR; - if(cfsetispeed(&term, B115200) < 0) - return SIGROK_ERR; term.c_cflag &= ~CSIZE; - term.c_cflag |= CS8; + switch (bits) { + case 8: + term.c_cflag |= CS8; + break; + case 7: + term.c_cflag |= CS7; + break; + default: + return SR_ERR; + } + term.c_cflag &= ~CSTOPB; - term.c_cflag |= IXON | IXOFF; - term.c_iflag |= IGNPAR; - if(tcsetattr(fd, TCSADRAIN, &term) < 0) - return SIGROK_ERR; + switch (stopbits) { + case 1: + break; + case 2: + term.c_cflag |= CSTOPB; + default: + return SR_ERR; + } - return SIGROK_OK; -} + term.c_cflag &= ~(IXON | IXOFF | CRTSCTS); + switch (flowcontrol) { + case 2: + term.c_cflag |= IXON | IXOFF; + break; + case 1: + term.c_cflag |= CRTSCTS; + default: + return SR_ERR; + } + term.c_iflag &= ~IGNPAR; + term.c_cflag &= ~(PARODD | PARENB); + switch (parity) { + case 0: + term.c_iflag |= IGNPAR; + break; + case 1: + term.c_cflag |= PARENB; + break; + case 2: + term.c_cflag |= PARENB | PARODD; + break; + default: + return SR_ERR; + } + + if (tcsetattr(fd, TCSADRAIN, &term) < 0) + return SR_ERR; +#endif + return SR_OK; +}