X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=8acaf023553c6c75243b12440dc684f30d9dd8ab;hb=98bfc4741f76b07e7db4c9628a6924004fc4fff4;hp=5dc03194af2ca207773f31d4d73ec564bd6c00d1;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c index 5dc03194..8acaf023 100644 --- 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++) { - ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, + ch = sr_channel_new(sdi, 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)); @@ -698,9 +697,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++) { - ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, + ch = sr_channel_new(sdi, 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( devc->digital_groups[i / 8]->channels, ch);