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

scpi/gpib: Rename backend to scpi_libgpib. 

libgpib is the userspace component to linux-gpib's kernel modules that
implement low-level interface drivers.

When libsigrok gets userspace GPIB interface drivers, that backend will
be the "official" scpi_gpib.
This commit is contained in:
Bert Vermeulen 2014-09-05 18:33:48 +02:00
parent d6e63a2c68
commit 7343ad1ec7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -93,7 +93,7 @@ libsigrok_la_SOURCES += \
endif endif
if NEED_GPIB if NEED_GPIB
libsigrok_la_SOURCES += \ libsigrok_la_SOURCES += \
src/scpi/scpi_gpib.c src/scpi/scpi_libgpib.c
endif endif
# Hardware (DMM chip parsers) # Hardware (DMM chip parsers)

4
src/scpi/scpi.c
View File

@ -71,7 +71,7 @@ SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_gpib_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_libgpib_dev;
static const struct sr_scpi_dev_inst *scpi_devs[] = { static const struct sr_scpi_dev_inst *scpi_devs[] = {
&scpi_tcp_raw_dev, &scpi_tcp_raw_dev,
@ -86,7 +86,7 @@ static const struct sr_scpi_dev_inst *scpi_devs[] = {
&scpi_visa_dev, &scpi_visa_dev,
#endif #endif
#ifdef HAVE_LIBGPIB #ifdef HAVE_LIBGPIB
&scpi_gpib_dev, &scpi_libgpib_dev,
#endif #endif
#ifdef HAVE_LIBSERIALPORT #ifdef HAVE_LIBSERIALPORT
&scpi_serial_dev, /* must be last as it matches any resource */ &scpi_serial_dev, /* must be last as it matches any resource */

4
src/scpi/scpi_gpib.c → src/scpi/scpi_libgpib.c
View File

@ -149,9 +149,9 @@ static void scpi_gpib_free(void *priv)
g_free(gscpi->name); g_free(gscpi->name);
} }
SR_PRIV const struct sr_scpi_dev_inst scpi_gpib_dev = { SR_PRIV const struct sr_scpi_dev_inst scpi_libgpib_dev = {
.name = "GPIB", .name = "GPIB",
.prefix = "gpib", .prefix = "libgpib",
.priv_size = sizeof(struct scpi_gpib), .priv_size = sizeof(struct scpi_gpib),
.dev_inst_new = scpi_gpib_dev_inst_new, .dev_inst_new = scpi_gpib_dev_inst_new,
.open = scpi_gpib_open, .open = scpi_gpib_open,