GHashTable *ch_ag;
};
+static const uint32_t drvopts[] = {
+ SR_CONF_DEMO_DEV,
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_OSCILLOSCOPE,
+};
+
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,
+static const uint32_t devopts[] = {
+ SR_CONF_CONTINUOUS | SR_CONF_SET,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+ 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[] = {
if (i % 5 == 0)
value = -value;
if (i % 10 == 0)
- last_end = i - 1;
+ last_end = i;
ag->pattern_data[i] = value;
}
ag->num_samples = last_end;
}
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 = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_ACTIVE;
+ sdi->model = g_strdup("Demo device");
sdi->driver = di;
devc = g_malloc(sizeof(struct dev_context));
cg->name = g_strdup("Logic");
for (i = 0; i < num_logic_channels; i++) {
sprintf(channel_name, "D%d", i);
- if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name)))
- return NULL;
+ ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
sdi->channels = g_slist_append(sdi->channels, ch);
cg->channels = g_slist_append(cg->channels, ch);
}
} 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,
+ drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+ return SR_OK;
+ }
+
if (!sdi)
return SR_ERR_ARG;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct analog_gen *ag;
+ int ag_pattern_pos;
GHashTableIter iter;
void *value;
uint64_t logic_todo, analog_todo, expected_samplenum, analog_sent, sending_now;
ag = value;
packet.type = SR_DF_ANALOG;
packet.payload = &ag->packet;
-
- /* FIXME we should make sure we output a whole
- * period of data before we send out again the
- * beginning of our buffer. A ring buffer would
- * help here as well */
-
- sending_now = MIN(analog_todo, ag->num_samples);
+ ag_pattern_pos = devc->analog_counter % ag->num_samples;
+ sending_now = MIN(analog_todo, ag->num_samples-ag_pattern_pos);
+ ag->packet.data = ag->pattern_data + ag_pattern_pos;
ag->packet.num_samples = sending_now;
sr_session_send(sdi, &packet);