X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Frigol-ds%2Fapi.c;h=ce78840b959c8ec03707e12e2c8684f0ad9cbbab;hp=087cc9a53120d19937e59f0c0104811e8a9bd44d;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=8dd0b290eb6ce6ebf9bde8b9a52785adb45b16f7 diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c index 087cc9a5..ce78840b 100644 --- a/hardware/rigol-ds/api.c +++ b/hardware/rigol-ds/api.c @@ -156,47 +156,74 @@ static const char *data_sources[] = { "Segmented", }; -/* - * name, series, protocol flavor, min timebase, max timebase, min vdiv, - * digital channels, number of horizontal divs - */ +enum vendor { + RIGOL, + AGILENT, +}; + +enum series { + VS5000, + DS1000, + DS2000, + DS2000A, + DSO1000, +}; -#define RIGOL "Rigol Technologies" -#define AGILENT "Agilent Technologies" -#define RIGOL_SHORT "Rigol" -#define AGILENT_SHORT "Agilent" +/* short name, full name */ +static const struct rigol_ds_vendor supported_vendors[] = { + [RIGOL] = {"Rigol", "Rigol Technologies"}, + [AGILENT] = {"Agilent", "Rigol Technologies"}, +}; + +#define VENDOR(x) &supported_vendors[x] +/* vendor, series, protocol, max timebase, min vdiv, number of horizontal divs, + * live waveform samples, memory buffer samples */ +static const struct rigol_ds_series supported_series[] = { + [VS5000] = {VENDOR(RIGOL), "VS5000", PROTOCOL_V1, FORMAT_RAW, + {50, 1}, {2, 1000}, 14, 2048, 0}, + [DS1000] = {VENDOR(RIGOL), "DS1000", PROTOCOL_V2, FORMAT_IEEE488_2, + {50, 1}, {2, 1000}, 12, 600, 1048576}, + [DS2000] = {VENDOR(RIGOL), "DS2000", PROTOCOL_V3, FORMAT_IEEE488_2, + {500, 1}, {2, 1000}, 14, 1400, 14000}, + [DS2000A] = {VENDOR(RIGOL), "DS2000A", PROTOCOL_V3, FORMAT_IEEE488_2, + {1000, 1}, {500, 1000000}, 14, 1400, 14000}, + [DSO1000] = {VENDOR(AGILENT), "DSO1000", PROTOCOL_V3, FORMAT_IEEE488_2, + {50, 1}, {2, 1000}, 12, 600, 20480}, +}; +#define SERIES(x) &supported_series[x] +/* series, model, min timebase, analog channels, digital */ static const struct rigol_ds_model supported_models[] = { - {RIGOL, "DS1052E", RIGOL_DS1000, PROTOCOL_IEEE488_2, {5, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {RIGOL, "DS1102E", RIGOL_DS1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {RIGOL, "DS1152E", RIGOL_DS1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {RIGOL, "DS1052D", RIGOL_DS1000, PROTOCOL_IEEE488_2, {5, 1000000000}, {50, 1}, {2, 1000}, 2, true, 12}, - {RIGOL, "DS1102D", RIGOL_DS1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, true, 12}, - {RIGOL, "DS1152D", RIGOL_DS1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, true, 12}, - {RIGOL, "DS2072", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {500, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2102", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {500, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2202", RIGOL_DS2000, PROTOCOL_IEEE488_2, {2, 1000000000}, {500, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2302", RIGOL_DS2000, PROTOCOL_IEEE488_2, {1, 1000000000}, {1000, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2072A", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {1000, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2102A", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {1000, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2202A", RIGOL_DS2000, PROTOCOL_IEEE488_2, {2, 1000000000}, {1000, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "DS2302A", RIGOL_DS2000, PROTOCOL_IEEE488_2, {1, 1000000000}, {1000, 1}, {500, 1000000}, 2, false, 14}, - {RIGOL, "VS5022", RIGOL_VS5000, PROTOCOL_LEGACY, {20, 1000000000}, {50, 1}, {2, 1000}, 2, false, 14}, - {RIGOL, "VS5022D", RIGOL_VS5000, PROTOCOL_LEGACY, {20, 1000000000}, {50, 1}, {2, 1000}, 2, true, 14}, - {RIGOL, "VS5042", RIGOL_VS5000, PROTOCOL_LEGACY, {10, 1000000000}, {50, 1}, {2, 1000}, 2, false, 14}, - {RIGOL, "VS5042D", RIGOL_VS5000, PROTOCOL_LEGACY, {10, 1000000000}, {50, 1}, {2, 1000}, 2, true, 14}, - {RIGOL, "VS5062", RIGOL_VS5000, PROTOCOL_LEGACY, {5, 1000000000}, {50, 1}, {2, 1000}, 2, false, 14}, - {RIGOL, "VS5062D", RIGOL_VS5000, PROTOCOL_LEGACY, {5, 1000000000}, {50, 1}, {2, 1000}, 2, true, 14}, - {RIGOL, "VS5102", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 14}, - {RIGOL, "VS5102D", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, 2, true, 14}, - {RIGOL, "VS5202", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 14}, - {RIGOL, "VS5202D", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, 2, true, 14}, - {AGILENT, "DSO1002A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {5, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {AGILENT, "DSO1004A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {5, 1000000000}, {50, 1}, {2, 1000}, 4, false, 12}, - {AGILENT, "DSO1012A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {AGILENT, "DSO1014A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 4, false, 12}, - {AGILENT, "DSO1022A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12}, - {AGILENT, "DSO1024A", AGILENT_DSO1000, PROTOCOL_IEEE488_2, {2, 1000000000}, {50, 1}, {2, 1000}, 4, false, 12}, + {SERIES(VS5000), "VS5022", {20, 1000000000}, 2, false}, + {SERIES(VS5000), "VS5042", {10, 1000000000}, 2, false}, + {SERIES(VS5000), "VS5062", {5, 1000000000}, 2, false}, + {SERIES(VS5000), "VS5102", {2, 1000000000}, 2, false}, + {SERIES(VS5000), "VS5202", {2, 1000000000}, 2, false}, + {SERIES(VS5000), "VS5022D", {20, 1000000000}, 2, true}, + {SERIES(VS5000), "VS5042D", {10, 1000000000}, 2, true}, + {SERIES(VS5000), "VS5062D", {5, 1000000000}, 2, true}, + {SERIES(VS5000), "VS5102D", {2, 1000000000}, 2, true}, + {SERIES(VS5000), "VS5202D", {2, 1000000000}, 2, true}, + {SERIES(DS1000), "DS1052E", {5, 1000000000}, 2, false}, + {SERIES(DS1000), "DS1102E", {2, 1000000000}, 2, false}, + {SERIES(DS1000), "DS1152E", {2, 1000000000}, 2, false}, + {SERIES(DS1000), "DS1052D", {5, 1000000000}, 2, true}, + {SERIES(DS1000), "DS1102D", {2, 1000000000}, 2, true}, + {SERIES(DS1000), "DS1152D", {2, 1000000000}, 2, true}, + {SERIES(DS2000), "DS2072", {5, 1000000000}, 2, false}, + {SERIES(DS2000), "DS2102", {5, 1000000000}, 2, false}, + {SERIES(DS2000), "DS2202", {2, 1000000000}, 2, false}, + {SERIES(DS2000), "DS2302", {1, 1000000000}, 2, false}, + {SERIES(DS2000A), "DS2072A", {5, 1000000000}, 2, false}, + {SERIES(DS2000A), "DS2102A", {5, 1000000000}, 2, false}, + {SERIES(DS2000A), "DS2202A", {2, 1000000000}, 2, false}, + {SERIES(DS2000A), "DS2302A", {1, 1000000000}, 2, false}, + {SERIES(DSO1000), "DSO1002A", {5, 1000000000}, 2, false}, + {SERIES(DSO1000), "DSO1004A", {5, 1000000000}, 4, false}, + {SERIES(DSO1000), "DSO1012A", {2, 1000000000}, 2, false}, + {SERIES(DSO1000), "DSO1014A", {2, 1000000000}, 4, false}, + {SERIES(DSO1000), "DSO1022A", {2, 1000000000}, 2, false}, + {SERIES(DSO1000), "DSO1024A", {2, 1000000000}, 4, false}, }; SR_PRIV struct sr_dev_driver rigol_ds_driver_info; @@ -213,9 +240,9 @@ static void clear_helper(void *priv) g_free(devc->coupling[1]); g_free(devc->trigger_source); g_free(devc->trigger_slope); - g_slist_free(devc->analog_groups[0].probes); - g_slist_free(devc->analog_groups[1].probes); - g_slist_free(devc->digital_group.probes); + g_slist_free(devc->analog_groups[0].channels); + g_slist_free(devc->analog_groups[1].channels); + g_slist_free(devc->digital_group.channels); } static int dev_clear(void) @@ -223,77 +250,46 @@ static int dev_clear(void) return std_dev_clear(di, clear_helper); } -static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...) -{ - va_list args; - int ret; - - va_start(args, format); - ret = sr_scpi_send_variadic(sdi->conn, format, args); - va_end(args); - - if (ret != SR_OK) - return SR_ERR; - - return sr_scpi_get_opc(sdi->conn); -} - static int init(struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static int probe_port(const char *resource, const char *serialcomm, GSList **devices) +static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) { struct dev_context *devc; struct sr_dev_inst *sdi; - struct sr_scpi_dev_inst *scpi; struct sr_scpi_hw_info *hw_info; - struct sr_probe *probe; + struct sr_channel *ch; long n[3]; unsigned int i; const struct rigol_ds_model *model = NULL; - gchar *channel_name, *vendor, **version; - - *devices = NULL; - - if (!(scpi = scpi_dev_inst_new(resource, serialcomm))) - return SR_ERR; - - if (sr_scpi_open(scpi) != SR_OK) { - sr_info("Couldn't open SCPI device."); - sr_scpi_free(scpi); - return SR_ERR; - }; + gchar *channel_name, **version; 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; + return NULL; } for (i = 0; i < ARRAY_SIZE(supported_models); i++) { - if (!strcasecmp(hw_info->manufacturer, supported_models[i].vendor) && + if (!strcasecmp(hw_info->manufacturer, + supported_models[i].series->vendor->full_name) && !strcmp(hw_info->model, supported_models[i].name)) { model = &supported_models[i]; break; } } - if (!strcmp(hw_info->manufacturer, RIGOL)) - vendor = RIGOL_SHORT; - else if (!strcmp(hw_info->manufacturer, AGILENT)) - vendor = AGILENT_SHORT; - else - vendor = hw_info->manufacturer; if (!model || !(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, - vendor, hw_info->model, + model->series->vendor->name, + model->name, hw_info->firmware_version))) { sr_scpi_hw_info_free(hw_info); sr_scpi_close(scpi); sr_scpi_free(scpi); - return SR_ERR_NA; + return NULL; } sr_scpi_close(scpi); @@ -304,15 +300,14 @@ static int probe_port(const char *resource, const char *serialcomm, GSList **dev sdi->inst_type = SR_INST_SCPI; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) - return SR_ERR_MALLOC; + return NULL; devc->limit_frames = 0; devc->model = model; - devc->protocol = model->protocol; + devc->format = model->series->format; - /* DS1000 models with firmware before 0.2.4 used the old - * legacy protocol. */ - if (model->series == RIGOL_DS1000) { + /* DS1000 models with firmware before 0.2.4 used the old data format. */ + if (model->series == SERIES(DS1000)) { version = g_strsplit(hw_info->firmware_version, ".", 0); do { if (!version[0] || !version[1] || !version[2]) @@ -329,8 +324,8 @@ static int probe_port(const char *resource, const char *serialcomm, GSList **dev break; if (n[1] == 2 && n[2] > 3) break; - sr_dbg("Found DS1000 firmware < 0.2.4, using old protocol."); - devc->protocol = PROTOCOL_LEGACY; + sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format."); + devc->format = FORMAT_RAW; } while(0); g_strfreev(version); } @@ -339,115 +334,58 @@ static int probe_port(const char *resource, const char *serialcomm, GSList **dev for (i = 0; i < model->analog_channels; i++) { if (!(channel_name = g_strdup_printf("CH%d", i + 1))) - return SR_ERR_MALLOC; - probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name); - sdi->probes = g_slist_append(sdi->probes, probe); + return NULL; + ch = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name); + sdi->channels = g_slist_append(sdi->channels, ch); devc->analog_groups[i].name = channel_name; - devc->analog_groups[i].probes = g_slist_append(NULL, probe); - sdi->probe_groups = g_slist_append(sdi->probe_groups, + devc->analog_groups[i].channels = g_slist_append(NULL, ch); + sdi->channel_groups = g_slist_append(sdi->channel_groups, &devc->analog_groups[i]); } if (devc->model->has_digital) { for (i = 0; i < 16; i++) { if (!(channel_name = g_strdup_printf("D%d", i))) - return SR_ERR_MALLOC; - probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, channel_name); + return NULL; + ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, channel_name); g_free(channel_name); - if (!probe) - return SR_ERR_MALLOC; - sdi->probes = g_slist_append(sdi->probes, probe); - devc->digital_group.probes = g_slist_append( - devc->digital_group.probes, probe); + if (!ch) + return NULL; + sdi->channels = g_slist_append(sdi->channels, ch); + devc->digital_group.channels = g_slist_append( + devc->digital_group.channels, ch); } devc->digital_group.name = "LA"; - sdi->probe_groups = g_slist_append(sdi->probe_groups, + sdi->channel_groups = g_slist_append(sdi->channel_groups, &devc->digital_group); } for (i = 0; i < NUM_TIMEBASE; i++) { if (!memcmp(&devc->model->min_timebase, &timebases[i], sizeof(uint64_t[2]))) devc->timebases = &timebases[i]; - if (!memcmp(&devc->model->max_timebase, &timebases[i], sizeof(uint64_t[2]))) + if (!memcmp(&devc->model->series->max_timebase, &timebases[i], sizeof(uint64_t[2]))) devc->num_timebases = &timebases[i] - devc->timebases + 1; } for (i = 0; i < NUM_VDIV; i++) - if (!memcmp(&devc->model->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) + if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) devc->vdivs = &vdivs[i]; if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE))) - return SR_ERR_MALLOC; + return NULL; if (!(devc->data = g_try_malloc(ACQ_BUFFER_SIZE * sizeof(float)))) - return SR_ERR_MALLOC; + return NULL; devc->data_source = DATA_SOURCE_LIVE; sdi->priv = devc; - *devices = g_slist_append(NULL, sdi); - - return SR_OK; + return sdi; } static GSList *scan(GSList *options) { - struct drv_context *drvc; - struct sr_config *src; - GSList *l, *devices; - GDir *dir; - int ret; - const gchar *dev_name; - gchar *port = NULL; - gchar *serialcomm = NULL; - - drvc = di->priv; - - for (l = options; l; l = l->next) { - src = l->data; - switch (src->key) { - case SR_CONF_CONN: - port = (char *)g_variant_get_string(src->data, NULL); - break; - case SR_CONF_SERIALCOMM: - serialcomm = (char *)g_variant_get_string(src->data, NULL); - break; - } - } - - devices = NULL; - if (port) { - if (probe_port(port, serialcomm, &devices) == SR_ERR_MALLOC) { - g_free(port); - if (serialcomm) - g_free(serialcomm); - return NULL; - } - } else { - if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL))) - if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL))) - return NULL; - while ((dev_name = g_dir_read_name(dir))) { - if (strncmp(dev_name, "usbtmc", 6)) - continue; - port = g_strconcat("/dev/", dev_name, NULL); - ret = probe_port(port, serialcomm, &devices); - g_free(port); - if (serialcomm) - g_free(serialcomm); - if (ret == SR_ERR_MALLOC) { - g_dir_close(dir); - return NULL; - } - } - g_dir_close(dir); - } - - /* Tack a copy of the newly found devices onto the driver list. */ - l = g_slist_copy(devices); - drvc->instances = g_slist_concat(drvc->instances, l); - - return devices; + return sr_scpi_scan(di->priv, options, probe_device); } static GSList *dev_list(void) @@ -473,8 +411,16 @@ static int dev_open(struct sr_dev_inst *sdi) static int dev_close(struct sr_dev_inst *sdi) { struct sr_scpi_dev_inst *scpi; + struct dev_context *devc; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; scpi = sdi->conn; + devc = sdi->priv; + + if (devc->model->series->protocol == PROTOCOL_V2) + rigol_ds_config_set(sdi, ":KEY:LOCK DISABLE"); if (scpi) { if (sr_scpi_close(scpi) < 0) @@ -493,32 +439,26 @@ static int cleanup(void) static int analog_frame_size(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - struct sr_probe *probe; - int analog_probes = 0; + struct sr_channel *ch; + int analog_channels = 0; GSList *l; - switch (devc->model->series) { - case RIGOL_VS5000: - return VS5000_ANALOG_LIVE_WAVEFORM_SIZE; - case RIGOL_DS1000: - return DS1000_ANALOG_LIVE_WAVEFORM_SIZE; + for (l = sdi->channels; l; l = l->next) { + ch = l->data; + if (ch->type == SR_PROBE_ANALOG && ch->enabled) + analog_channels++; + } + + if (analog_channels == 0) + return 0; + + switch (devc->data_source) { + case DATA_SOURCE_LIVE: + return devc->model->series->live_samples; + case DATA_SOURCE_MEMORY: + return devc->model->series->buffer_samples / analog_channels; default: - for (l = sdi->probes; l; l = l->next) { - probe = l->data; - if (probe->type == SR_PROBE_ANALOG && probe->enabled) - analog_probes++; - } - if (devc->data_source == DATA_SOURCE_MEMORY) { - if (analog_probes == 1) - return DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C; - else - return DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C; - } else { - if (devc->model->series == AGILENT_DSO1000) - return DSO1000_ANALOG_LIVE_WAVEFORM_SIZE; - else - return DS2000_ANALOG_LIVE_WAVEFORM_SIZE; - } + return 0; } } @@ -526,21 +466,21 @@ static int digital_frame_size(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - switch (devc->model->series) { - case RIGOL_VS5000: - return VS5000_DIGITAL_WAVEFORM_SIZE; - case RIGOL_DS1000: - return DS1000_DIGITAL_WAVEFORM_SIZE; + switch (devc->data_source) { + case DATA_SOURCE_LIVE: + return devc->model->series->live_samples * 2; + case DATA_SOURCE_MEMORY: + return devc->model->series->buffer_samples * 2; default: return 0; } } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; const char *tmp_str; uint64_t samplerate; int analog_channel = -1; @@ -551,26 +491,26 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - /* If a probe group is specified, it must be a valid one. */ - if (probe_group && !g_slist_find(sdi->probe_groups, probe_group)) { - sr_err("Invalid probe group specified."); + /* If a channel group is specified, it must be a valid one. */ + if (cg && !g_slist_find(sdi->channel_groups, cg)) { + sr_err("Invalid channel group specified."); return SR_ERR; } - if (probe_group) { - probe = g_slist_nth_data(probe_group->probes, 0); - if (!probe) + if (cg) { + ch = g_slist_nth_data(cg->channels, 0); + if (!ch) return SR_ERR; - if (probe->type == SR_PROBE_ANALOG) { - if (probe->name[2] < '1' || probe->name[2] > '4') + if (ch->type == SR_PROBE_ANALOG) { + if (ch->name[2] < '1' || ch->name[2] > '4') return SR_ERR; - analog_channel = probe->name[2] - '1'; + analog_channel = ch->name[2] - '1'; } } switch (id) { case SR_CONF_NUM_TIMEBASE: - *data = g_variant_new_int32(devc->model->num_horizontal_divs); + *data = g_variant_new_int32(devc->model->series->num_horizontal_divs); break; case SR_CONF_NUM_VDIV: *data = g_variant_new_int32(NUM_VDIV); @@ -585,7 +525,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_SAMPLERATE: if (devc->data_source == DATA_SOURCE_LIVE) { samplerate = analog_frame_size(sdi) / - (devc->timebase * devc->model->num_horizontal_divs); + (devc->timebase * devc->model->series->num_horizontal_divs); *data = g_variant_new_uint64(samplerate); } else { return SR_ERR_NA; @@ -648,10 +588,10 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - uint64_t tmp_u64, p, q; + uint64_t p, q; double t_dbl; unsigned int i, j; int ret; @@ -664,9 +604,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - /* If a probe group is specified, it must be a valid one. */ - if (probe_group && !g_slist_find(sdi->probe_groups, probe_group)) { - sr_err("Invalid probe group specified."); + /* If a channel group is specified, it must be a valid one. */ + if (cg && !g_slist_find(sdi->channel_groups, cg)) { + sr_err("Invalid channel group specified."); return SR_ERR; } @@ -676,12 +616,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, devc->limit_frames = g_variant_get_uint64(data); break; case SR_CONF_TRIGGER_SLOPE: - tmp_u64 = g_variant_get_uint64(data); - if (tmp_u64 != 0 && tmp_u64 != 1) - return SR_ERR; + tmp_str = g_variant_get_string(data, NULL); + + if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) + return SR_ERR_ARG; + g_free(devc->trigger_slope); - devc->trigger_slope = g_strdup(tmp_u64 ? "POS" : "NEG"); - ret = set_cfg(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope); + devc->trigger_slope = g_strdup((tmp_str[0] == 'r') ? "POS" : "NEG"); + ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope); break; case SR_CONF_HORIZ_TRIGGERPOS: t_dbl = g_variant_get_double(data); @@ -692,7 +634,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, * need to express this in seconds. */ t_dbl = -(devc->horiz_triggerpos - 0.5) * devc->timebase * devc->num_timebases; g_ascii_formatd(buffer, sizeof(buffer), "%.6f", t_dbl); - ret = set_cfg(sdi, ":TIM:OFFS %s", buffer); + ret = rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer); break; case SR_CONF_TIMEBASE: g_variant_get(data, "(tt)", &p, &q); @@ -701,7 +643,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, devc->timebase = (float)p / q; g_ascii_formatd(buffer, sizeof(buffer), "%.9f", devc->timebase); - ret = set_cfg(sdi, ":TIM:SCAL %s", buffer); + ret = rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer); break; } } @@ -726,7 +668,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, tmp_str = "CHAN4"; else tmp_str = (char *)devc->trigger_source; - ret = set_cfg(sdi, ":TRIG:EDGE:SOUR %s", tmp_str); + ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str); break; } } @@ -734,20 +676,20 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, ret = SR_ERR_ARG; break; case SR_CONF_VDIV: - if (!probe_group) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } g_variant_get(data, "(tt)", &p, &q); for (i = 0; i < 2; i++) { - if (probe_group == &devc->analog_groups[i]) { + if (cg == &devc->analog_groups[i]) { for (j = 0; j < ARRAY_SIZE(vdivs); j++) { if (vdivs[j][0] != p || vdivs[j][1] != q) continue; devc->vdiv[i] = (float)p / q; g_ascii_formatd(buffer, sizeof(buffer), "%.3f", devc->vdiv[i]); - return set_cfg(sdi, ":CHAN%d:SCAL %s", i + 1, + return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1, buffer); } return SR_ERR_ARG; @@ -755,18 +697,18 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } return SR_ERR_NA; case SR_CONF_COUPLING: - if (!probe_group) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } tmp_str = g_variant_get_string(data, NULL); for (i = 0; i < 2; i++) { - if (probe_group == &devc->analog_groups[i]) { + if (cg == &devc->analog_groups[i]) { for (j = 0; j < ARRAY_SIZE(coupling); j++) { if (!strcmp(tmp_str, coupling[j])) { g_free(devc->coupling[i]); devc->coupling[i] = g_strdup(coupling[j]); - return set_cfg(sdi, ":CHAN%d:COUP %s", i + 1, + return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1, devc->coupling[i]); } } @@ -778,9 +720,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, tmp_str = g_variant_get_string(data, NULL); if (!strcmp(tmp_str, "Live")) devc->data_source = DATA_SOURCE_LIVE; - else if (!strcmp(tmp_str, "Memory")) + else if (devc->model->series->protocol >= PROTOCOL_V2 + && !strcmp(tmp_str, "Memory")) devc->data_source = DATA_SOURCE_MEMORY; - else if (devc->model->series >= RIGOL_DS1000Z + else if (devc->model->series->protocol >= PROTOCOL_V3 && !strcmp(tmp_str, "Segmented")) devc->data_source = DATA_SOURCE_SEGMENTED; else @@ -795,7 +738,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { GVariant *tuple, *rational[2]; GVariantBuilder gvb; @@ -809,7 +752,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); return SR_OK; - } else if (key == SR_CONF_DEVICE_OPTIONS && probe_group == NULL) { + } else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); return SR_OK; @@ -819,28 +762,28 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - /* If a probe group is specified, it must be a valid one. */ - if (probe_group) { - if (probe_group != &devc->analog_groups[0] - && probe_group != &devc->analog_groups[1]) { - sr_err("Invalid probe group specified."); + /* If a channel group is specified, it must be a valid one. */ + if (cg) { + if (cg != &devc->analog_groups[0] + && cg != &devc->analog_groups[1]) { + sr_err("Invalid channel group specified."); return SR_ERR; } } switch (key) { case SR_CONF_DEVICE_OPTIONS: - if (!probe_group) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } - if (probe_group == &devc->digital_group) { + if (cg == &devc->digital_group) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, NULL, 0, sizeof(int32_t)); return SR_OK; } else { for (i = 0; i < 2; i++) { - if (probe_group == &devc->analog_groups[i]) { + if (cg == &devc->analog_groups[i]) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, analog_hwcaps, ARRAY_SIZE(analog_hwcaps), sizeof(int32_t)); return SR_OK; @@ -850,9 +793,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, } break; case SR_CONF_COUPLING: - if (!probe_group) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); break; @@ -860,9 +803,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!devc) /* Can't know this until we have the exact model. */ return SR_ERR_ARG; - if (!probe_group) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); for (i = 0; i < NUM_VDIV; i++) { @@ -899,11 +842,17 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!devc) /* Can't know this until we have the exact model. */ return SR_ERR_ARG; - /* This needs tweaking by series/model! */ - if (devc->model->series == RIGOL_DS2000) - *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources)); - else + switch (devc->model->series->protocol) { + case PROTOCOL_V1: + *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources) - 2); + break; + case PROTOCOL_V2: *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources) - 1); + break; + default: + *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources)); + break; + } break; default: return SR_ERR_NA; @@ -916,7 +865,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct sr_scpi_dev_inst *scpi; struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_datafeed_packet packet; GSList *l; @@ -928,96 +877,95 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->num_frames = 0; - for (l = sdi->probes; l; l = l->next) { - probe = l->data; - sr_dbg("handling probe %s", probe->name); - if (probe->type == SR_PROBE_ANALOG) { - if (probe->enabled) - devc->enabled_analog_probes = g_slist_append( - devc->enabled_analog_probes, probe); - if (probe->enabled != devc->analog_channels[probe->index]) { + for (l = sdi->channels; l; l = l->next) { + ch = l->data; + sr_dbg("handling channel %s", ch->name); + if (ch->type == SR_PROBE_ANALOG) { + if (ch->enabled) + devc->enabled_analog_channels = g_slist_append( + devc->enabled_analog_channels, ch); + if (ch->enabled != devc->analog_channels[ch->index]) { /* Enabled channel is currently disabled, or vice versa. */ - if (set_cfg(sdi, ":CHAN%d:DISP %s", probe->index + 1, - probe->enabled ? "ON" : "OFF") != SR_OK) + if (rigol_ds_config_set(sdi, ":CHAN%d:DISP %s", ch->index + 1, + ch->enabled ? "ON" : "OFF") != SR_OK) return SR_ERR; - devc->analog_channels[probe->index] = probe->enabled; + devc->analog_channels[ch->index] = ch->enabled; } - } else if (probe->type == SR_PROBE_LOGIC) { - if (probe->enabled) { - devc->enabled_digital_probes = g_slist_append( - devc->enabled_digital_probes, probe); + } else if (ch->type == SR_PROBE_LOGIC) { + if (ch->enabled) { + devc->enabled_digital_channels = g_slist_append( + devc->enabled_digital_channels, ch); /* Turn on LA module if currently off. */ if (!devc->la_enabled) { - if (set_cfg(sdi, ":LA:DISP ON") != SR_OK) + if (rigol_ds_config_set(sdi, ":LA:DISP ON") != SR_OK) return SR_ERR; devc->la_enabled = TRUE; } } - if (probe->enabled != devc->digital_channels[probe->index]) { + if (ch->enabled != devc->digital_channels[ch->index]) { /* Enabled channel is currently disabled, or vice versa. */ - if (set_cfg(sdi, ":DIG%d:TURN %s", probe->index, - probe->enabled ? "ON" : "OFF") != SR_OK) + if (rigol_ds_config_set(sdi, ":DIG%d:TURN %s", ch->index, + ch->enabled ? "ON" : "OFF") != SR_OK) return SR_ERR; - devc->digital_channels[probe->index] = probe->enabled; + devc->digital_channels[ch->index] = ch->enabled; } } } - if (!devc->enabled_analog_probes && !devc->enabled_digital_probes) + if (!devc->enabled_analog_channels && !devc->enabled_digital_channels) return SR_ERR; - /* Turn off LA module if on and no digital probes selected. */ - if (devc->la_enabled && !devc->enabled_digital_probes) - if (set_cfg(sdi, ":LA:DISP OFF") != SR_OK) + /* 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) return SR_ERR; - if (devc->data_source == DATA_SOURCE_LIVE) { - if (set_cfg(sdi, ":RUN") != SR_OK) - return SR_ERR; - } else if (devc->data_source == DATA_SOURCE_MEMORY) { - if (devc->model->series != RIGOL_DS2000) { - sr_err("Data source 'Memory' not supported for this device"); - return SR_ERR; - } - } else if (devc->data_source == DATA_SOURCE_SEGMENTED) { + /* Set memory mode. */ + if (devc->data_source == DATA_SOURCE_SEGMENTED) { sr_err("Data source 'Segmented' not yet supported"); return SR_ERR; } + devc->analog_frame_size = analog_frame_size(sdi); + devc->digital_frame_size = digital_frame_size(sdi); + + switch (devc->model->series->protocol) { + case PROTOCOL_V2: + if (rigol_ds_config_set(sdi, ":ACQ:MDEP LONG") != SR_OK) + return SR_ERR; + break; + case PROTOCOL_V3: + /* Apparently for the DS2000 the memory + * depth can only be set in Running state - + * this matches the behaviour of the UI. */ + if (rigol_ds_config_set(sdi, ":RUN") != SR_OK) + return SR_ERR; + if (rigol_ds_config_set(sdi, ":ACQ:MDEP %d", + devc->analog_frame_size) != SR_OK) + return SR_ERR; + if (rigol_ds_config_set(sdi, ":STOP") != SR_OK) + return SR_ERR; + break; + default: + break; + } + + if (devc->data_source == DATA_SOURCE_LIVE) + if (rigol_ds_config_set(sdi, ":RUN") != SR_OK) + return SR_ERR; + 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->channel_entry = devc->enabled_analog_probes; + if (devc->enabled_analog_channels) + devc->channel_entry = devc->enabled_analog_channels; else - devc->channel_entry = devc->enabled_digital_probes; + devc->channel_entry = devc->enabled_digital_channels; - devc->analog_frame_size = analog_frame_size(sdi); - devc->digital_frame_size = digital_frame_size(sdi); - - if (devc->model->series < RIGOL_DS1000Z) { - /* Fetch the first frame. */ - if (rigol_ds_channel_start(sdi) != SR_OK) - return SR_ERR; - } else { - if (devc->enabled_analog_probes) { - if (devc->data_source == DATA_SOURCE_MEMORY) { - /* Apparently for the DS2000 the memory - * depth can only be set in Running state - - * this matches the behaviour of the UI. */ - if (set_cfg(sdi, ":RUN") != SR_OK) - return SR_ERR; - if (set_cfg(sdi, "ACQ:MDEP %d", devc->analog_frame_size) != SR_OK) - return SR_ERR; - if (set_cfg(sdi, ":STOP") != SR_OK) - return SR_ERR; - } - if (rigol_ds_capture_start(sdi) != SR_OK) - return SR_ERR; - } - } + if (rigol_ds_capture_start(sdi) != SR_OK) + return SR_ERR; /* Start of first frame. */ packet.type = SR_DF_FRAME_BEGIN; @@ -1045,10 +993,10 @@ 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_probes); - g_slist_free(devc->enabled_digital_probes); - devc->enabled_analog_probes = NULL; - devc->enabled_digital_probes = NULL; + g_slist_free(devc->enabled_analog_channels); + g_slist_free(devc->enabled_digital_channels); + devc->enabled_analog_channels = NULL; + devc->enabled_digital_channels = NULL; scpi = sdi->conn; sr_scpi_source_remove(scpi);