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

serial: RTS/DTR support on Windows/MinGW.

This commit is contained in:
Uwe Hermann 2012-12-02 13:41:49 +01:00
parent a54dd31e38
commit 39e5d79826
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hardware/common/serial.c
View File

@ -305,7 +305,8 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
* @return SR_OK upon success, SR_ERR upon failure. * @return SR_OK upon success, SR_ERR upon failure.
*/ */
SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate, SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
int bits, int parity, int stopbits, int flowcontrol, int rts, int dtr) int bits, int parity, int stopbits,
int flowcontrol, int rts, int dtr)
{ {
if (!serial) { if (!serial) {
sr_dbg("Invalid serial port."); sr_dbg("Invalid serial port.");
@ -314,12 +315,12 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
if (serial->fd == -1) { if (serial->fd == -1) {
sr_dbg("Cannot configure unopened serial port %s (fd %d).", sr_dbg("Cannot configure unopened serial port %s (fd %d).",
serial->port, serial->fd); serial->port, serial->fd);
return SR_ERR; return SR_ERR;
} }
sr_spew("Setting serial parameters on port %s (fd %d).", serial->port, sr_spew("Setting serial parameters on port %s (fd %d).", serial->port,
serial->fd); serial->fd);
#ifdef _WIN32 #ifdef _WIN32
DCB dcb; DCB dcb;
@ -357,6 +358,22 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
dcb.Parity = NOPARITY; /* TODO: Don't hardcode. */ dcb.Parity = NOPARITY; /* TODO: Don't hardcode. */
dcb.StopBits = ONESTOPBIT; /* TODO: Don't hardcode. */ dcb.StopBits = ONESTOPBIT; /* TODO: Don't hardcode. */
if (rts != -1) {
sr_spew("Setting RTS %s.", rts ? "high" : "low");
if (rts)
dcb.fRtsControl = RTS_CONTROL_ENABLE;
else
dcb.fRtsControl = RTS_CONTROL_DISABLE;
}
if (dtr != -1) {
sr_spew("Setting DTR %s.", dtr ? "high" : "low");
if (rts)
dcb.fDtrControl = DTR_CONTROL_ENABLE;
else
dcb.fDtrControl = DTR_CONTROL_DISABLE;
}
if (!SetCommState(hdl, &dcb)) if (!SetCommState(hdl, &dcb))
return SR_ERR; return SR_ERR;
#else #else