Convert all Linux bits to Posix and add define for 460800 baudrate

- rename all Linux bits to Posix, to make it clear, that is (should) work on
  any Posix system
- sprinkle a bit of BSD into device names and examples
- added define for a non-standard badurate 460800

Signed-off-by: Jasper Lievisse Adriaanse <[email protected]>
Signed-off-by: Petr Stetiar <[email protected]>

Author: jasperla

bindings/lua/luars232.c

@@ -34,7 +34,7 @@
 #ifdef WIN32
 #include "librs232/rs232_windows.h"
 #else
-#include "librs232/rs232_linux.h"
+#include "librs232/rs232_posix.h"
 #endif
 
 #define MODULE_TIMESTAMP __DATE__ " " __TIME__

doc/example.lua

@@ -3,6 +3,9 @@ rs232 = require("luars232")
 -- Linux
 -- port_name = "/dev/ttyS0"
 
+-- (Open)BSD
+-- port_name = "/dev/cua00"
+
 -- Windows
 port_name = "COM1"
 

include/librs232/Makefile.am

@@ -1,2 +1,2 @@
 
-pkginclude_HEADERS = rs232.h rs232_linux.h 
+pkginclude_HEADERS = rs232.h rs232_posix.h 

include/librs232/rs232.h

@@ -31,7 +31,13 @@
 
 #define RS232_STRLEN 512
 #define RS232_STRLEN_DEVICE 30
-#define RS232_PORT_LINUX "/dev/ttyS0"
+
+#ifdef __linux__
+#define RS232_PORT_POSIX "/dev/ttyS0"
+#else
+#define RS232_PORT_POSIX "/dev/cua00"
+#endif /* __linux__ */
+
 #define RS232_PORT_WIN32 "COM1"
 
 #if defined(WIN32) || defined(UNDER_CE)

include/librs232/rs232_linux.h include/librs232/rs232_posix.h

@@ -24,12 +24,16 @@
  *
  */
 
-#ifndef __LIBRS232_LINUX_H__
-#define __LIBRS232_LINUX_H__
+#ifndef __LIBRS232_POSIX_H__
+#define __LIBRS232_POSIX_H__
 
 #include <termios.h>
 
