SR_CONF_NUM_ANALOG_CHANNELS,
};
-static const int devopts[] = {
+static const uint32_t devopts[] = {
+ SR_CONF_DEMO_DEV,
SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_OSCILLOSCOPE,
SR_CONF_CONTINUOUS,
- 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_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET,
- SR_CONF_NUM_ANALOG_CHANNELS | SR_CONF_GET,
- SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
};
-static const int devopts_cg_logic[] = {
- SR_CONF_PATTERN_MODE,
+static const uint32_t devopts_global[] = {
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+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[] = {
}
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;
} 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;
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])) {
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;
+ }
+
if (!sdi)
return SR_ERR_ARG;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+ devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));