X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_libgpib.c;h=4519a4e70e2da78589c35c779e12287432f28595;hb=8107a9a650f4db08423c3fc79c1b7e7d826ffd7f;hp=8f200e7d964ab247c41d727c56d0a43e8612bb99;hpb=9618fde4226a7cf1ab891be6d5581b41e071a0af;p=libsigrok.git diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c index 8f200e7d..4519a4e7 100644 --- a/src/scpi/scpi_libgpib.c +++ b/src/scpi/scpi_libgpib.c @@ -59,6 +59,16 @@ static int scpi_gpib_open(struct sr_scpi_dev_inst *scpi) return SR_OK; } +static int scpi_gpib_connection_id(struct sr_scpi_dev_inst *scpi, + char **connection_id) +{ + struct scpi_gpib *gscpi = scpi->priv; + + *connection_id = g_strdup_printf("%s/%s", scpi->prefix, gscpi->name); + + return SR_OK; +} + static int scpi_gpib_source_add(struct sr_session *session, void *priv, int events, int timeout, sr_receive_data_callback cb, void *cb_data) { @@ -172,17 +182,18 @@ SR_PRIV int sr_scpi_gpib_spoll(struct sr_scpi_dev_inst *scpi, char *buf) } SR_PRIV const struct sr_scpi_dev_inst scpi_libgpib_dev = { - .name = "GPIB", - .prefix = "libgpib", - .priv_size = sizeof(struct scpi_gpib), - .dev_inst_new = scpi_gpib_dev_inst_new, - .open = scpi_gpib_open, - .source_add = scpi_gpib_source_add, + .name = "GPIB", + .prefix = "libgpib", + .priv_size = sizeof(struct scpi_gpib), + .dev_inst_new = scpi_gpib_dev_inst_new, + .open = scpi_gpib_open, + .connection_id = scpi_gpib_connection_id, + .source_add = scpi_gpib_source_add, .source_remove = scpi_gpib_source_remove, - .send = scpi_gpib_send, - .read_begin = scpi_gpib_read_begin, - .read_data = scpi_gpib_read_data, + .send = scpi_gpib_send, + .read_begin = scpi_gpib_read_begin, + .read_data = scpi_gpib_read_data, .read_complete = scpi_gpib_read_complete, - .close = scpi_gpib_close, - .free = scpi_gpib_free, + .close = scpi_gpib_close, + .free = scpi_gpib_free, };