X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi.c;h=dbcd3f090bf2c7dee2a1629d0a5ee701c1f70248;hb=144f6660d004d60264a57db7150ed90e5f68ea77;hp=c2221c1172583d909e702aab2dbbabb526469c03;hpb=f754c1469188a5e1a82c98532cb21b334530a91a;p=libsigrok.git diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c index c2221c11..dbcd3f09 100644 --- a/hardware/common/scpi.c +++ b/hardware/common/scpi.c @@ -66,23 +66,105 @@ static int parse_strict_bool(const char *str, gboolean *ret) } SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_dev; -SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_dev; -SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_dev; +SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_raw_dev; +SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev; +/* SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_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_visa_dev; static const struct sr_scpi_dev_inst *scpi_devs[] = { - &scpi_tcp_dev, - &scpi_usbtmc_dev, -#ifdef HAVE_RPC + &scpi_tcp_raw_dev, + &scpi_tcp_rigol_dev, + /* &scpi_usbtmc_dev, */ +#ifdef HAVE_LIBUSB_1_0 + &scpi_usbtmc_libusb_dev, +#endif +#if HAVE_RPC &scpi_vxi_dev, #endif +#ifdef HAVE_LIBREVISA + &scpi_visa_dev, +#endif #ifdef HAVE_LIBSERIALPORT &scpi_serial_dev, /* must be last as it matches any resource */ #endif }; -SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(const char *resource, - const char *serialcomm) +static GSList *sr_scpi_scan_resource(struct drv_context *drvc, + const char *resource, const char *serialcomm, + struct sr_dev_inst *(*probe_device)(struct sr_scpi_dev_inst *scpi)) +{ + struct sr_scpi_dev_inst *scpi; + struct sr_dev_inst *sdi; + + if (!(scpi = scpi_dev_inst_new(drvc, resource, serialcomm))) + return NULL; + + if (sr_scpi_open(scpi) != SR_OK) { + sr_info("Couldn't open SCPI device."); + sr_scpi_free(scpi); + return NULL; + }; + + if ((sdi = probe_device(scpi))) + return g_slist_append(NULL, sdi); + + sr_scpi_close(scpi); + sr_scpi_free(scpi); + return NULL; +} + +SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options, + struct sr_dev_inst *(*probe_device)(struct sr_scpi_dev_inst *scpi)) +{ + GSList *resources, *l, *d, *devices = NULL; + const char *resource = NULL; + const char *serialcomm = NULL; + gchar **res; + unsigned i; + + for (l = options; l; l = l->next) { + struct sr_config *src = l->data; + switch (src->key) { + case SR_CONF_CONN: + resource = g_variant_get_string(src->data, NULL); + break; + case SR_CONF_SERIALCOMM: + serialcomm = g_variant_get_string(src->data, NULL); + break; + } + } + + for (i = 0; i < ARRAY_SIZE(scpi_devs); i++) { + if ((resource && strcmp(resource, scpi_devs[i]->prefix)) + || !scpi_devs[i]->scan) + continue; + resources = scpi_devs[i]->scan(drvc); + for (l = resources; l; l = l->next) { + res = g_strsplit(l->data, ":", 2); + if (res[0] && (d = sr_scpi_scan_resource(drvc, res[0], + serialcomm ? serialcomm : res[1], probe_device))) + devices = g_slist_concat(devices, d); + g_strfreev(res); + } + g_slist_free_full(resources, g_free); + } + + if (!devices && resource) + devices = sr_scpi_scan_resource(drvc, resource, serialcomm, + probe_device); + + /* Tack a copy of the newly found devices onto the driver list. */ + if (devices) + drvc->instances = g_slist_concat(drvc->instances, + g_slist_copy(devices)); + + return devices; +} + +SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc, + const char *resource, const char *serialcomm) { struct sr_scpi_dev_inst *scpi = NULL; const struct sr_scpi_dev_inst *scpi_dev; @@ -97,7 +179,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(const char *resource, *scpi = *scpi_dev; scpi->priv = g_malloc0(scpi->priv_size); params = g_strsplit(resource, "/", 0); - if (scpi->dev_inst_new(scpi->priv, resource, + if (scpi->dev_inst_new(scpi->priv, drvc, resource, params, serialcomm) != SR_OK) { sr_scpi_free(scpi); scpi = NULL; @@ -135,7 +217,7 @@ SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi) * SR_ERR_MALLOC upon memory allocation errors. */ SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events, - int timeout, sr_receive_data_callback_t cb, void *cb_data) + int timeout, sr_receive_data_callback cb, void *cb_data) { return scpi->source_add(scpi->priv, events, timeout, cb, cb_data); } @@ -310,9 +392,15 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi, g_string_append_len(response, buf, len); } + /* Get rid of trailing linefeed if present */ + if (response->len >= 1 && response->str[response->len - 1] == '\n') + g_string_truncate(response, response->len - 1); + *scpi_response = response->str; g_string_free(response, FALSE); + sr_spew("Got response: '%.70s'.", *scpi_response); + return SR_OK; } @@ -402,7 +490,7 @@ SR_PRIV int sr_scpi_get_float(struct sr_scpi_dev_inst *scpi, if (!response) return SR_ERR; - if (sr_atof(response, scpi_response) == SR_OK) + if (sr_atof_ascii(response, scpi_response) == SR_OK) ret = SR_OK; else ret = SR_ERR; @@ -503,7 +591,7 @@ SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi, response_array = g_array_sized_new(TRUE, FALSE, sizeof(float), 256); while (*ptr) { - if (sr_atof(*ptr, &tmp) == SR_OK) + if (sr_atof_ascii(*ptr, &tmp) == SR_OK) response_array = g_array_append_val(response_array, tmp); else @@ -598,7 +686,6 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi, { int num_tokens; char *response; - char *newline; gchar **tokens; struct sr_scpi_hw_info *hw_info; @@ -611,10 +698,6 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi, sr_info("Got IDN string: '%s'", response); - /* Remove trailing newline if present. */ - if ((newline = g_strrstr(response, "\n"))) - newline[0] = '\0'; - /* * The response to a '*IDN?' is specified by the SCPI spec. It contains * a comma-separated list containing the manufacturer name, instrument