-struct rs232_linux_t {
+#ifndef B460800
+#define B460800 460800
+#endif
+
+struct rs232_posix_t {
 	int fd;
 	struct termios oldterm;
 };
@@ -46,4 +50,4 @@ struct rs232_linux_t {
 		return RS232_ERR_CONFIG; \
 	} \
 
-#endif /* __LIBRS232_LINUX_H__ */
+#endif /* __LIBRS232_POSIX_H__ */

src/Makefile.am

@@ -11,7 +11,7 @@ AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations
 
 lib_LTLIBRARIES = librs232.la
 librs232_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
-librs232_la_SOURCES = rs232.c rs232_linux.c
+librs232_la_SOURCES = rs232.c rs232_posix.c
 
 if ENABLE_DEBUG
 bin_PROGRAMS = rs232_test

src/rs232_linux.c src/rs232_posix.c

@@ -38,7 +38,7 @@
 #include <unistd.h>
 
 #include "librs232/rs232.h"
-#include "librs232/rs232_linux.h"
+#include "librs232/rs232_posix.h"
 
 struct rs232_port_t *
 rs232_init(void)
@@ -48,15 +48,15 @@ rs232_init(void)
 	if (p == NULL)
 		return NULL;
 
-	p->pt = (struct rs232_linux_t *) malloc(sizeof(struct rs232_linux_t));
+	p->pt = (struct rs232_posix_t *) malloc(sizeof(struct rs232_posix_t));
 	if (p->pt == NULL)
 		return NULL;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
-	memset(p->pt, 0, sizeof(struct rs232_linux_t));
+	memset(p->pt, 0, sizeof(struct rs232_posix_t));
 	memset(p->dev, 0, RS232_STRLEN_DEVICE+1);
-	strncpy(p->dev, RS232_PORT_LINUX, RS232_STRLEN_DEVICE);
+	strncpy(p->dev, RS232_PORT_POSIX, RS232_STRLEN_DEVICE);
 
 	p->baud = RS232_BAUD_115200;
 	p->data = RS232_DATA_8;
@@ -73,7 +73,7 @@ rs232_init(void)
 void
 rs232_end(struct rs232_port_t *p)
 {
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -102,7 +102,7 @@ rs232_in_qeue(struct rs232_port_t *p, unsigned int *in_bytes)
 	int ret;
 	int b;
 	struct timeval tv;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -139,7 +139,7 @@ rs232_in_qeue_clear(struct rs232_port_t *p)
 	unsigned int blen;
 	unsigned char *buf = NULL;
 	struct timeval tv;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -175,7 +175,7 @@ rs232_read(struct rs232_port_t *p, unsigned char *buf, unsigned int buf_len,
 	   unsigned int *read_len)
 {
 	int r;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p buf_len=%d\n", (void *)p, p->pt, buf_len);
 
@@ -216,7 +216,7 @@ rs232_read_timeout_forced(struct rs232_port_t *p, unsigned char *buf,
 	int reti;
 	fd_set set;
 	int r;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 	struct timeval tv;
 	struct timeval t1;
 	struct timeval t2;
@@ -301,7 +301,7 @@ rs232_read_timeout(struct rs232_port_t *p, unsigned char *buf,
 	fd_set set;
 	int r;
 	struct timeval tv;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p buf_len=%d timeout=%d\n", (void *)p, p->pt,
 		buf_len, timeout);
@@ -346,7 +346,7 @@ rs232_write(struct rs232_port_t *p, unsigned char *buf, unsigned int buf_len,
 		unsigned int *write_len)
 {
 	int w;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p hex='%s' ascii='%s' buf_len=%d\n", 
 	    (void *)p, p->pt, rs232_hex_dump(buf, buf_len), 
@@ -379,7 +379,7 @@ rs232_write_timeout(struct rs232_port_t *p, unsigned char *buf,
 	int ret;
 	fd_set set;
 	int w;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 	struct timeval tv;
 
 	DBG("p=%p p->pt=%p timeout=%d\n", (void *)p, p->pt, timeout);
@@ -425,7 +425,7 @@ rs232_open(struct rs232_port_t *p)
 {
 	int flags;
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -490,7 +490,7 @@ unsigned int
 rs232_set_baud(struct rs232_port_t *p, enum rs232_baud_e baud)
 {
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p baud=%d (%s bauds)\n",
 	    (void *)p, p->pt, baud, rs232_strbaud(baud));
@@ -549,7 +549,7 @@ rs232_set_dtr(struct rs232_port_t *p, enum rs232_dtr_e state)
 {
 	int ret;
 	int set;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p dtr=%d (dtr control %s)\n",
 	    (void *)p, p->pt, state, rs232_strdtr(state));
@@ -587,7 +587,7 @@ rs232_set_rts(struct rs232_port_t *p, enum rs232_rts_e state)
 {
 	int ret;
 	int set;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p rts=%d (rts control %s)\n",
 	    (void *)p, p->pt, state, rs232_strrts(state));
@@ -624,7 +624,7 @@ unsigned int
 rs232_set_parity(struct rs232_port_t *p, enum rs232_parity_e parity)
 {
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p parity=%d (parity %s)\n",
 	    (void *)p, p->pt, parity, rs232_strparity(parity));
@@ -656,7 +656,7 @@ unsigned int
 rs232_set_stop(struct rs232_port_t *p, enum rs232_stop_e stop)
 {
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p stop=%d (%s stop bits)\n",
 	    (void *)p, p->pt, stop, rs232_strstop(stop));
@@ -684,7 +684,7 @@ unsigned int
 rs232_set_data(struct rs232_port_t *p, enum rs232_data_e data)
 {
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p data=%d (%s data bits)\n",
 	    (void *)p, p->pt, data, rs232_strdata(data));
@@ -719,7 +719,7 @@ unsigned int
 rs232_set_flow(struct rs232_port_t *p, enum rs232_flow_e flow)
 {
 	struct termios term;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p flow=%d (flow control %s)\n",
 	    (void *)p, p->pt, flow, rs232_strflow(flow));
@@ -753,7 +753,7 @@ unsigned int
 rs232_flush(struct rs232_port_t *p)
 {
 	int ret;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -771,7 +771,7 @@ unsigned int
 rs232_close(struct rs232_port_t *p)
 {
 	int ret;
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p\n", (void *)p, p->pt);
 
@@ -789,7 +789,7 @@ rs232_close(struct rs232_port_t *p)
 unsigned int
 rs232_fd(struct rs232_port_t *p)
 {
-	struct rs232_linux_t *ux = p->pt;
+	struct rs232_posix_t *ux = p->pt;
 
 	DBG("p=%p p->pt=%p ux->fd=%d\n", (void *)p, p->pt, ux->fd);