X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=bfb6cd415eb5f8671eebe7808749aeb3f1131b60;hp=e988741eeaab6d8b17414fcc171577eee2e4fe5c;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4 diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index e988741e..bfb6cd41 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -19,37 +19,45 @@ * along with this program. If not, see . */ +#include #include #include #include #include +#include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" +#include "scpi.h" #include "protocol.h" static const uint32_t scanopts[] = { SR_CONF_CONN, - SR_CONF_SERIALCOMM + SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_OSCILLOSCOPE, +}; + +static const uint32_t devopts[] = { SR_CONF_LIMIT_FRAMES | SR_CONF_SET, + SR_CONF_SAMPLERATE | SR_CONF_GET, SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET, + SR_CONF_NUM_HDIV | SR_CONF_GET, SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET, - SR_CONF_NUM_TIMEBASE | SR_CONF_GET, - SR_CONF_SAMPLERATE | SR_CONF_GET, + SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET, + SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; static const uint32_t analog_devopts[] = { SR_CONF_NUM_VDIV | SR_CONF_GET, SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; static const uint64_t timebases[][2] = { @@ -113,6 +121,9 @@ static const uint64_t vdivs[][2] = { { 2, 1 }, { 5, 1 }, { 10, 1 }, + { 20, 1 }, + { 50, 1 }, + { 100, 1 }, }; #define NUM_TIMEBASE ARRAY_SIZE(timebases) @@ -154,6 +165,19 @@ static const char *coupling[] = { "GND", }; +static const uint64_t probe_factor[] = { + 1, + 2, + 5, + 10, + 20, + 50, + 100, + 200, + 500, + 1000, +}; + /* Do not change the order of entries */ static const char *data_sources[] = { "Live", @@ -172,6 +196,7 @@ enum series { DS2000, DS2000A, DSO1000, + DS1000Z, }; /* short name, full name */ @@ -189,11 +214,13 @@ static const struct rigol_ds_series supported_series[] = { [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}, + {500, 1}, {500, 1000000}, 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}, + [DS1000Z] = {VENDOR(RIGOL), "DS1000Z", PROTOCOL_V4, FORMAT_IEEE488_2, + {50, 1}, {1, 1000}, 12, 1200, 12000000}, }; #define SERIES(x) &supported_series[x] @@ -223,23 +250,35 @@ static const struct rigol_ds_model supported_models[] = { {SERIES(DS2000A), "DS2102A", {5, 1000000000}, 2, false}, {SERIES(DS2000A), "DS2202A", {2, 1000000000}, 2, false}, {SERIES(DS2000A), "DS2302A", {1, 1000000000}, 2, false}, + {SERIES(DS2000A), "MSO2072A", {5, 1000000000}, 2, true}, + {SERIES(DS2000A), "MSO2102A", {5, 1000000000}, 2, true}, + {SERIES(DS2000A), "MSO2202A", {2, 1000000000}, 2, true}, + {SERIES(DS2000A), "MSO2302A", {1, 1000000000}, 2, true}, {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}, + {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), "DS1074Z Plus", {5, 1000000000}, 4, false}, + {SERIES(DS1000Z), "DS1104Z Plus", {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 struct sr_dev_driver rigol_ds_driver_info; -static void clear_helper(void *priv) +static void clear_helper(struct dev_context *devc) { - struct dev_context *devc; unsigned int i; - devc = priv; g_free(devc->data); g_free(devc->buffer); for (i = 0; i < ARRAY_SIZE(devc->coupling); i++) @@ -247,18 +286,11 @@ static void clear_helper(void *priv) g_free(devc->trigger_source); g_free(devc->trigger_slope); g_free(devc->analog_groups); - g_free(devc->digital_group); - g_free(devc); -} - -static int dev_clear(void) -{ - return std_dev_clear(di, clear_helper); } -static int init(struct sr_context *sr_ctx) +static int dev_clear(const struct sr_dev_driver *di) { - return std_init(sr_ctx, di, LOG_PREFIX); + return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) @@ -283,7 +315,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) } for (i = 0; i < ARRAY_SIZE(supported_models); i++) { - if (!strcasecmp(hw_info->manufacturer, + if (!g_ascii_strcasecmp(hw_info->manufacturer, supported_models[i].series->vendor->full_name) && !strcmp(hw_info->model, supported_models[i].name)) { model = &supported_models[i]; @@ -297,12 +329,11 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) } sdi = g_malloc0(sizeof(struct sr_dev_inst)); - sdi->status = SR_ST_ACTIVE; sdi->vendor = g_strdup(model->series->vendor->name); 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)); @@ -324,13 +355,13 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) } if (i != 3) break; - if (n[0] != 0 || n[1] > 2) - break; - if (n[1] == 2 && n[2] > 3) - break; - sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format."); - devc->format = FORMAT_RAW; - } while(0); + scpi->firmware_version = n[0] * 100 + n[1] * 10 + n[2]; + if (scpi->firmware_version < 24) { + sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format."); + devc->format = FORMAT_RAW; + } + break; + } while (0); g_strfreev(version); } @@ -340,10 +371,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) model->analog_channels); for (i = 0; i < model->analog_channels; i++) { - if (!(channel_name = g_strdup_printf("CH%d", i + 1))) - return NULL; - ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel_name); - sdi->channels = g_slist_append(sdi->channels, ch); + channel_name = g_strdup_printf("CH%d", i + 1); + ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_name); devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group)); @@ -354,16 +383,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) } if (devc->model->has_digital) { - devc->digital_group = g_malloc0(sizeof(struct sr_channel_group*)); + devc->digital_group = g_malloc0(sizeof(struct sr_channel_group)); for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) { - if (!(channel_name = g_strdup_printf("D%d", i))) - return NULL; - ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name); + channel_name = g_strdup_printf("D%d", i); + ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name); g_free(channel_name); - if (!ch) - return NULL; - sdi->channels = g_slist_append(sdi->channels, ch); devc->digital_group->channels = g_slist_append( devc->digital_group->channels, ch); } @@ -379,14 +404,16 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) devc->num_timebases = &timebases[i] - devc->timebases + 1; } - for (i = 0; i < NUM_VDIV; i++) - if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) + for (i = 0; i < NUM_VDIV; i++) { + if (!memcmp(&devc->model->series->min_vdiv, + &vdivs[i], sizeof(uint64_t[2]))) { devc->vdivs = &vdivs[i]; + devc->num_vdivs = NUM_VDIV - i; + } + } - if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE))) - return NULL; - if (!(devc->data = g_try_malloc(ACQ_BUFFER_SIZE * sizeof(float)))) - return NULL; + devc->buffer = g_malloc(ACQ_BUFFER_SIZE); + devc->data = g_malloc(ACQ_BUFFER_SIZE * sizeof(float)); devc->data_source = DATA_SOURCE_LIVE; @@ -395,27 +422,25 @@ 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) -{ - return ((struct drv_context *)(di->priv))->instances; + return sr_scpi_scan(di->context, options, probe_device); } static int dev_open(struct sr_dev_inst *sdi) { + int ret; struct sr_scpi_dev_inst *scpi = sdi->conn; - if (sr_scpi_open(scpi) < 0) + if ((ret = sr_scpi_open(scpi)) < 0) { + sr_err("Failed to open SCPI device: %s.", sr_strerror(ret)); return SR_ERR; + } - if (rigol_ds_get_dev_cfg(sdi) != SR_OK) + if ((ret = rigol_ds_get_dev_cfg(sdi)) < 0) { + sr_err("Failed to get device config: %s.", sr_strerror(ret)); return SR_ERR; - - sdi->status = SR_ST_ACTIVE; + } return SR_OK; } @@ -425,27 +450,16 @@ 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 (!scpi) + return SR_ERR_BUG; + if (devc->model->series->protocol == PROTOCOL_V2) rigol_ds_config_set(sdi, ":KEY:LOCK DISABLE"); - if (scpi) { - if (sr_scpi_close(scpi) < 0) - return SR_ERR; - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; -} - -static int cleanup(void) -{ - return dev_clear(); + return sr_scpi_close(scpi); } static int analog_frame_size(const struct sr_dev_inst *sdi) @@ -496,13 +510,15 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s const char *tmp_str; uint64_t samplerate; int analog_channel = -1; - float smallest_diff = 0.0000000001; + float smallest_diff = INFINITY; int idx = -1; unsigned i; - if (!sdi || !(devc = sdi->priv)) + if (!sdi) return SR_ERR_ARG; + devc = sdi->priv; + /* 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."); @@ -521,11 +537,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s } switch (key) { - case SR_CONF_NUM_TIMEBASE: + case SR_CONF_NUM_HDIV: *data = g_variant_new_int32(devc->model->series->num_horizontal_divs); break; case SR_CONF_NUM_VDIV: - *data = g_variant_new_int32(NUM_VDIV); + *data = g_variant_new_int32(devc->num_vdivs); + break; case SR_CONF_DATA_SOURCE: if (devc->data_source == DATA_SOURCE_LIVE) *data = g_variant_new_string("Live"); @@ -540,6 +557,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s (devc->timebase * devc->model->series->num_horizontal_divs); *data = g_variant_new_uint64(samplerate); } else { + sr_dbg("Unknown data source: %d.", devc->data_source); return SR_ERR_NA; } break; @@ -559,14 +577,19 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s *data = g_variant_new_string(tmp_str); break; case SR_CONF_TRIGGER_SLOPE: - if (!strcmp(devc->trigger_slope, "POS")) + if (!strncmp(devc->trigger_slope, "POS", 3)) { tmp_str = "r"; - else if (!strcmp(devc->trigger_slope, "NEG")) + } else if (!strncmp(devc->trigger_slope, "NEG", 3)) { tmp_str = "f"; - else + } else { + sr_dbg("Unknown trigger slope: '%s'.", devc->trigger_slope); return SR_ERR_NA; + } *data = g_variant_new_string(tmp_str); break; + case SR_CONF_TRIGGER_LEVEL: + *data = g_variant_new_double(devc->trigger_level); + break; case SR_CONF_TIMEBASE: for (i = 0; i < devc->num_timebases; i++) { float tb = (float)devc->timebases[i][0] / devc->timebases[i][1]; @@ -576,14 +599,18 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s idx = i; } } - if (idx < 0) + if (idx < 0) { + sr_dbg("Negative timebase index: %d.", idx); return SR_ERR_NA; + } *data = g_variant_new("(tt)", devc->timebases[idx][0], devc->timebases[idx][1]); break; case SR_CONF_VDIV: - if (analog_channel < 0) + if (analog_channel < 0) { + sr_dbg("Negative analog channel: %d.", analog_channel); return SR_ERR_NA; + } for (i = 0; i < ARRAY_SIZE(vdivs); i++) { float vdiv = (float)vdivs[i][0] / vdivs[i][1]; float diff = fabs(devc->vdiv[analog_channel] - vdiv); @@ -592,15 +619,26 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s idx = i; } } - if (idx < 0) + if (idx < 0) { + sr_dbg("Negative vdiv index: %d.", idx); return SR_ERR_NA; + } *data = g_variant_new("(tt)", vdivs[idx][0], vdivs[idx][1]); break; case SR_CONF_COUPLING: - if (analog_channel < 0) + if (analog_channel < 0) { + sr_dbg("Negative analog channel: %d.", analog_channel); return SR_ERR_NA; + } *data = g_variant_new_string(devc->coupling[analog_channel]); break; + case SR_CONF_PROBE_FACTOR: + if (analog_channel < 0) { + sr_dbg("Negative analog channel: %d.", analog_channel); + return SR_ERR_NA; + } + *data = g_variant_new_uint64(devc->attenuation[analog_channel]); + break; default: return SR_ERR_NA; } @@ -619,11 +657,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd const char *tmp_str; char buffer[16]; - if (!(devc = sdi->priv)) - return SR_ERR_ARG; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + devc = sdi->priv; /* If a channel group is specified, it must be a valid one. */ if (cg && !g_slist_find(sdi->channel_groups, cg)) { @@ -639,8 +673,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd case SR_CONF_TRIGGER_SLOPE: tmp_str = g_variant_get_string(data, NULL); - if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) + if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) { + sr_err("Unknown trigger slope: '%s'.", + (tmp_str) ? tmp_str : "NULL"); return SR_ERR_ARG; + } g_free(devc->trigger_slope); devc->trigger_slope = g_strdup((tmp_str[0] == 'r') ? "POS" : "NEG"); @@ -648,8 +685,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd break; case SR_CONF_HORIZ_TRIGGERPOS: t_dbl = g_variant_get_double(data); - if (t_dbl < 0.0 || t_dbl > 1.0) + if (t_dbl < 0.0 || t_dbl > 1.0) { + sr_err("Invalid horiz. trigger position: %g.", t_dbl); return SR_ERR; + } devc->horiz_triggerpos = t_dbl; /* We have the trigger offset as a percentage of the frame, but * need to express this in seconds. */ @@ -657,6 +696,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd g_ascii_formatd(buffer, sizeof(buffer), "%.6f", t_dbl); ret = rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer); break; + case SR_CONF_TRIGGER_LEVEL: + t_dbl = g_variant_get_double(data); + g_ascii_formatd(buffer, sizeof(buffer), "%.3f", t_dbl); + ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:LEV %s", buffer); + if (ret == SR_OK) + devc->trigger_level = t_dbl; + break; case SR_CONF_TIMEBASE: g_variant_get(data, "(tt)", &p, &q); for (i = 0; i < devc->num_timebases; i++) { @@ -668,8 +714,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd break; } } - if (i == devc->num_timebases) + if (i == devc->num_timebases) { + sr_err("Invalid timebase index: %d.", i); ret = SR_ERR_ARG; + } break; case SR_CONF_TRIGGER_SOURCE: tmp_str = g_variant_get_string(data, NULL); @@ -693,8 +741,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd break; } } - if (i == ARRAY_SIZE(trigger_sources)) + if (i == ARRAY_SIZE(trigger_sources)) { + sr_err("Invalid trigger source index: %d.", i); ret = SR_ERR_ARG; + } break; case SR_CONF_VDIV: if (!cg) { @@ -713,9 +763,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1, buffer); } + sr_err("Invalid vdiv index: %d.", j); return SR_ERR_ARG; } } + sr_dbg("Didn't set vdiv, unknown channel(group)."); return SR_ERR_NA; case SR_CONF_COUPLING: if (!cg) { @@ -733,9 +785,35 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd devc->coupling[i]); } } + sr_err("Invalid coupling index: %d.", j); + return SR_ERR_ARG; + } + } + sr_dbg("Didn't set coupling, unknown channel(group)."); + return SR_ERR_NA; + case SR_CONF_PROBE_FACTOR: + if (!cg) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; + } + p = g_variant_get_uint64(data); + for (i = 0; i < devc->model->analog_channels; i++) { + if (cg == devc->analog_groups[i]) { + for (j = 0; j < ARRAY_SIZE(probe_factor); j++) { + if (p == probe_factor[j]) { + devc->attenuation[i] = p; + ret = rigol_ds_config_set(sdi, ":CHAN%d:PROB %"PRIu64, + i + 1, p); + if (ret == SR_OK) + rigol_ds_get_dev_cfg_vertical(sdi); + return ret; + } + } + sr_err("Invalid probe factor: %"PRIu64".", p); return SR_ERR_ARG; } } + sr_dbg("Didn't set probe factor, unknown channel(group)."); return SR_ERR_NA; case SR_CONF_DATA_SOURCE: tmp_str = g_variant_get_string(data, NULL); @@ -747,12 +825,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd else if (devc->model->series->protocol >= PROTOCOL_V3 && !strcmp(tmp_str, "Segmented")) devc->data_source = DATA_SOURCE_SEGMENTED; - else + else { + sr_err("Unknown data source: '%s'.", tmp_str); return SR_ERR; + } break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } return ret; @@ -764,42 +843,15 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariant *tuple, *rational[2]; GVariantBuilder gvb; unsigned int i; - struct dev_context *devc = NULL; - - if (sdi) - devc = sdi->priv; - - if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - return SR_OK; - } else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - return SR_OK; - } - - /* Every other option requires a valid device instance. */ - if (!sdi || !(devc = sdi->priv)) - return SR_ERR_ARG; + struct dev_context *devc; - /* If a channel group is specified, it must be a valid one. */ - if (cg) { - for (i = 0; i < devc->model->analog_channels; i++) - if (cg == devc->analog_groups[i]) - break; - if (i >= devc->model->analog_channels) { - sr_err("Invalid channel group specified."); - return SR_ERR; - } - } + devc = (sdi) ? sdi->priv : NULL; switch (key) { + case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - if (!cg) { - sr_err("No channel group specified."); - return SR_ERR_CHANNEL_GROUP; - } + if (!cg) + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); if (cg == devc->digital_group) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, NULL, 0, sizeof(uint32_t)); @@ -816,22 +868,24 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } break; case SR_CONF_COUPLING: - if (!cg) { - sr_err("No channel group specified."); + if (!cg) return SR_ERR_CHANNEL_GROUP; - } *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); break; + case SR_CONF_PROBE_FACTOR: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64, + probe_factor, ARRAY_SIZE(probe_factor), sizeof(uint64_t)); + break; case SR_CONF_VDIV: if (!devc) /* Can't know this until we have the exact model. */ return SR_ERR_ARG; - if (!cg) { - sr_err("No channel group specified."); + if (!cg) return SR_ERR_CHANNEL_GROUP; - } g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < NUM_VDIV; i++) { + for (i = 0; i < devc->num_vdivs; i++) { rational[0] = g_variant_new_uint64(devc->vdivs[i][0]); rational[1] = g_variant_new_uint64(devc->vdivs[i][1]); tuple = g_variant_new_tuple(rational, 2); @@ -887,29 +941,28 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct sr_scpi_dev_inst *scpi; struct dev_context *devc; struct sr_channel *ch; struct sr_datafeed_packet packet; + gboolean some_digital; GSList *l; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - scpi = sdi->conn; devc = sdi->priv; 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, @@ -918,19 +971,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 older protocols. All channels are + * retrieved together when this entry is processed. */ + if (ch->enabled && ( + devc->model->series->protocol > PROTOCOL_V3 || + !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_V3 ? + ":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_V3 ? + ":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; @@ -938,12 +1001,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_V3 ? + ":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK) return SR_ERR; /* Set memory mode. */ @@ -983,61 +1048,45 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) sr_scpi_source_add(sdi->session, 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); + std_session_send_df_header(sdi); - 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; /* Start of first frame. */ packet.type = SR_DF_FRAME_BEGIN; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_scpi_dev_inst *scpi; - struct sr_datafeed_packet packet; - - (void)cb_data; devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't stop acquisition."); - return SR_ERR; - } - - /* End of last frame. */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi); - 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); return SR_OK; } -SR_PRIV struct sr_dev_driver rigol_ds_driver_info = { +static struct sr_dev_driver rigol_ds_driver_info = { .name = "rigol-ds", .longname = "Rigol DS", .api_version = 1, - .init = init, - .cleanup = cleanup, + .init = std_init, + .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, @@ -1046,5 +1095,6 @@ SR_PRIV struct sr_dev_driver rigol_ds_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, }; +SR_REGISTER_DEV_DRIVER(rigol_ds_driver_info);