Rename SR_CONF_NUM_TIMEBASE to SR_CONF_NUM_HDIV.

[libsigrok.git] / src / hardware / yokogawa-dlm / protocol.c

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 09d3c9b8faf86512054482ef544f1a4ed23d3175..9f5daf1ce9d88bf1093497a08995263d3aa821f5 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -33,7 +33,7 @@ static const uint32_t dlm_devopts[] = {
        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_TIMEBASE | SR_CONF_GET,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
 };
 
@@ -669,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));
@@ -699,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(