X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=9f5daf1ce9d88bf1093497a08995263d3aa821f5;hp=7acd1b59b5d80d09b5f56a2b25b7d757d8404341;hb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;hpb=f254bc4bba68d2cade0c8f7993d8fa8d3d9b556a

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 7acd1b59..9f5daf1c 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -28,17 +28,19 @@
 static const uint32_t dlm_devopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_OSCILLOSCOPE,
-	SR_CONF_TRIGGER_SLOPE,
-	SR_CONF_TRIGGER_SOURCE,
-	SR_CONF_TIMEBASE,
-	SR_CONF_NUM_TIMEBASE,
-	SR_CONF_HORIZ_TRIGGERPOS,
+	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	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_GET | SR_CONF_SET,
 };
 
 static const uint32_t dlm_analog_devopts[] = {
-	SR_CONF_VDIV,
-	SR_CONF_COUPLING,
-	SR_CONF_NUM_VDIV,
+	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_NUM_VDIV | SR_CONF_GET,
 };
 
 static const char *dlm_coupling_options[] = {
@@ -667,9 +669,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	/* Add analog channels. */
 	for (i = 0; i < scope_models[model_index].analog_channels; i++) {
-		if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
-				(*scope_models[model_index].analog_names)[i])))
-			return SR_ERR_MALLOC;
+		ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
+				(*scope_models[model_index].analog_names)[i]);
 		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
@@ -697,9 +698,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	/* Add digital channels. */
 	for (i = 0; i < scope_models[model_index].digital_channels; i++) {
-		if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
-				(*scope_models[model_index].digital_names)[i])))
-			return SR_ERR_MALLOC;
+		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+				(*scope_models[model_index].digital_names)[i]);
 		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		devc->digital_groups[i / 8]->channels = g_slist_append(