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 uint32_t devopts[] = {
- SR_CONF_DEMO_DEV,
- SR_CONF_LOGIC_ANALYZER,
- SR_CONF_OSCILLOSCOPE,
- SR_CONF_CONTINUOUS,
+ 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,
-};
-
-static const uint32_t devopts_global[] = {
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
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();
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
- sdi->model = "Demo device";
+ 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);
}
if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+ drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
return SR_OK;
}
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t));
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
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);