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

Only scpi_serial.c functions need HAVE_LIBSERIALPORT, not scpi.c.

This commit is contained in:
Martin Ling 2013-12-03 23:31:32 +00:00
parent 4b4474ed6a
commit 1ef5138071
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsigrok-internal.h
View File

@ -249,8 +249,6 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
/*--- hardware/common/scpi.c ------------------------------------------------*/
#ifdef HAVE_LIBSERIALPORT
#define SCPI_CMD_IDN "*IDN?"
#define SCPI_CMD_OPC "*OPC?"
@ -329,12 +327,12 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
struct sr_scpi_hw_info **scpi_response);
SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
#endif
/*--- hardware/common/scpi_serial.c -----------------------------------------*/
#ifdef HAVE_LIBSERIALPORT
SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
const char *serialcomm);
#endif
/*--- hardware/common/scpi_usbtmc.c -----------------------------------------*/