X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=8a4bc9a0593c7b15ae5cfdfb44e3c2306716104b;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=c1a5a4138d6ac04e637addc64c18638d48d85b5d;hpb=1987b8d63e748f0813dc6a4630e99686e4fe1728;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index c1a5a413..8a4bc9a0 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -84,20 +84,20 @@ struct dev_context { }; static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_DEMO_DEV, - SR_HWCAP_SAMPLERATE, - SR_HWCAP_PATTERN_MODE, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_LIMIT_MSEC, - SR_HWCAP_CONTINUOUS, + SR_CONF_LOGIC_ANALYZER, + SR_CONF_DEMO_DEV, + SR_CONF_SAMPLERATE, + SR_CONF_PATTERN_MODE, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_LIMIT_MSEC, + SR_CONF_CONTINUOUS, }; 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 +148,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 +162,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 +187,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) @@ -226,24 +214,14 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { (void)sdi; - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_SAMPLERATES: - *data = &samplerates; - break; - case SR_DI_CUR_SAMPLERATE: + switch (id) { + case SR_CONF_SAMPLERATE: *data = &cur_samplerate; break; - case SR_DI_PATTERNS: - *data = &pattern_strings; - break; default: return SR_ERR_ARG; } @@ -251,32 +229,31 @@ static int hw_info_get(int info_id, const void **data, return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { int ret; const char *stropt; (void)sdi; - if (hwcap == SR_HWCAP_SAMPLERATE) { + if (id == SR_CONF_SAMPLERATE) { cur_samplerate = *(const uint64_t *)value; sr_dbg("%s: setting samplerate to %" PRIu64, __func__, cur_samplerate); ret = SR_OK; - } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { + } else if (id == SR_CONF_LIMIT_SAMPLES) { limit_msec = 0; limit_samples = *(const uint64_t *)value; sr_dbg("%s: setting limit_samples to %" PRIu64, __func__, limit_samples); ret = SR_OK; - } else if (hwcap == SR_HWCAP_LIMIT_MSEC) { + } else if (id == SR_CONF_LIMIT_MSEC) { limit_msec = *(const uint64_t *)value; limit_samples = 0; sr_dbg("%s: setting limit_msec to %" PRIu64, __func__, limit_msec); ret = SR_OK; - } else if (hwcap == SR_HWCAP_PATTERN_MODE) { + } else if (id == SR_CONF_PATTERN_MODE) { stropt = value; ret = SR_OK; if (!strcmp(stropt, "sigrok")) { @@ -300,6 +277,28 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return ret; } +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; + } + + return SR_OK; +} + static void samples_generator(uint8_t *buf, uint64_t size, struct dev_context *devc) { @@ -388,14 +387,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__); @@ -435,28 +430,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; } @@ -490,10 +469,11 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,