X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsysclk-lwla%2Fapi.c;h=12a1e08696764c20d9d365d0eafb21caf7e57f4b;hb=d405193074b11296e33acb56945978c08f2f4f98;hp=3cff652ac5bf90da6ad7f7e0b6a1ff9cf4a52f4d;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;p=libsigrok.git diff --git a/hardware/sysclk-lwla/api.c b/hardware/sysclk-lwla/api.c index 3cff652a..12a1e086 100644 --- a/hardware/sysclk-lwla/api.c +++ b/hardware/sysclk-lwla/api.c @@ -85,7 +85,7 @@ static GSList *gen_channel_list(int num_channels) /* The LWLA series simply number channels from CH1 to CHxx. */ g_snprintf(name, sizeof(name), "CH%d", i); - ch = sr_probe_new(i - 1, SR_PROBE_LOGIC, TRUE, name); + ch = sr_channel_new(i - 1, SR_CHANNEL_LOGIC, TRUE, name); list = g_slist_prepend(list, ch); } @@ -118,7 +118,7 @@ static struct sr_dev_inst *dev_inst_new(int device_index) devc->samplerate = DEFAULT_SAMPLERATE; sdi->priv = devc; - sdi->channels = gen_channel_list(NUM_PROBES); + sdi->channels = gen_channel_list(NUM_CHANNELS); return sdi; } @@ -401,7 +401,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, return SR_OK; } -static int config_probe_set(const struct sr_dev_inst *sdi, +static int config_channel_set(const struct sr_dev_inst *sdi, struct sr_channel *ch, unsigned int changes) { uint64_t channel_bit; @@ -414,13 +414,13 @@ static int config_probe_set(const struct sr_dev_inst *sdi, if (!devc) return SR_ERR_DEV_CLOSED; - if (ch->index < 0 || ch->index >= NUM_PROBES) { + if (ch->index < 0 || ch->index >= NUM_CHANNELS) { sr_err("Channel index %d out of range.", ch->index); return SR_ERR_BUG; } channel_bit = (uint64_t)1 << ch->index; - if ((changes & SR_PROBE_SET_ENABLED) != 0) { + if ((changes & SR_CHANNEL_SET_ENABLED) != 0) { /* Enable or disable input channel for this channel. */ if (ch->enabled) devc->channel_mask |= channel_bit; @@ -428,7 +428,7 @@ static int config_probe_set(const struct sr_dev_inst *sdi, devc->channel_mask &= ~channel_bit; } - if ((changes & SR_PROBE_SET_TRIGGER) != 0) { + if ((changes & SR_CHANNEL_SET_TRIGGER) != 0) { trigger_mask = devc->trigger_mask & ~channel_bit; trigger_values = devc->trigger_values & ~channel_bit; trigger_edge_mask = devc->trigger_edge_mask & ~channel_bit; @@ -601,7 +601,7 @@ SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info = { .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, - .config_probe_set = config_probe_set, + .config_channel_set = config_channel_set, .config_commit = config_commit, .config_list = config_list, .dev_open = dev_open,