return SR_ERR;
}
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_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_vxi_dev;
+
+static const struct sr_scpi_dev_inst *scpi_devs[] = {
+ &scpi_tcp_raw_dev,
+ &scpi_tcp_rigol_dev,
+ &scpi_usbtmc_dev,
+#if HAVE_RPC
+ &scpi_vxi_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)
+{
+ struct sr_scpi_dev_inst *scpi = NULL;
+ const struct sr_scpi_dev_inst *scpi_dev;
+ gchar **params;
+ unsigned i;
+
+ for (i = 0; i < ARRAY_SIZE(scpi_devs); i++) {
+ scpi_dev = scpi_devs[i];
+ if (!strncmp(resource, scpi_dev->prefix, strlen(scpi_dev->prefix))) {
+ sr_dbg("Opening %s device %s.", scpi_dev->name, resource);
+ scpi = g_malloc(sizeof(*scpi));
+ *scpi = *scpi_dev;
+ scpi->priv = g_malloc0(scpi->priv_size);
+ params = g_strsplit(resource, "/", 0);
+ if (scpi->dev_inst_new(scpi->priv, resource,
+ params, serialcomm) != SR_OK) {
+ sr_scpi_free(scpi);
+ scpi = NULL;
+ }
+ g_strfreev(params);
+ break;
+ }
+ }
+
+ return scpi;
+}
+
/**
* Open SCPI device.
*
}
/**
- * Receive an SCPI reply and store the reply in scpi_response.
+ * Begin receiving an SCPI reply.
*
* @param scpi Previously initialised SCPI device structure.
- * @param scpi_response Pointer where to store the SCPI response.
*
- * @return SR_OK upon fetching a full SCPI response, SR_ERR upon fetching an
- * incomplete or no response. The allocated response must be freed by
- * the caller in the case of a full response as well in the case of
- * an incomplete.
+ * @return SR_OK on success, SR_ERR on failure.
*/
-SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
- char **scpi_response)
+SR_PRIV int sr_scpi_read_begin(struct sr_scpi_dev_inst *scpi)
{
- return scpi->receive(scpi->priv, scpi_response);
+ return scpi->read_begin(scpi->priv);
}
/**
*
* @return Number of bytes read, or SR_ERR upon failure.
*/
-SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi,
+SR_PRIV int sr_scpi_read_data(struct sr_scpi_dev_inst *scpi,
char *buf, int maxlen)
{
- return scpi->read(scpi->priv, buf, maxlen);
+ return scpi->read_data(scpi->priv, buf, maxlen);
+}
+
+/**
+ * Check whether a complete SCPI response has been received.
+ *
+ * @param scpi Previously initialised SCPI device structure.
+ *
+ * @return 1 if complete, 0 otherwise.
+ */
+SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi)
+{
+ return scpi->read_complete(scpi->priv);
}
/**
SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi)
{
scpi->free(scpi->priv);
+ g_free(scpi->priv);
g_free(scpi);
}
* @param command The SCPI command to send to the device (can be NULL).
* @param scpi_response Pointer where to store the SCPI response.
*
- * @return SR_OK upon fetching a full SCPI response, SR_ERR upon fetching an
- * incomplete or no response. The allocated response must be freed by
- * the caller in the case of a full response as well in the case of
- * an incomplete.
+ * @return SR_OK on success, SR_ERR on failure.
*/
SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
const char *command, char **scpi_response)
{
+ char buf[256];
+ int len;
+ GString *response;
+
if (command)
if (sr_scpi_send(scpi, command) != SR_OK)
return SR_ERR;
- return sr_scpi_receive(scpi, scpi_response);
+ if (sr_scpi_read_begin(scpi) != SR_OK)
+ return SR_ERR;
+
+ response = g_string_new("");
+
+ *scpi_response = NULL;
+
+ while (!sr_scpi_read_complete(scpi)) {
+ len = sr_scpi_read_data(scpi, buf, sizeof(buf));
+ if (len < 0) {
+ g_string_free(response, TRUE);
+ return SR_ERR;
+ }
+ 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);
+
+ return SR_OK;
}
/**
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;
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
if (!response)
return SR_ERR;
+ sr_info("Got IDN string: '%s'", response);
+
/*
* The response to a '*IDN?' is specified by the SCPI spec. It contains
* a comma-separated list containing the manufacturer name, instrument
projects / libsigrok.git / blobdiff