X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=27705f7ccdc86995e8102e212d38491213c1356d;hb=dcd438ee3523098201c7937e75e55775da3b506f;hp=a142a2d8c294455c79faba4bce13390978b7ed38;hpb=40c2c9159cde208105fa2631019dc857b9918907;p=libsigrok.git diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index a142a2d8..27705f7c 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -175,6 +175,7 @@ enum series { DS2000, DS2000A, DSO1000, + DS1000Z, }; /* short name, full name */ @@ -197,6 +198,8 @@ static const struct rigol_ds_series supported_series[] = { {1000, 1}, {500, 1000000}, 14, 1400, 14000}, [DSO1000] = {VENDOR(AGILENT), "DSO1000", PROTOCOL_V3, FORMAT_IEEE488_2, {50, 1}, {2, 1000}, 12, 600, 20480}, + [DS1000Z] = {VENDOR(RIGOL), "DS1000Z", PROTOCOL_V4, FORMAT_IEEE488_2, + {50, 1}, {1, 1000}, 12, 1200, 12000000}, }; #define SERIES(x) &supported_series[x] @@ -232,10 +235,18 @@ static const struct rigol_ds_model supported_models[] = { {SERIES(DSO1000), "DSO1014A", {2, 1000000000}, 4, false}, {SERIES(DSO1000), "DSO1022A", {2, 1000000000}, 2, false}, {SERIES(DSO1000), "DSO1024A", {2, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1054Z", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1074Z", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1104Z", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1074Z-S", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1104Z-S", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "MSO1074Z", {5, 1000000000}, 4, true}, + {SERIES(DS1000Z), "MSO1104Z", {5, 1000000000}, 4, true}, + {SERIES(DS1000Z), "MSO1074Z-S", {5, 1000000000}, 4, true}, + {SERIES(DS1000Z), "MSO1104Z-S", {5, 1000000000}, 4, true}, }; SR_PRIV struct sr_dev_driver rigol_ds_driver_info; -static struct sr_dev_driver *di = &rigol_ds_driver_info; static void clear_helper(void *priv) { @@ -253,12 +264,12 @@ static void clear_helper(void *priv) g_free(devc); } -static int dev_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_helper); } -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } @@ -304,7 +315,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) sdi->model = g_strdup(model->name); sdi->version = g_strdup(hw_info->firmware_version); sdi->conn = scpi; - sdi->driver = di; + sdi->driver = &rigol_ds_driver_info; sdi->inst_type = SR_INST_SCPI; sdi->serial_num = g_strdup(hw_info->serial_number); devc = g_malloc0(sizeof(struct dev_context)); @@ -395,12 +406,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) return sdi; } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { return sr_scpi_scan(di->priv, options, probe_device); } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { return ((struct drv_context *)(di->priv))->instances; } @@ -448,9 +459,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - return dev_clear(); + return dev_clear(di); } static int analog_frame_size(const struct sr_dev_inst *sdi) @@ -619,7 +630,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s *data = g_variant_new_string(devc->coupling[analog_channel]); break; default: - sr_dbg("Tried to get unknown config key: %d.", key); return SR_ERR_NA; } @@ -784,9 +794,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } break; default: - sr_dbg("Tried to set unknown config key: %d.", key); - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } return ret; @@ -910,7 +918,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } break; default: - sr_dbg("Tried to list unknown config key: %d.", key); return SR_ERR_NA; } @@ -923,6 +930,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) struct dev_context *devc; struct sr_channel *ch; struct sr_datafeed_packet packet; + gboolean some_digital; GSList *l; if (sdi->status != SR_ST_ACTIVE) @@ -933,13 +941,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->num_frames = 0; + some_digital = FALSE; for (l = sdi->channels; l; l = l->next) { ch = l->data; sr_dbg("handling channel %s", ch->name); if (ch->type == SR_CHANNEL_ANALOG) { if (ch->enabled) - devc->enabled_analog_channels = g_slist_append( - devc->enabled_analog_channels, ch); + devc->enabled_channels = g_slist_append( + devc->enabled_channels, ch); if (ch->enabled != devc->analog_channels[ch->index]) { /* Enabled channel is currently disabled, or vice versa. */ if (rigol_ds_config_set(sdi, ":CHAN%d:DISP %s", ch->index + 1, @@ -948,19 +957,29 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->analog_channels[ch->index] = ch->enabled; } } else if (ch->type == SR_CHANNEL_LOGIC) { + /* Only one list entry for DS1000D series. All channels are retrieved + * together when this entry is processed. */ + if (ch->enabled && ( + devc->model->series->protocol > PROTOCOL_V2 || + !some_digital)) + devc->enabled_channels = g_slist_append( + devc->enabled_channels, ch); if (ch->enabled) { - devc->enabled_digital_channels = g_slist_append( - devc->enabled_digital_channels, ch); + some_digital = TRUE; /* Turn on LA module if currently off. */ if (!devc->la_enabled) { - if (rigol_ds_config_set(sdi, ":LA:DISP ON") != SR_OK) + if (rigol_ds_config_set(sdi, + devc->model->series->protocol >= PROTOCOL_V4 ? + ":LA:STAT ON" : ":LA:DISP ON") != SR_OK) return SR_ERR; devc->la_enabled = TRUE; } } if (ch->enabled != devc->digital_channels[ch->index]) { /* Enabled channel is currently disabled, or vice versa. */ - if (rigol_ds_config_set(sdi, ":DIG%d:TURN %s", ch->index, + if (rigol_ds_config_set(sdi, + devc->model->series->protocol >= PROTOCOL_V4 ? + ":LA:DIG%d:DISP %s" : ":DIG%d:TURN %s", ch->index, ch->enabled ? "ON" : "OFF") != SR_OK) return SR_ERR; devc->digital_channels[ch->index] = ch->enabled; @@ -968,12 +987,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) } } - if (!devc->enabled_analog_channels && !devc->enabled_digital_channels) + if (!devc->enabled_channels) return SR_ERR; /* Turn off LA module if on and no digital channels selected. */ - if (devc->la_enabled && !devc->enabled_digital_channels) - if (rigol_ds_config_set(sdi, ":LA:DISP OFF") != SR_OK) + if (devc->la_enabled && !some_digital) + if (rigol_ds_config_set(sdi, + devc->model->series->protocol >= PROTOCOL_V4 ? + ":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK) return SR_ERR; /* Set memory mode. */ @@ -1016,10 +1037,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); - if (devc->enabled_analog_channels) - devc->channel_entry = devc->enabled_analog_channels; - else - devc->channel_entry = devc->enabled_digital_channels; + devc->channel_entry = devc->enabled_channels; if (rigol_ds_capture_start(sdi) != SR_OK) return SR_ERR; @@ -1050,10 +1068,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) packet.type = SR_DF_END; sr_session_send(sdi, &packet); - g_slist_free(devc->enabled_analog_channels); - g_slist_free(devc->enabled_digital_channels); - devc->enabled_analog_channels = NULL; - devc->enabled_digital_channels = NULL; + g_slist_free(devc->enabled_channels); + devc->enabled_channels = NULL; scpi = sdi->conn; sr_scpi_source_remove(sdi->session, scpi);