X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=50780214d72787a0da64e5223412128d879e2abb;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=7111097bb7657046d70c4f1efcf03e4cf39092cf;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index 7111097b..50780214 100644 --- a/src/hardware/demo/demo.c +++ b/src/hardware/demo/demo.c @@ -21,16 +21,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include -#include #include #include -#ifdef _WIN32 -#include -#include -#define pipe(fds) _pipe(fds, 4096, _O_BINARY) -#endif -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "demo" @@ -43,7 +38,7 @@ /* Size of the analog pattern space per channel. */ #define ANALOG_BUFSIZE 4096 -#define DEFAULT_ANALOG_AMPLITUDE 25 +#define DEFAULT_ANALOG_AMPLITUDE 10 #define ANALOG_SAMPLES_PER_PERIOD 20 /* Logic patterns we can generate. */ @@ -103,22 +98,19 @@ struct analog_gen { float amplitude; float pattern_data[ANALOG_BUFSIZE]; unsigned int num_samples; - struct sr_datafeed_analog packet; + struct sr_datafeed_analog_old packet; float avg_val; /* Average value */ unsigned num_avgs; /* Number of samples averaged */ }; /* Private, per-device-instance driver context. */ struct dev_context { - int pipe_fds[2]; - GIOChannel *channel; uint64_t cur_samplerate; - gboolean continuous; uint64_t limit_samples; uint64_t limit_msec; - uint64_t logic_counter; - uint64_t analog_counter; - int64_t starttime; + uint64_t sent_samples; + int64_t start_us; + int64_t spent_us; uint64_t step; /* Logic */ int32_t num_logic_channels; @@ -157,7 +149,11 @@ static const uint32_t devopts_cg_logic[] = { SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -static const uint32_t devopts_cg_analog[] = { +static const uint32_t devopts_cg_analog_group[] = { + SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET, +}; + +static const uint32_t devopts_cg_analog_channel[] = { SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET, }; @@ -225,7 +221,7 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate) for (i = 0; i < num_samples; i++) { t = (double) i / (double) sample_rate; ag->pattern_data[i] = ag->amplitude * - sin(2 * M_PI * frequency * t); + sin(2 * G_PI * frequency * t); } ag->num_samples = num_samples; @@ -238,8 +234,8 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate) for (i = 0; i < num_samples; i++) { t = (double) i / (double) sample_rate; - ag->pattern_data[i] = (2 * ag->amplitude / M_PI) * - asin(sin(2 * M_PI * frequency * t)); + ag->pattern_data[i] = (2 * ag->amplitude / G_PI) * + asin(sin(2 * G_PI * frequency * t)); } ag->num_samples = num_samples; @@ -274,7 +270,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) int num_logic_channels, num_analog_channels, pattern, i; char channel_name[16]; - drvc = di->priv; + drvc = di->context; num_logic_channels = DEFAULT_NUM_LOGIC_CHANNELS; num_analog_channels = DEFAULT_NUM_ANALOG_CHANNELS; @@ -297,18 +293,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->model = g_strdup("Demo device"); sdi->driver = di; - devc = g_malloc(sizeof(struct dev_context)); + devc = g_malloc0(sizeof(struct dev_context)); devc->cur_samplerate = SR_KHZ(200); - devc->limit_samples = 0; - devc->limit_msec = 0; - devc->step = 0; - devc->continuous = FALSE; devc->num_logic_channels = num_logic_channels; devc->logic_unitsize = (devc->num_logic_channels + 7) / 8; devc->logic_pattern = PATTERN_SIGROK; devc->num_analog_channels = num_analog_channels; - devc->avg = FALSE; - devc->avg_samples = 0; /* Logic channels, all in one channel group. */ cg = g_malloc0(sizeof(struct sr_channel_group)); @@ -366,7 +356,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_open(struct sr_dev_inst *sdi) @@ -601,7 +591,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_ERR_NA; } } else { - /* Any channel in the group will do. */ ch = cg->channels->data; switch (key) { case SR_CONF_DEVICE_OPTIONS: @@ -609,14 +598,24 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts_cg_logic, ARRAY_SIZE(devopts_cg_logic), sizeof(uint32_t)); - else if (ch->type == SR_CHANNEL_ANALOG) - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog), - sizeof(uint32_t)); + else if (ch->type == SR_CHANNEL_ANALOG) { + if (strcmp(cg->name, "Analog") == 0) + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_cg_analog_group, ARRAY_SIZE(devopts_cg_analog_group), + sizeof(uint32_t)); + else + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_cg_analog_channel, ARRAY_SIZE(devopts_cg_analog_channel), + sizeof(uint32_t)); + } else return SR_ERR_BUG; break; case SR_CONF_PATTERN_MODE: + /* The analog group (with all 4 channels) shall not have a pattern property. */ + if (strcmp(cg->name, "Analog") == 0) + return SR_ERR_NA; + if (ch->type == SR_CHANNEL_LOGIC) *data = g_variant_new_strv(logic_pattern_str, ARRAY_SIZE(logic_pattern_str)); @@ -678,6 +677,7 @@ static void logic_generator(struct sr_dev_inst *sdi, uint64_t size) static void send_analog_packet(struct analog_gen *ag, struct sr_dev_inst *sdi, uint64_t *analog_sent, + uint64_t analog_pos, uint64_t analog_todo) { struct sr_datafeed_packet packet; @@ -687,11 +687,11 @@ static void send_analog_packet(struct analog_gen *ag, unsigned int i; devc = sdi->priv; - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &ag->packet; if (!devc->avg) { - ag_pattern_pos = devc->analog_counter % ag->num_samples; + ag_pattern_pos = analog_pos % 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; @@ -700,7 +700,7 @@ static void send_analog_packet(struct analog_gen *ag, /* Whichever channel group gets there first. */ *analog_sent = MAX(*analog_sent, sending_now); } else { - ag_pattern_pos = devc->analog_counter % ag->num_samples; + ag_pattern_pos = analog_pos % ag->num_samples; to_avg = MIN(analog_todo, ag->num_samples-ag_pattern_pos); for (i = 0; i < to_avg; i++) { @@ -744,35 +744,54 @@ static int prepare_data(int fd, int revents, void *cb_data) struct analog_gen *ag; GHashTableIter iter; void *value; - uint64_t logic_todo, analog_todo, expected_samplenum, analog_sent, sending_now; - int64_t time, elapsed; + uint64_t samples_todo, logic_done, analog_done, analog_sent, sending_now; + int64_t elapsed_us, limit_us, todo_us; (void)fd; (void)revents; sdi = cb_data; devc = sdi->priv; - logic_todo = analog_todo = 0; - /* How many samples should we have sent by now? */ - time = g_get_monotonic_time(); - elapsed = time - devc->starttime; - expected_samplenum = elapsed * devc->cur_samplerate / (1000 * 1000); + /* Just in case. */ + if (devc->cur_samplerate <= 0 || devc->logic_unitsize <= 0 + || (devc->num_logic_channels <= 0 + && devc->num_analog_channels <= 0)) { + dev_acquisition_stop(sdi, sdi); + return G_SOURCE_CONTINUE; + } - /* But never more than the limit, if there is one. */ - if (!devc->continuous) - expected_samplenum = MIN(expected_samplenum, devc->limit_samples); + /* What time span should we send samples for? */ + elapsed_us = g_get_monotonic_time() - devc->start_us; + limit_us = 1000 * devc->limit_msec; + if (limit_us > 0 && limit_us < elapsed_us) + todo_us = MAX(0, limit_us - devc->spent_us); + else + todo_us = MAX(0, elapsed_us - devc->spent_us); + + /* How many samples are outstanding since the last round? */ + samples_todo = (todo_us * devc->cur_samplerate + G_USEC_PER_SEC - 1) + / G_USEC_PER_SEC; + if (devc->limit_samples > 0) { + if (devc->limit_samples < devc->sent_samples) + samples_todo = 0; + else if (devc->limit_samples - devc->sent_samples < samples_todo) + samples_todo = devc->limit_samples - devc->sent_samples; + } + /* Calculate the actual time covered by this run back from the sample + * count, rounded towards zero. This avoids getting stuck on a too-low + * time delta with no samples being sent due to round-off. + */ + todo_us = samples_todo * G_USEC_PER_SEC / devc->cur_samplerate; - /* Of those, how many do we still have to send? */ - if (devc->num_logic_channels) - logic_todo = expected_samplenum - devc->logic_counter; - if (devc->num_analog_channels) - analog_todo = expected_samplenum - devc->analog_counter; + logic_done = devc->num_logic_channels > 0 ? 0 : samples_todo; + analog_done = devc->num_analog_channels > 0 ? 0 : samples_todo; - while (logic_todo || analog_todo) { + while (logic_done < samples_todo || analog_done < samples_todo) { /* Logic */ - if (logic_todo > 0) { - sending_now = MIN(logic_todo, LOGIC_BUFSIZE / devc->logic_unitsize); + if (logic_done < samples_todo) { + sending_now = MIN(samples_todo - logic_done, + LOGIC_BUFSIZE / devc->logic_unitsize); logic_generator(sdi, sending_now * devc->logic_unitsize); packet.type = SR_DF_LOGIC; packet.payload = &logic; @@ -780,46 +799,52 @@ 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; + logic_done += sending_now; } /* Analog, one channel at a time */ - if (analog_todo > 0) { + if (analog_done < samples_todo) { analog_sent = 0; g_hash_table_iter_init(&iter, devc->ch_ag); while (g_hash_table_iter_next(&iter, NULL, &value)) { - send_analog_packet(value, sdi, - &analog_sent, analog_todo); + send_analog_packet(value, sdi, &analog_sent, + devc->sent_samples + analog_done, + samples_todo - analog_done); } - analog_todo -= analog_sent; - devc->analog_counter += analog_sent; + analog_done += analog_sent; } } + /* At this point, both logic_done and analog_done should be + * exactly equal to samples_todo, or else. + */ + if (logic_done != samples_todo || analog_done != samples_todo) { + sr_err("BUG: Sample count mismatch."); + return G_SOURCE_REMOVE; + } + devc->sent_samples += samples_todo; + devc->spent_us += todo_us; + + if ((devc->limit_samples > 0 && devc->sent_samples >= devc->limit_samples) + || (limit_us > 0 && devc->spent_us >= limit_us)) { - if (!devc->continuous - && (!devc->num_logic_channels || devc->logic_counter >= devc->limit_samples) - && (!devc->num_analog_channels || devc->analog_counter >= devc->limit_samples)) { /* If we're averaging everything - now is the time to send data */ if (devc->avg_samples == 0) { g_hash_table_iter_init(&iter, devc->ch_ag); while (g_hash_table_iter_next(&iter, NULL, &value)) { ag = value; - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &ag->packet; ag->packet.data = &ag->avg_val; ag->packet.num_samples = 1; sr_session_send(sdi, &packet); } } - sr_dbg("Requested number of samples reached."); - dev_acquisition_stop(sdi, cb_data); - return TRUE; + dev_acquisition_stop(sdi, sdi); } - return TRUE; + return G_SOURCE_CONTINUE; } static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) @@ -834,64 +859,31 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR_DEV_CLOSED; devc = sdi->priv; - devc->continuous = !devc->limit_samples; - devc->logic_counter = devc->analog_counter = 0; - - /* - * Setting two channels connected by a pipe is a remnant from when the - * demo driver generated data in a thread, and collected and sent the - * data in the main program loop. - * They are kept here because it provides a convenient way of setting - * up a timeout-based polling mechanism. - */ - if (pipe(devc->pipe_fds)) { - sr_err("%s: pipe() failed", __func__); - return SR_ERR; - } + devc->sent_samples = 0; g_hash_table_iter_init(&iter, devc->ch_ag); while (g_hash_table_iter_next(&iter, NULL, &value)) generate_analog_pattern(value, devc->cur_samplerate); - devc->channel = g_io_channel_unix_new(devc->pipe_fds[0]); - g_io_channel_set_flags(devc->channel, G_IO_FLAG_NONBLOCK, NULL); - - /* Set channel encoding to binary (default is UTF-8). */ - g_io_channel_set_encoding(devc->channel, NULL, NULL); - - /* Make channels unbuffered. */ - g_io_channel_set_buffered(devc->channel, FALSE); - - sr_session_source_add_channel(sdi->session, devc->channel, - G_IO_IN | G_IO_ERR, 40, prepare_data, (void *)sdi); + sr_session_source_add(sdi->session, -1, 0, 100, + prepare_data, (struct sr_dev_inst *)sdi); - /* Send header packet to the session bus. */ std_session_send_df_header(sdi, LOG_PREFIX); /* We use this timestamp to decide how many more samples to send. */ - devc->starttime = g_get_monotonic_time(); + devc->start_us = g_get_monotonic_time(); + devc->spent_us = 0; return SR_OK; } static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct dev_context *devc; - struct sr_datafeed_packet packet; - (void)cb_data; - devc = sdi->priv; sr_dbg("Stopping acquisition."); - - sr_session_source_remove_channel(sdi->session, devc->channel); - g_io_channel_shutdown(devc->channel, FALSE, NULL); - g_io_channel_unref(devc->channel); - devc->channel = NULL; - - /* Send last packet. */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + sr_session_source_remove(sdi->session, -1); + std_session_send_df_end(sdi, LOG_PREFIX); return SR_OK; } @@ -912,5 +904,5 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };