va_start(args, format);
vsnprintf(buf, 255, format, args);
va_end(args);
- if (rigol_ds_send(sdi, buf) != SR_OK)
+ if (sr_scpi_send(sdi->conn, buf) != SR_OK)
return SR_ERR;
/* When setting a bunch of parameters in a row, the DS1052E scrambles
{
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_serial_dev_inst *serial;
+ struct sr_scpi_dev_inst *scpi;
+ struct sr_scpi_hw_info *hw_info;
struct sr_probe *probe;
unsigned int i;
- int len, num_tokens;
- const char *manufacturer, *model_name, *version;
const struct rigol_ds_model *model = NULL;
- char buf[256];
- gchar **tokens, *channel_name;
+ gchar *channel_name;
*devices = NULL;
- if (!(serial = sr_serial_dev_inst_new(port, NULL)))
+ if (!(scpi = scpi_usbtmc_dev_inst_new(port)))
return SR_ERR_MALLOC;
- if (serial_open(serial, SERIAL_RDWR) != SR_OK)
- return SR_ERR;
- len = serial_write(serial, "*IDN?", 5);
- len = serial_read(serial, buf, sizeof(buf));
- if (serial_close(serial) != SR_OK)
+ if (sr_scpi_open(scpi) != SR_OK) {
+ sr_scpi_free(scpi);
return SR_ERR;
+ };
- sr_serial_dev_inst_free(serial);
-
- if (len == 0)
- return SR_ERR_NA;
-
- buf[len] = 0;
- tokens = g_strsplit(buf, ",", 0);
- sr_dbg("response: %s [%s]", port, buf);
-
- for (num_tokens = 0; tokens[num_tokens] != NULL; num_tokens++);
-
- if (num_tokens < 4) {
- g_strfreev(tokens);
- return SR_ERR_NA;
+ if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+ sr_info("Couldn't get IDN response.");
+ sr_scpi_close(scpi);
+ sr_scpi_free(scpi);
+ return SR_ERR;
}
- manufacturer = tokens[0];
- model_name = tokens[1];
- version = tokens[3];
-
- if (strcasecmp(manufacturer, "Rigol Technologies")) {
- g_strfreev(tokens);
+ if (strcasecmp(hw_info->manufacturer, "Rigol Technologies")) {
+ sr_scpi_hw_info_free(hw_info);
+ sr_scpi_free(scpi);
return SR_ERR_NA;
}
for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
- if (!strcmp(model_name, supported_models[i].name)) {
+ if (!strcmp(hw_info->model, supported_models[i].name)) {
model = &supported_models[i];
break;
}
}
if (!model || !(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
- manufacturer, model_name, version))) {
- g_strfreev(tokens);
+ hw_info->manufacturer, hw_info->model,
+ hw_info->firmware_version))) {
+ sr_scpi_hw_info_free(hw_info);
+ sr_scpi_free(scpi);
return SR_ERR_NA;
}
- g_strfreev(tokens);
+ sr_scpi_hw_info_free(hw_info);
+
+ sdi->conn = scpi;
- if (!(sdi->conn = sr_serial_dev_inst_new(port, NULL)))
- return SR_ERR_MALLOC;
sdi->driver = di;
- sdi->inst_type = SR_INST_SERIAL;
+ sdi->inst_type = SR_INST_SCPI;
if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
return SR_ERR_MALLOC;
+
devc->limit_frames = 0;
devc->model = model;
sdi->probes = g_slist_append(sdi->probes, probe);
devc->digital_group.probes = g_slist_append(
devc->digital_group.probes, probe);
- devc->digital_group.name = "LA";
- sdi->probe_groups = g_slist_append(sdi->probe_groups,
- &devc->digital_group);
}
+ devc->digital_group.name = "LA";
+ sdi->probe_groups = g_slist_append(sdi->probe_groups,
+ &devc->digital_group);
}
for (i = 0; i < NUM_TIMEBASE; i++) {
static int dev_open(struct sr_dev_inst *sdi)
{
+ struct sr_scpi_dev_inst *scpi = sdi->conn;
- if (serial_open(sdi->conn, SERIAL_RDWR) != SR_OK)
+ if (sr_scpi_open(scpi) < 0)
return SR_ERR;
if (rigol_ds_get_dev_cfg(sdi) != SR_OK)
static int dev_close(struct sr_dev_inst *sdi)
{
- struct sr_serial_dev_inst *serial;
+ struct sr_scpi_dev_inst *scpi;
- serial = sdi->conn;
- if (serial && serial->fd != -1) {
- serial_close(serial);
+ scpi = sdi->conn;
+
+ if (scpi) {
+ if (sr_scpi_close(scpi) < 0)
+ return SR_ERR;
sdi->status = SR_ST_INACTIVE;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
- struct sr_serial_dev_inst *serial;
+ struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
struct sr_probe *probe;
GSList *l;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- serial = sdi->conn;
+ scpi = sdi->conn;
devc = sdi->priv;
if (devc->data_source == DATA_SOURCE_LIVE) {
- if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
} else if (devc->data_source == DATA_SOURCE_MEMORY) {
if (devc->model->series != RIGOL_DS2000) {
/* Enabled channel is currently disabled, or vice versa. */
sprintf(cmd, ":CHAN%d:DISP %s", probe->index + 1,
probe->enabled ? "ON" : "OFF");
- if (rigol_ds_send(sdi, cmd) != SR_OK)
+ if (sr_scpi_send(sdi->conn, cmd) != SR_OK)
return SR_ERR;
}
} else if (probe->type == SR_PROBE_LOGIC) {
/* Enabled channel is currently disabled, or vice versa. */
sprintf(cmd, ":DIG%d:TURN %s", probe->index,
probe->enabled ? "ON" : "OFF");
- if (rigol_ds_send(sdi, cmd) != SR_OK)
+ if (sr_scpi_send(sdi->conn, cmd) != SR_OK)
return SR_ERR;
}
}
if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
return SR_ERR;
- sr_source_add(serial->fd, G_IO_IN, 50, rigol_ds_receive, (void *)sdi);
+ sr_scpi_source_add(scpi, G_IO_IN, 50, rigol_ds_receive, (void *)sdi);
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
if (devc->enabled_analog_probes) {
devc->analog_frame_size = DS1000_ANALOG_LIVE_WAVEFORM_SIZE;
devc->channel_frame = devc->enabled_analog_probes->data;
- if (rigol_ds_send(sdi, ":WAV:DATA? CHAN%d",
+ if (sr_scpi_send(sdi->conn, ":WAV:DATA? CHAN%d",
devc->channel_frame->index + 1) != SR_OK)
return SR_ERR;
} else {
devc->channel_frame = devc->enabled_digital_probes->data;
- if (rigol_ds_send(sdi, ":WAV:DATA? DIG") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":WAV:DATA? DIG") != SR_OK)
return SR_ERR;
}
/* Apparently for the DS2000 the memory
* depth can only be set in Running state -
* this matches the behaviour of the UI. */
- if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
- if (rigol_ds_send(sdi, "ACQ:MDEP %d", devc->analog_frame_size) != SR_OK)
+ if (sr_scpi_send(sdi->conn, "ACQ:MDEP %d", devc->analog_frame_size) != SR_OK)
return SR_ERR;
- if (rigol_ds_send(sdi, ":STOP") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":STOP") != SR_OK)
return SR_ERR;
} else
devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
struct dev_context *devc;
- struct sr_serial_dev_inst *serial;
+ struct sr_scpi_dev_inst *scpi;
(void)cb_data;
g_slist_free(devc->enabled_digital_probes);
devc->enabled_analog_probes = NULL;
devc->enabled_digital_probes = NULL;
- serial = sdi->conn;
- sr_source_remove(serial->fd);
+ scpi = sdi->conn;
+ sr_scpi_source_remove(scpi);
return SR_OK;
}
projects / libsigrok.git / blobdiff