X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=c1faaefb0e41c6efd8d4aa4cdc05338e417ade47;hb=3ebce226a2672ea4f0788f5f2a222586148aabc1;hp=6c211cd7cb8152c07dc280b999cc73d790ac9851;hpb=fbec8bd2f3ead02358df65240c2cf786c8267f54;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 6c211cd7..c1faaefb 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -49,6 +49,12 @@ /* TODO: Should be configurable. */ #define BUFSIZE 4096 +#define STR_PATTERN_SIGROK "sigrok" +#define STR_PATTERN_RANDOM "random" +#define STR_PATTERN_INC "incremental" +#define STR_PATTERN_ALL_LOW "all-low" +#define STR_PATTERN_ALL_HIGH "all-high" + /* Supported patterns which we can generate */ enum { /** @@ -79,7 +85,7 @@ struct dev_context { GIOChannel *channels[2]; uint8_t sample_generator; uint64_t samples_counter; - void *session_dev_id; + void *cb_data; int64_t starttime; }; @@ -94,10 +100,10 @@ static const int hwcaps[] = { }; static const struct sr_samplerates samplerates = { - SR_HZ(1), - SR_GHZ(1), - SR_HZ(1), - NULL, + .low = SR_HZ(1), + .high = SR_GHZ(1), + .step = SR_HZ(1), + .list = NULL, }; static const char *pattern_strings[] = { @@ -148,16 +154,7 @@ static int clear_instances(void) static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - drvc->sr_ctx = sr_ctx; - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) @@ -171,6 +168,7 @@ static GSList *hw_scan(GSList *options) (void)options; drvc = di->priv; + devices = NULL; sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); @@ -195,11 +193,7 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -231,14 +225,33 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) (void)sdi; switch (id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_CUR_SAMPLERATE: + case SR_CONF_SAMPLERATE: *data = &cur_samplerate; break; - case SR_DI_PATTERNS: - *data = &pattern_strings; + case SR_CONF_LIMIT_SAMPLES: + *data = &limit_samples; + break; + case SR_CONF_LIMIT_MSEC: + *data = &limit_msec; + break; + case SR_CONF_PATTERN_MODE: + switch (default_pattern) { + case PATTERN_SIGROK: + *data = STR_PATTERN_SIGROK; + break; + case PATTERN_RANDOM: + *data = STR_PATTERN_RANDOM; + break; + case PATTERN_INC: + *data = STR_PATTERN_INC; + break; + case PATTERN_ALL_LOW: + *data = STR_PATTERN_ALL_LOW; + break; + case PATTERN_ALL_HIGH: + *data = STR_PATTERN_ALL_HIGH; + break; + } break; default: return SR_ERR_ARG; @@ -274,15 +287,15 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) } else if (id == SR_CONF_PATTERN_MODE) { stropt = value; ret = SR_OK; - if (!strcmp(stropt, "sigrok")) { + if (!strcmp(stropt, STR_PATTERN_SIGROK)) { default_pattern = PATTERN_SIGROK; - } else if (!strcmp(stropt, "random")) { + } else if (!strcmp(stropt, STR_PATTERN_RANDOM)) { default_pattern = PATTERN_RANDOM; - } else if (!strcmp(stropt, "incremental")) { + } else if (!strcmp(stropt, STR_PATTERN_INC)) { default_pattern = PATTERN_INC; - } else if (!strcmp(stropt, "all-low")) { + } else if (!strcmp(stropt, STR_PATTERN_ALL_LOW)) { default_pattern = PATTERN_ALL_LOW; - } else if (!strcmp(stropt, "all-high")) { + } else if (!strcmp(stropt, STR_PATTERN_ALL_HIGH)) { default_pattern = PATTERN_ALL_HIGH; } else { ret = SR_ERR; @@ -301,9 +314,15 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi (void)sdi; switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; case SR_CONF_SAMPLERATE: *data = &samplerates; break; + case SR_CONF_PATTERN_MODE: + *data = &pattern_strings; + break; default: return SR_ERR_ARG; } @@ -383,7 +402,7 @@ static int receive_data(int fd, int revents, void *cb_data) logic.length = sending_now; logic.unitsize = 1; logic.data = buf; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); devc->samples_counter += sending_now; } @@ -399,14 +418,10 @@ static int receive_data(int fd, int revents, void *cb_data) static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet *packet; - struct sr_datafeed_header *header; struct dev_context *devc; (void)sdi; - sr_dbg("Starting acquisition."); - /* TODO: 'devc' is never g_free()'d? */ if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { sr_err("%s: devc malloc failed", __func__); @@ -414,7 +429,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, } devc->sample_generator = default_pattern; - devc->session_dev_id = cb_data; + devc->cb_data = cb_data; devc->samples_counter = 0; /* @@ -446,28 +461,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_session_source_add_channel(devc->channels[0], G_IO_IN | G_IO_ERR, 40, receive_data, devc); - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("%s: packet malloc failed", __func__); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("%s: header malloc failed", __func__); - return SR_ERR_MALLOC; - } - - packet->type = SR_DF_HEADER; - packet->payload = header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(devc->session_dev_id, packet); + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* We use this timestamp to decide how many more samples to send. */ devc->starttime = g_get_monotonic_time(); - g_free(header); - g_free(packet); - return SR_OK; } @@ -487,7 +486,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) /* Send last packet. */ packet.type = SR_DF_END; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); return SR_OK; }