Change sr_dev_inst_new() to take no parameters.

[libsigrok.git] / src / hardware / demo / demo.c

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 7fc959f493b018a766fe74a8f12792cc8e392351..b5cb276c9747f4011ed42ef8917abe1cf3866aa5 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -128,27 +128,31 @@ 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,
+static const uint32_t devopts[] = {
        SR_CONF_DEMO_DEV,
-       SR_CONF_SAMPLERATE,
+       SR_CONF_LOGIC_ANALYZER,
+       SR_CONF_OSCILLOSCOPE,
        SR_CONF_CONTINUOUS,
-       SR_CONF_LIMIT_SAMPLES,
-       SR_CONF_LIMIT_MSEC,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const uint32_t devopts_global[] = {
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const int devopts_cg_logic[] = {
-       SR_CONF_PATTERN_MODE,
+static const uint32_t devopts_cg_logic[] = {
+       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,
+static const uint32_t devopts_cg_analog[] = {
+       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,11 +289,10 @@ static GSList *scan(GSList *options)
        }
 
        devices = NULL;
-       sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "Demo device", NULL, NULL);
-       if (!sdi) {
-               sr_err("Device instance creation failed.");
-               return NULL;
-       }
+
+       sdi = sr_dev_inst_new();
+       sdi->status = SR_ST_ACTIVE;
+       sdi->model = "Demo device";
        sdi->driver = di;
 
        devc = g_malloc(sizeof(struct dev_context));
@@ -398,7 +401,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 +413,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;
@@ -435,12 +438,6 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
                } else
                        return SR_ERR_BUG;
                break;
-       case SR_CONF_NUM_LOGIC_CHANNELS:
-               *data = g_variant_new_int32(devc->num_logic_channels);
-               break;
-       case SR_CONF_NUM_ANALOG_CHANNELS:
-               *data = g_variant_new_int32(devc->num_analog_channels);
-               break;
        case SR_CONF_AMPLITUDE:
                if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
@@ -458,7 +455,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 +472,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);
@@ -494,7 +491,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
                if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
                stropt = g_variant_get_string(data, NULL);
-               ch = cg->channels->data;
                logic_pattern = analog_pattern = -1;
                for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
                        if (!strcmp(stropt, logic_pattern_str[i])) {
@@ -552,7 +548,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 +558,14 @@ 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;
+       }
+
+       if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               devopts, ARRAY_SIZE(devopts), 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_global, ARRAY_SIZE(devopts_global), 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;