X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=c39e10c80229294afc1dc4d1165059ee9befcb40;hb=0f8bee7162f41095ca1975fec9a87975ce5a554a;hp=b860c11b5d6801f22f4e3b0cb69f337d72104834;hpb=eac0c6132752224f46661ddc5a37a1e0e4694c27;p=libsigrok.git
diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index b860c11b..c39e10c8 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_NUM_HDIV | SR_CONF_GET,
+ SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
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_HORIZ_TRIGGERPOS | SR_CONF_SET,
- SR_CONF_NUM_HDIV | SR_CONF_GET,
- SR_CONF_SAMPLERATE | SR_CONF_GET,
+ 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[] = {
+static const uint32_t devopts_cg_analog[] = {
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_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const uint64_t timebases[][2] = {
@@ -118,9 +126,6 @@ static const uint64_t vdivs[][2] = {
{ 100, 1 },
};
-#define NUM_TIMEBASE ARRAY_SIZE(timebases)
-#define NUM_VDIV ARRAY_SIZE(vdivs)
-
static const char *trigger_sources[] = {
"CH1",
"CH2",
@@ -157,6 +162,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",
@@ -185,8 +203,8 @@ static const struct rigol_ds_vendor supported_vendors[] = {
};
#define VENDOR(x) &supported_vendors[x]
-/* vendor, series, protocol, max timebase, min vdiv, number of horizontal divs,
- * live waveform samples, memory buffer samples */
+/* vendor, series/name, protocol, data format, 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},
@@ -229,6 +247,10 @@ 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},
@@ -240,20 +262,20 @@ static const struct rigol_ds_model supported_models[] = {
{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 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++)
@@ -261,17 +283,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);
}
static int dev_clear(const struct sr_dev_driver *di)
{
- return std_dev_clear(di, clear_helper);
-}
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- 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)
@@ -296,7 +312,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];
@@ -310,7 +326,6 @@ 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);
@@ -337,12 +352,12 @@ 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;
+ 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);
}
@@ -379,18 +394,18 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
devc->digital_group);
}
- for (i = 0; i < NUM_TIMEBASE; i++) {
+ for (i = 0; i < ARRAY_SIZE(timebases); i++) {
if (!memcmp(&devc->model->min_timebase, &timebases[i], sizeof(uint64_t[2])))
devc->timebases = &timebases[i];
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++) {
+ for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
if (!memcmp(&devc->model->series->min_vdiv,
&vdivs[i], sizeof(uint64_t[2]))) {
devc->vdivs = &vdivs[i];
- devc->num_vdivs = NUM_VDIV - i;
+ devc->num_vdivs = ARRAY_SIZE(vdivs) - i;
}
}
@@ -406,12 +421,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return sr_scpi_scan(di->priv, options, probe_device);
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- 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)
@@ -429,8 +439,6 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_ERR;
}
- sdi->status = SR_ST_ACTIVE;
-
return SR_OK;
}
@@ -439,27 +447,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(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
+ return sr_scpi_close(scpi);
}
static int analog_frame_size(const struct sr_dev_inst *sdi)
@@ -514,9 +511,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
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.");
@@ -585,6 +584,9 @@ 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_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];
@@ -627,6 +629,13 @@ 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;
+ 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;
}
@@ -645,11 +654,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)) {
@@ -688,6 +693,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++) {
@@ -776,6 +788,30 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
}
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);
if (!strcmp(tmp_str, "Live"))
@@ -801,49 +837,23 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- 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) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- return SR_OK;
- }
+ struct dev_context *devc;
- /* Every other option requires a valid device instance. */
- if (!sdi || !(devc = sdi->priv))
- return SR_ERR_ARG;
-
- /* 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;
- }
+ 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));
+ *data = std_gvar_array_u32(NULL, 0);
return SR_OK;
} else {
for (i = 0; i < devc->model->analog_channels; i++) {
if (cg == devc->analog_groups[i]) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- analog_devopts, ARRAY_SIZE(analog_devopts), sizeof(uint32_t));
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
return SR_OK;
}
}
@@ -851,28 +861,22 @@ 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));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
+ break;
+ case SR_CONF_PROBE_FACTOR:
+ if (!cg)
+ return SR_ERR_CHANNEL_GROUP;
+ *data = std_gvar_array_u64(ARRAY_AND_SIZE(probe_factor));
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 < 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);
- g_variant_builder_add_value(&gvb, tuple);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->vdivs, devc->num_vdivs);
break;
case SR_CONF_TIMEBASE:
if (!devc)
@@ -880,14 +884,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_ARG;
if (devc->num_timebases <= 0)
return SR_ERR_NA;
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < devc->num_timebases; i++) {
- rational[0] = g_variant_new_uint64(devc->timebases[i][0]);
- rational[1] = g_variant_new_uint64(devc->timebases[i][1]);
- tuple = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, tuple);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->timebases, devc->num_timebases);
break;
case SR_CONF_TRIGGER_SOURCE:
if (!devc)
@@ -897,7 +894,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
devc->model->has_digital ? ARRAY_SIZE(trigger_sources) : 4);
break;
case SR_CONF_TRIGGER_SLOPE:
- *data = g_variant_new_strv(trigger_slopes, ARRAY_SIZE(trigger_slopes));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes));
break;
case SR_CONF_DATA_SOURCE:
if (!devc)
@@ -911,7 +908,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
*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));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(data_sources));
break;
}
break;
@@ -922,7 +919,7 @@ 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;
@@ -931,9 +928,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
gboolean some_digital;
GSList *l;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
scpi = sdi->conn;
devc = sdi->priv;
@@ -955,10 +949,10 @@ 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. */
+ /* 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_V2 ||
+ devc->model->series->protocol > PROTOCOL_V3 ||
!some_digital))
devc->enabled_channels = g_slist_append(
devc->enabled_channels, ch);
@@ -967,7 +961,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
/* Turn on LA module if currently off. */
if (!devc->la_enabled) {
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ devc->model->series->protocol >= PROTOCOL_V3 ?
":LA:STAT ON" : ":LA:DISP ON") != SR_OK)
return SR_ERR;
devc->la_enabled = TRUE;
@@ -976,7 +970,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (ch->enabled != devc->digital_channels[ch->index]) {
/* Enabled channel is currently disabled, or vice versa. */
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ 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;
@@ -991,7 +985,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
/* Turn off LA module if on and no digital channels selected. */
if (devc->la_enabled && !some_digital)
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ devc->model->series->protocol >= PROTOCOL_V3 ?
":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK)
return SR_ERR;
@@ -1032,8 +1026,7 @@ 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);
devc->channel_entry = devc->enabled_channels;
@@ -1042,29 +1035,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
/* 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_channels);
devc->enabled_channels = NULL;
@@ -1074,14 +1057,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
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,
@@ -1090,5 +1073,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);