X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=3a8d277dac88f7ccb147a294e87ae393b91209dc;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=3a3992f390b7bcae523b687479a6db526c5ffabd;hpb=2b36d6c64e16c4b4efdffacd61d6fbc0c1b7ef91;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 3a3992f3..3a8d277d 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -111,18 +111,19 @@ struct dev_context { uint64_t cur_samplerate; uint64_t limit_samples; uint64_t limit_msec; - uint64_t samples_counter; + uint64_t logic_counter; + uint64_t analog_counter; int64_t starttime; uint64_t step; /* Logic */ int32_t num_logic_probes; unsigned int logic_unitsize; - /* There is only ever one logic probe group, so its pattern goes here. */ + /* There is only ever one logic channel group, so its pattern goes here. */ uint8_t logic_pattern; unsigned char logic_data[LOGIC_BUFSIZE]; /* Analog */ int32_t num_analog_probes; - GSList *analog_probe_groups; + GSList *analog_channel_groups; }; static const int32_t scanopts[] = { @@ -138,7 +139,7 @@ static const int devopts[] = { SR_CONF_LIMIT_MSEC, }; -static const int devopts_pg[] = { +static const int devopts_cg[] = { SR_CONF_PATTERN_MODE, }; @@ -165,17 +166,12 @@ static struct sr_dev_driver *di = &demo_driver_info; static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static int dev_clear(void) -{ - return std_dev_clear(di, NULL); -} - static int init(struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static void generate_analog_pattern(const struct sr_probe_group *probe_group, uint64_t sample_rate) +static void generate_analog_pattern(const struct sr_channel_group *cg, uint64_t sample_rate) { struct analog_gen *ag; double t, frequency; @@ -183,12 +179,11 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui unsigned int num_samples, i; int last_end; - ag = probe_group->priv; + ag = cg->priv; num_samples = ANALOG_BUFSIZE / sizeof(float); - sr_dbg("Generating %s pattern for probe group %s", - analog_pattern_str[ag->pattern], - probe_group->name); + sr_dbg("Generating %s pattern for channel group %s", + analog_pattern_str[ag->pattern], cg->name); switch (ag->pattern) { case PATTERN_SQUARE: @@ -205,7 +200,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui break; case PATTERN_SINE: - frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD; + frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD; /* Make sure the number of samples we put out is an integer * multiple of our period size */ @@ -224,7 +219,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui break; case PATTERN_TRIANGLE: - frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD; + frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD; while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0) num_samples--; @@ -239,7 +234,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui break; case PATTERN_SAWTOOTH: - frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD; + frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD; while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0) num_samples--; @@ -261,7 +256,7 @@ static GSList *scan(GSList *options) struct dev_context *devc; struct sr_dev_inst *sdi; struct sr_probe *probe; - struct sr_probe_group *pg; + struct sr_channel_group *cg; struct sr_config *src; struct analog_gen *ag; GSList *devices, *l; @@ -304,24 +299,24 @@ static GSList *scan(GSList *options) devc->logic_unitsize = (devc->num_logic_probes + 7) / 8; devc->logic_pattern = PATTERN_SIGROK; devc->num_analog_probes = num_analog_probes; - devc->analog_probe_groups = NULL; + devc->analog_channel_groups = NULL; - /* Logic probes, all in one probe group. */ - if (!(pg = g_try_malloc(sizeof(struct sr_probe_group)))) + /* Logic probes, all in one channel group. */ + if (!(cg = g_try_malloc(sizeof(struct sr_channel_group)))) return NULL; - pg->name = g_strdup("Logic"); - pg->probes = NULL; - pg->priv = NULL; + cg->name = g_strdup("Logic"); + cg->channels = NULL; + cg->priv = NULL; for (i = 0; i < num_logic_probes; i++) { sprintf(probe_name, "D%d", i); if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, probe_name))) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); - pg->probes = g_slist_append(pg->probes, probe); + cg->channels = g_slist_append(cg->channels, probe); } - sdi->probe_groups = g_slist_append(NULL, pg); + sdi->channel_groups = g_slist_append(NULL, cg); - /* Analog probes, probe groups and pattern generators. */ + /* Analog probes, channel groups and pattern generators. */ pattern = 0; for (i = 0; i < num_analog_probes; i++) { @@ -331,25 +326,25 @@ static GSList *scan(GSList *options) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); - /* Every analog probe gets its own probe group. */ - if (!(pg = g_try_malloc(sizeof(struct sr_probe_group)))) + /* Every analog probe gets its own channel group. */ + if (!(cg = g_try_malloc(sizeof(struct sr_channel_group)))) return NULL; - pg->name = g_strdup(probe_name); - pg->probes = g_slist_append(NULL, probe); + cg->name = g_strdup(probe_name); + cg->channels = g_slist_append(NULL, probe); - /* Every probe group gets a generator struct. */ + /* Every channel group gets a generator struct. */ if (!(ag = g_try_malloc(sizeof(struct analog_gen)))) return NULL; - ag->packet.probes = pg->probes; + ag->packet.probes = cg->channels; ag->packet.mq = 0; ag->packet.mqflags = 0; ag->packet.unit = SR_UNIT_VOLT; ag->packet.data = ag->pattern_data; ag->pattern = pattern; - pg->priv = ag; + cg->priv = ag; - sdi->probe_groups = g_slist_append(sdi->probe_groups, pg); - devc->analog_probe_groups = g_slist_append(devc->analog_probe_groups, pg); + sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); + devc->analog_channel_groups = g_slist_append(devc->analog_channel_groups, cg); if (++pattern == ARRAY_SIZE(analog_pattern_str)) pattern = 0; @@ -383,11 +378,11 @@ static int dev_close(struct sr_dev_inst *sdi) static int cleanup(void) { - return dev_clear(); + return std_dev_clear(di, NULL); } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_probe *probe; @@ -409,14 +404,14 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_uint64(devc->limit_msec); break; case SR_CONF_PATTERN_MODE: - if (!probe_group) - return SR_ERR_PROBE_GROUP; - probe = probe_group->probes->data; + if (!cg) + return SR_ERR_CHANNEL_GROUP; + probe = cg->channels->data; if (probe->type == SR_PROBE_LOGIC) { pattern = devc->logic_pattern; *data = g_variant_new_string(logic_pattern_str[pattern]); } else if (probe->type == SR_PROBE_ANALOG) { - ag = probe_group->priv; + ag = cg->priv; pattern = ag->pattern; *data = g_variant_new_string(analog_pattern_str[pattern]); } else @@ -436,7 +431,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; struct analog_gen *ag; @@ -467,10 +462,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, sr_dbg("Setting time limit to %" PRIu64"ms", devc->limit_msec); break; case SR_CONF_PATTERN_MODE: - if (!probe_group) - return SR_ERR_PROBE_GROUP; + if (!cg) + return SR_ERR_CHANNEL_GROUP; stropt = g_variant_get_string(data, NULL); - probe = probe_group->probes->data; + probe = cg->channels->data; pattern = -1; if (probe->type == SR_PROBE_LOGIC) { for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) { @@ -499,10 +494,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } if (pattern == -1) return SR_ERR_ARG; - sr_dbg("Setting analog pattern for probe group %s to %s", - probe_group->name, - analog_pattern_str[pattern]); - ag = probe_group->priv; + sr_dbg("Setting analog pattern for channel group %s to %s", + cg->name, analog_pattern_str[pattern]); + ag = cg->priv; ag->pattern = pattern; } else return SR_ERR_BUG; @@ -515,7 +509,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct sr_probe *probe; GVariant *gvar; @@ -532,7 +526,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi) return SR_ERR_ARG; - if (!probe_group) { + if (!cg) { switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, @@ -549,11 +543,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, return SR_ERR_NA; } } else { - probe = probe_group->probes->data; + probe = cg->channels->data; switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - devopts_pg, ARRAY_SIZE(devopts_pg), sizeof(int32_t)); + devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t)); break; case SR_CONF_PATTERN_MODE: if (probe->type == SR_PROBE_LOGIC) @@ -621,10 +615,10 @@ static int prepare_data(int fd, int revents, void *cb_data) struct dev_context *devc; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - struct sr_probe_group *pg; + struct sr_channel_group *cg; struct analog_gen *ag; GSList *l; - uint64_t samples_to_send, expected_samplenum, analog_samples, sending_now; + uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now; int64_t time, elapsed; (void)fd; @@ -637,20 +631,15 @@ static int prepare_data(int fd, int revents, void *cb_data) time = g_get_monotonic_time(); elapsed = time - devc->starttime; expected_samplenum = elapsed * devc->cur_samplerate / 1000000; - /* Of those, how many do we still have to send? */ - samples_to_send = expected_samplenum - devc->samples_counter; - if (devc->limit_samples) { - samples_to_send = MIN(samples_to_send, - devc->limit_samples - devc->samples_counter); - } - - while (samples_to_send > 0) { - sending_now = 0; + /* Of those, how many do we still have to send? */ + logic_todo = MIN(expected_samplenum, devc->limit_samples) - devc->logic_counter; + analog_todo = MIN(expected_samplenum, devc->limit_samples) - devc->analog_counter; + while (logic_todo || analog_todo) { /* Logic */ - if (devc->num_logic_probes > 0) { - sending_now = MIN(samples_to_send, + if (devc->num_logic_probes > 0 && logic_todo > 0) { + sending_now = MIN(logic_todo, LOGIC_BUFSIZE / devc->logic_unitsize); logic_generator(sdi, sending_now * devc->logic_unitsize); packet.type = SR_DF_LOGIC; @@ -659,14 +648,16 @@ static int prepare_data(int fd, int revents, void *cb_data) logic.unitsize = devc->logic_unitsize; logic.data = devc->logic_data; sr_session_send(sdi, &packet); + logic_todo -= sending_now; + devc->logic_counter += sending_now; } /* Analog, one probe at a time */ - if (devc->num_analog_probes > 0) { + if (devc->num_analog_probes > 0 && analog_todo > 0) { sending_now = 0; - for (l = devc->analog_probe_groups; l; l = l->next) { - pg = l->data; - ag = pg->priv; + for (l = devc->analog_channel_groups; l; l = l->next) { + cg = l->data; + ag = cg->priv; packet.type = SR_DF_ANALOG; packet.payload = &ag->packet; @@ -675,21 +666,20 @@ static int prepare_data(int fd, int revents, void *cb_data) * beginning of our buffer. A ring buffer would * help here as well */ - analog_samples = MIN(samples_to_send, ag->num_samples); - /* Whichever probe group gets there first. */ + analog_samples = MIN(analog_todo, ag->num_samples); + /* Whichever channel group gets there first. */ sending_now = MAX(sending_now, analog_samples); ag->packet.num_samples = analog_samples; sr_session_send(sdi, &packet); } + analog_todo -= sending_now; + devc->analog_counter += sending_now; } - - samples_to_send -= sending_now; - devc->samples_counter += sending_now; } - if (devc->limit_samples && - devc->samples_counter >= devc->limit_samples) { - sr_info("Requested number of samples reached."); + if (devc->logic_counter >= devc->limit_samples && + devc->analog_counter >= devc->limit_samples) { + sr_dbg("Requested number of samples reached."); dev_acquisition_stop(sdi, cb_data); return TRUE; } @@ -705,9 +695,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - /* TODO: don't start without a sample limit set */ devc = sdi->priv; - devc->samples_counter = 0; + if (devc->limit_samples == 0) + return SR_ERR; + devc->logic_counter = devc->analog_counter = 0; /* * Setting two channels connected by a pipe is a remnant from when the @@ -721,7 +712,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR; } - for (l = devc->analog_probe_groups; l; l = l->next) { + for (l = devc->analog_channel_groups; l; l = l->next) { generate_analog_pattern(l->data, devc->cur_samplerate); } @@ -755,7 +746,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) (void)cb_data; devc = sdi->priv; - sr_dbg("Stopping aquisition."); + sr_dbg("Stopping acquisition."); sr_session_source_remove_channel(devc->channel); g_io_channel_shutdown(devc->channel, FALSE, NULL); @@ -777,7 +768,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .cleanup = cleanup, .scan = scan, .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_clear = NULL, .config_get = config_get, .config_set = config_set, .config_list = config_list,