BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added flow control to serial configuration to support xon/xoff for link-mso19

This commit is contained in:
lelazary 2013-01-05 09:00:52 -08:00 committed by Uwe Hermann
parent 4b719338cc
commit 26ddb5baca
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hardware/common/serial.c
View File

@ -631,8 +631,8 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
* *
* @param serial Previously initialized serial port structure. * @param serial Previously initialized serial port structure.
* @param paramstr A serial communication parameters string, in the form * @param paramstr A serial communication parameters string, in the form
* of <speed>/<data bits><parity><stopbits>, for example "9600/8n1" or * of <speed>/<data bits><parity><stopbits><flow>, for example "9600/8n1" or
* "600/7o2". * "600/7o2" or "460800/8n1/flow=2" where flow is 0 for none, 1 for rts/cts and 2 for xon/xoff.
* *
* @return SR_OK upon success, SR_ERR upon failure. * @return SR_OK upon success, SR_ERR upon failure.
*/ */
@ -642,10 +642,10 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
{ {
GRegex *reg; GRegex *reg;
GMatchInfo *match; GMatchInfo *match;
int speed, databits, parity, stopbits, rts, dtr, i; int speed, databits, parity, stopbits, flow, rts, dtr, i;
char *mstr, **opts, **kv; char *mstr, **opts, **kv;
speed = databits = parity = stopbits = 0; speed = databits = parity = stopbits = flow = 0;
rts = dtr = -1; rts = dtr = -1;
sr_spew("Parsing parameters from \"%s\".", paramstr); sr_spew("Parsing parameters from \"%s\".", paramstr);
reg = g_regex_new(SERIAL_COMM_SPEC, 0, 0, NULL); reg = g_regex_new(SERIAL_COMM_SPEC, 0, 0, NULL);
@ -700,6 +700,17 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
sr_dbg("invalid value for dtr: %c", kv[1][0]); sr_dbg("invalid value for dtr: %c", kv[1][0]);
speed = 0; speed = 0;
} }
} else if (!strncmp(kv[0], "flow", 4)) {
if (kv[1][0] == '0')
flow = 0;
else if (kv[1][0] == '1')
flow = 1;
else if (kv[1][0] == '2')
flow = 2;
else {
sr_dbg("invalid value for flow: %c", kv[1][0]);
speed = 0;
}
} }
g_strfreev(kv); g_strfreev(kv);
} }
@ -713,7 +724,7 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
if (speed) { if (speed) {
return serial_set_params(serial, speed, databits, parity, return serial_set_params(serial, speed, databits, parity,
stopbits, 0, rts, dtr); stopbits, flow, rts, dtr);
} else { } else {
sr_dbg("Could not infer speed from parameter string."); sr_dbg("Could not infer speed from parameter string.");
return SR_ERR_ARG; return SR_ERR_ARG;