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

scpi/serial: Use stubs for all SCPI functions. 

Avoids some gcc warnings, since the SCPI prototypes don't exactly
match serial_*.
This commit is contained in:
Bert Vermeulen 2013-12-05 00:09:34 +01:00
parent 962af1a379
commit bc03a7cc2c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hardware/common/scpi_serial.c
View File

@ -138,6 +138,20 @@ SR_PRIV int scpi_serial_receive(void *priv, char **scpi_response)
return ret; return ret;
} }
/* Some stubs to keep the compiler from whining. */
static int scpi_serial_read(void *priv, char *buf, int maxlen)
{
return serial_read(priv, buf, maxlen);
}
static int scpi_serial_close(void *priv)
{
return serial_close(priv);
}
static void scpi_serial_free(void *priv)
{
return sr_serial_dev_inst_free(priv);
}
SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port, SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
const char *serialcomm) const char *serialcomm)
{ {
@ -157,9 +171,9 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
scpi->source_remove = scpi_serial_source_remove; scpi->source_remove = scpi_serial_source_remove;
scpi->send = scpi_serial_send; scpi->send = scpi_serial_send;
scpi->receive = scpi_serial_receive; scpi->receive = scpi_serial_receive;
scpi->read = serial_read; scpi->read = scpi_serial_read;
scpi->close = serial_close; scpi->close = scpi_serial_close;
scpi->free = sr_serial_dev_inst_free; scpi->free = scpi_serial_free;
scpi->priv = serial; scpi->priv = serial;
return scpi; return scpi;