mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Support mark/space parity settings.

Browse Source
This commit is contained in:
Martin Ling
2013-11-25 18:05:58 +00:00
parent b251be4b26
commit e432ce6006
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libserialport.h.in
View File

@ -144,6 +144,10 @@ enum sp_parity {
SP_PARITY_ODD = 1, SP_PARITY_ODD = 1,
/** Even parity. */ /** Even parity. */
SP_PARITY_EVEN = 2, SP_PARITY_EVEN = 2,
/** Mark parity. */
SP_PARITY_MARK = 3,
/** Space parity. */
SP_PARITY_SPACE = 4,
}; };
/** RTS pin behaviour. */ /** RTS pin behaviour. */

30
serialport.c
View File

@ -1024,11 +1024,17 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
case NOPARITY: case NOPARITY:
config->parity = SP_PARITY_NONE; config->parity = SP_PARITY_NONE;
break; break;
case ODDPARITY:
config->parity = SP_PARITY_ODD;
break;
case EVENPARITY: case EVENPARITY:
config->parity = SP_PARITY_EVEN; config->parity = SP_PARITY_EVEN;
break; break;
case ODDPARITY: case MARKPARITY:
config->parity = SP_PARITY_ODD; config->parity = SP_PARITY_MARK;
break;
case SPACEPARITY:
config->parity = SP_PARITY_SPACE;
break; break;
default: default:
config->parity = -1; config->parity = -1;
@ -1150,6 +1156,8 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
config->parity = SP_PARITY_NONE; config->parity = SP_PARITY_NONE;
else if (!(data->term.c_cflag & PARENB) || (data->term.c_iflag & IGNPAR)) else if (!(data->term.c_cflag & PARENB) || (data->term.c_iflag & IGNPAR))
config->parity = -1; config->parity = -1;
else if (data->term.c_cflag & CMSPAR)
config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_MARK : SP_PARITY_SPACE;
else else
config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_ODD : SP_PARITY_EVEN; config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_ODD : SP_PARITY_EVEN;
@ -1231,11 +1239,17 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
case SP_PARITY_NONE: case SP_PARITY_NONE:
data->dcb.Parity = NOPARITY; data->dcb.Parity = NOPARITY;
break; break;
case SP_PARITY_ODD:
data->dcb.Parity = ODDPARITY;
break;
case SP_PARITY_EVEN: case SP_PARITY_EVEN:
data->dcb.Parity = EVENPARITY; data->dcb.Parity = EVENPARITY;
break; break;
case SP_PARITY_ODD: case SP_PARITY_MARK:
data->dcb.Parity = ODDPARITY; data->dcb.Parity = MARKPARITY;
break;
case SP_PARITY_SPACE:
data->dcb.Parity = SPACEPARITY;
break; break;
default: default:
RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting"); RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
@ -1393,7 +1407,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
if (config->parity >= 0) { if (config->parity >= 0) {
data->term.c_iflag &= ~IGNPAR; data->term.c_iflag &= ~IGNPAR;
data->term.c_cflag &= ~(PARENB | PARODD); data->term.c_cflag &= ~(PARENB | PARODD | CMSPAR);
switch (config->parity) { switch (config->parity) {
case SP_PARITY_NONE: case SP_PARITY_NONE:
data->term.c_iflag |= IGNPAR; data->term.c_iflag |= IGNPAR;
@ -1404,6 +1418,12 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
case SP_PARITY_ODD: case SP_PARITY_ODD:
data->term.c_cflag |= PARENB | PARODD; data->term.c_cflag |= PARENB | PARODD;
break; break;
case SP_PARITY_MARK:
data->term.c_cflag |= PARENB | PARODD | CMSPAR;
break;
case SP_PARITY_SPACE:
data->term.c_cflag |= PARENB | CMSPAR;
break;
default: default:
RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting"); RETURN_ERROR(SP_ERR_ARG, "Invalid parity setting");
} }