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

Update to new libserialport API.

This commit is contained in:
Martin Ling 2013-11-03 22:53:04 +00:00 committed by Uwe Hermann
parent a9bce5a561
commit c9bc57b6bc
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/common/serial.c
View File

@ -59,7 +59,9 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
sr_spew("Opening serial port '%s' (flags %d).", serial->port, flags);
ret = sp_open(&serial->data, serial->port, flags);
sp_get_port_by_name(serial->port, &serial->data);
ret = sp_open(serial->data, flags);
switch (ret)
{
@ -74,7 +76,7 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
}
#ifndef _WIN32
serial->fd = serial->data.fd;
serial->fd = serial->data->fd;
#endif
if (serial->serialcomm)
@ -109,7 +111,7 @@ SR_PRIV int serial_close(struct sr_serial_dev_inst *serial)
sr_spew("Closing serial port %s (fd %d).", serial->port, serial->fd);
ret = SR_OK;
ret = sp_close(&serial->data);
ret = sp_close(serial->data);
switch (ret)
{
@ -153,7 +155,7 @@ SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial)
sr_spew("Flushing serial port %s (fd %d).", serial->port, serial->fd);
ret = sp_flush(&serial->data);
ret = sp_flush(serial->data);
switch (ret)
{
@ -196,7 +198,7 @@ SR_PRIV int serial_write(struct sr_serial_dev_inst *serial,
return -1;
}
ret = sp_write(&serial->data, buf, count);
ret = sp_write(serial->data, buf, count);
switch (ret)
{
@ -241,7 +243,7 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
return -1;
}
ret = sp_read(&serial->data, buf, count);
ret = sp_read(serial->data, buf, count);
switch (ret)
{
@ -294,7 +296,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
sr_spew("Setting serial parameters on port %s (fd %d).", serial->port,
serial->fd);
ret = sp_set_params(&serial->data, baudrate, bits, parity, stopbits,
ret = sp_set_params(serial->data, baudrate, bits, parity, stopbits,
flowcontrol, rts, dtr);
switch (ret)

2
libsigrok-internal.h
View File

@ -72,7 +72,7 @@ struct sr_serial_dev_inst {
char *port;
char *serialcomm;
int fd;
struct sp_port data;
struct sp_port *data;
};
/* Private driver context. */