X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=73000bc77e96d2000ddc9a0ba64e72082604c4a5;hb=aed4ad0beaf64062752039a13f9a95326aa1df87;hp=7fc959f493b018a766fe74a8f12792cc8e392351;hpb=49224c285351e1d868731f13b3ef3c7906518706;p=libsigrok.git diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index 7fc959f4..73000bc7 100644 --- a/src/hardware/demo/demo.c +++ b/src/hardware/demo/demo.c @@ -128,27 +128,29 @@ struct dev_context { GHashTable *ch_ag; }; -static const int32_t scanopts[] = { +static const uint32_t scanopts[] = { SR_CONF_NUM_LOGIC_CHANNELS, SR_CONF_NUM_ANALOG_CHANNELS, }; static const int devopts[] = { SR_CONF_LOGIC_ANALYZER, - SR_CONF_DEMO_DEV, - SR_CONF_SAMPLERATE, SR_CONF_CONTINUOUS, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, + SR_CONF_DEMO_DEV, + SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, + SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET, + SR_CONF_NUM_ANALOG_CHANNELS | SR_CONF_GET, }; static const int devopts_cg_logic[] = { - SR_CONF_PATTERN_MODE, + SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; static const int devopts_cg_analog[] = { - SR_CONF_PATTERN_MODE, - SR_CONF_AMPLITUDE, + SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET, }; static const uint64_t samplerates[] = { @@ -285,7 +287,7 @@ static GSList *scan(GSList *options) } devices = NULL; - sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "Demo device", NULL, NULL); + sdi = sr_dev_inst_new(SR_ST_ACTIVE, "Demo device", NULL, NULL); if (!sdi) { sr_err("Device instance creation failed."); return NULL; @@ -398,7 +400,7 @@ static int cleanup(void) return std_dev_clear(di, clear_helper); } -static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, +static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -410,7 +412,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, return SR_ERR_ARG; devc = sdi->priv; - switch (id) { + switch (key) { case SR_CONF_SAMPLERATE: *data = g_variant_new_uint64(devc->cur_samplerate); break; @@ -458,7 +460,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, return SR_OK; } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, +static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -475,7 +477,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, return SR_ERR_DEV_CLOSED; ret = SR_OK; - switch (id) { + switch (key) { case SR_CONF_SAMPLERATE: devc->cur_samplerate = g_variant_get_uint64(data); sr_dbg("Setting samplerate to %" PRIu64, devc->cur_samplerate); @@ -552,7 +554,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, return ret; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, +static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct sr_channel *ch; @@ -562,8 +564,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, (void)sdi; if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; } @@ -573,8 +575,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!cg) { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - devopts, ARRAY_SIZE(devopts), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; case SR_CONF_SAMPLERATE: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); @@ -594,11 +596,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (ch->type == SR_CHANNEL_LOGIC) *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, devopts_cg_logic, ARRAY_SIZE(devopts_cg_logic), - sizeof(int32_t)); + sizeof(uint32_t)); else if (ch->type == SR_CHANNEL_ANALOG) *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog), - sizeof(int32_t)); + sizeof(uint32_t)); else return SR_ERR_BUG; break;