X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=session_driver.c;h=fe0db3e6e0acbbf0ad5b808e4321b11fe8a48d35;hp=f333db1df1ae9eab6e280123d6d674e363426c28;hb=fca75cbb741ae756bf50eaf1cdc6d4d53fcc60cd;hpb=8c9d4d67f8678a5c6819428170d5611a4c3f1dc3 diff --git a/session_driver.c b/session_driver.c index f333db1d..fe0db3e6 100644 --- a/session_driver.c +++ b/session_driver.c @@ -41,7 +41,7 @@ struct session_vdev { int bytes_read; uint64_t samplerate; int unitsize; - int num_probes; + int num_channels; int cur_chunk; gboolean finished; }; @@ -211,11 +211,11 @@ static int dev_close(struct sr_dev_inst *sdi) } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct session_vdev *vdev; - (void)probe_group; + (void)cg; switch (id) { case SR_CONF_SAMPLERATE: @@ -233,11 +233,11 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct session_vdev *vdev; - (void)probe_group; + (void)cg; vdev = sdi->priv; @@ -259,8 +259,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, case SR_CONF_CAPTURE_UNITSIZE: vdev->unitsize = g_variant_get_uint64(data); break; - case SR_CONF_NUM_LOGIC_PROBES: - vdev->num_probes = g_variant_get_uint64(data); + case SR_CONF_NUM_LOGIC_CHANNELS: + vdev->num_channels = g_variant_get_uint64(data); break; default: return SR_ERR_NA; @@ -270,10 +270,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { (void)sdi; - (void)probe_group; + (void)cg; switch (key) { case SR_CONF_DEVICE_OPTIONS: