diff options
author | Jakob Odersky <jodersky@gmail.com> | 2013-07-11 15:33:14 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2013-07-11 15:33:14 +0200 |
commit | b686a116e484cc8f315443e09a8e20a9ccb7abce (patch) | |
tree | 6249e59955a756d12c7c54915a45fc70f99496ca /flow-native | |
parent | 9ceea97cfb9bbf692c986534860ab0bbb315911b (diff) | |
download | akka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.tar.gz akka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.tar.bz2 akka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.zip |
add support for different serial configurations
Diffstat (limited to 'flow-native')
-rw-r--r-- | flow-native/shared/include/flow.h | 23 | ||||
-rw-r--r-- | flow-native/unix/src/flow.c | 63 |
2 files changed, 63 insertions, 23 deletions
diff --git a/flow-native/shared/include/flow.h b/flow-native/shared/include/flow.h index eacc783..ebb845a 100644 --- a/flow-native/shared/include/flow.h +++ b/flow-native/shared/include/flow.h @@ -3,13 +3,17 @@ #include <stdbool.h> -//general error codes that are meant to be communicated to user +//general error codes that are returned by functions #define E_IO -1 //I/O error (port should be closed) #define E_ACCESS_DENIED -2 //access denied #define E_BUSY -3 // port is busy -#define E_INVALID_BAUD -4 // baud rate is not valid +#define E_INVALID_SETTINGS -4 // some port settings are invalid #define E_INTERRUPT -5 // not really an error, function call aborted because port is closed -#define E_NO_PORT -6 +#define E_NO_PORT -6 //requested port does not exist + +#define PARITY_NONE 0 +#define PARITY_ODD 1 +#define PARITY_EVEN 2 /** Represents an open serial port. */ struct serial_config; @@ -18,14 +22,23 @@ struct serial_config; * any internally allocated resources will be freed. * @param port_name name of port * @param baud baud rate + * @param char_size character size of data transmitted through serial device + * @param two_stop_bits set to use two stop bits instead of one + * @param parity kind of parity checking to use * @param serial pointer to memory that will be allocated with a serial structure * @return 0 on success * @return E_NO_PORT if the given port does not exist * @return E_ACCESS_DENIED if permissions are not sufficient to open port * @return E_BUSY if port is already in use - * @return E_INVALID_BAUD if specified baudrate is non-standard + * @return E_INVALID_SETTINGS if any of the specified settings are not supported * @return E_IO on other error */ -int serial_open(const char* port_name, int baud, struct serial_config** serial); +int serial_open( + const char* port_name, + int baud, + int char_size, + bool two_stop_bits, + int parity, + struct serial_config** serial); /**Closes a previously opened serial port and frees memory containing the configuration. Note: after a call to * this function, the 'serial' pointer will become invalid, make sure you only call it once. This function is NOT diff --git a/flow-native/unix/src/flow.c b/flow-native/unix/src/flow.c index 29769d3..07e1c9f 100644 --- a/flow-native/unix/src/flow.c +++ b/flow-native/unix/src/flow.c @@ -57,7 +57,13 @@ struct serial_config { }; -int serial_open(const char* port_name, int baud, struct serial_config** serial) { +int serial_open( + const char* port_name, + int baud, + int char_size, + bool two_stop_bits, + int parity, + struct serial_config** serial) { int fd = open(port_name, O_RDWR | O_NOCTTY | O_NONBLOCK); @@ -75,6 +81,15 @@ int serial_open(const char* port_name, int baud, struct serial_config** serial) return E_BUSY; } + /* configure new port settings */ + struct termios newtio; + + newtio.c_cflag = 0; + newtio.c_oflag = 0; + newtio.c_iflag = 0; + newtio.c_lflag = 0; + + /* set speed */ speed_t bd; switch (baud) { case 50: bd = B50; break; @@ -97,29 +112,41 @@ int serial_open(const char* port_name, int baud, struct serial_config** serial) case 230400: bd = B230400; break; default: close(fd); - return E_INVALID_BAUD; - break; + return E_INVALID_SETTINGS; } - - /* configure new port settings */ - struct termios newtio; - newtio.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); // 8N1 - newtio.c_cflag |= CS8 | CREAD | CLOCAL; - newtio.c_iflag &= ~(IXON | IXOFF | IXANY); // turn off s/w flow ctrl - newtio.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); // make raw - newtio.c_oflag &= ~OPOST; // make raw - - //see: http://unixwiz.net/techtips/termios-vmin-vtime.html - //newtio.c_cc[VMIN] = 1; - //newtio.c_cc[VTIME] = 2*10/baud; if (cfsetspeed(&newtio, bd) < 0) { DEBUG(perror("set baud rate");); close(fd); return E_IO; } + + /* set char size*/ + switch (char_size) { + case 5: newtio.c_cflag |= CS5; break; + case 6: newtio.c_cflag |= CS6; break; + case 7: newtio.c_cflag |= CS7; break; + case 8: newtio.c_cflag |= CS8; break; + default: + close(fd); + return E_INVALID_SETTINGS; + } + + /* use two stop bits */ + if (two_stop_bits){ + newtio.c_cflag |= CSTOPB; + } + + /* set parity */ + switch (parity) { + case PARITY_NONE: break; + case PARITY_ODD: newtio.c_cflag |= (PARENB | PARODD); break; + case PARITY_EVEN: newtio.c_cflag |= PARENB; break; + default: + close(fd); + return E_INVALID_SETTINGS; + } - /* load new settings to port */ if (tcflush(fd, TCIOFLUSH) < 0) { DEBUG(perror("flush serial settings");); close(fd); @@ -255,11 +282,11 @@ inline jlong s2j(struct serial_config* pointer) { } JNIEXPORT jint JNICALL Java_com_github_jodersky_flow_internal_NativeSerial_open - (JNIEnv *env, jclass clazz, jstring port_name, jint baud, jlongArray jserialp) + (JNIEnv *env, jclass clazz, jstring port_name, jint baud, jint char_size, jboolean two_stop_bits, jint parity, jlongArray jserialp) { const char *dev = (*env)->GetStringUTFChars(env, port_name, 0); struct serial_config* serial; - int r = serial_open(dev, baud, &serial); + int r = serial_open(dev, baud, char_size, two_stop_bits, parity, &serial); (*env)->ReleaseStringUTFChars(env, port_name, dev); long serialp = s2j(serial); |