X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fapi.c;h=84daf93e3e792d20089b0efe35f75868858a6b6e;hb=510b3e692a61239bfa1c6794218acd80e5ba28ef;hp=210480cc727fc95a2dc5ea31f9c97bec3373bc57;hpb=6b8d6f93bb8df26ea04624009e2715cb6766b4f5;p=libsigrok.git diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c index 210480cc..84daf93e 100644 --- a/hardware/lascar-el-usb/api.c +++ b/hardware/lascar-el-usb/api.c @@ -28,16 +28,15 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; static struct sr_dev_driver *di = &lascar_el_usb_driver_info; static int hw_dev_close(struct sr_dev_inst *sdi); -static const int hwopts[] = { - SR_HWOPT_CONN, - 0, +static const int32_t hwopts[] = { + SR_CONF_CONN, }; -static const int hwcaps[] = { - SR_HWCAP_THERMOMETER, - SR_HWCAP_HYGROMETER, - SR_HWCAP_LIMIT_SAMPLES, - 0 +static const int32_t hwcaps[] = { + SR_CONF_THERMOMETER, + SR_CONF_HYGROMETER, + SR_CONF_DATALOG, + SR_CONF_LIMIT_SAMPLES, }; /* Properly close and free all devices. */ @@ -70,17 +69,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) @@ -89,26 +78,23 @@ static GSList *hw_scan(GSList *options) struct dev_context *devc; struct sr_dev_inst *sdi; struct sr_usb_dev_inst *usb; - struct sr_hwopt *opt; + struct sr_config *src; GSList *usb_devices, *devices, *l; const char *conn; (void)options; - if (!(drvc = di->priv)) { - sr_err("Driver was not initialized."); - return NULL; - } + drvc = di->priv; /* USB scan is always authoritative. */ clear_instances(); conn = NULL; for (l = options; l; l = l->next) { - opt = l->data; - switch (opt->hwopt) { - case SR_HWOPT_CONN: - conn = opt->value; + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); break; } } @@ -140,14 +126,7 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - if (!(drvc = di->priv)) { - sr_err("Driver was not initialized."); - return NULL; - } - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -191,7 +170,6 @@ static int hw_dev_close(struct sr_dev_inst *sdi) libusb_release_interface(devc->usb->devhdl, LASCAR_INTERFACE); libusb_close(devc->usb->devhdl); devc->usb->devhdl = NULL; - g_free(devc->config); sdi->status = SR_ST_INACTIVE; @@ -213,29 +191,31 @@ 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, GVariant **data, const struct sr_dev_inst *sdi) { + struct dev_context *devc; + int ret; - (void)sdi; - - switch (info_id) { - case SR_DI_HWOPTS: - *data = hwopts; + devc = sdi->priv; + switch (id) { + case SR_CONF_DATALOG: + if (!sdi) + return SR_ERR_ARG; + if ((ret = lascar_is_logging(sdi)) == -1) + return SR_ERR; + *data = g_variant_new_boolean(ret ? TRUE : FALSE); break; - case SR_DI_HWCAPS: - *data = hwcaps; + case SR_CONF_LIMIT_SAMPLES: + *data = g_variant_new_uint64(devc->limit_samples); break; default: - sr_err("Unknown info_id: %d.", info_id); return SR_ERR_ARG; } 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, GVariant *data, const struct sr_dev_inst *sdi) { struct dev_context *devc; int ret; @@ -251,20 +231,50 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, devc = sdi->priv; ret = SR_OK; - switch (hwcap) { - case SR_HWCAP_LIMIT_SAMPLES: - devc->limit_samples = *(const uint64_t *)value; + switch (id) { + case SR_CONF_DATALOG: + if (g_variant_get_boolean(data)) { + /* Start logging. */ + ret = lascar_start_logging(sdi); + } else { + /* Stop logging. */ + ret = lascar_stop_logging(sdi); + } + break; + case SR_CONF_LIMIT_SAMPLES: + devc->limit_samples = g_variant_get_uint64(data); sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; default: - sr_err("Unknown hardware capability: %d.", hwcap); + sr_err("Unknown hardware capability: %d.", id); ret = SR_ERR_ARG; } return ret; } +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); + break; + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static void mark_xfer(struct libusb_transfer *xfer) { @@ -297,10 +307,10 @@ static float binary32_le_to_float(unsigned char *buf) static int lascar_proc_config(const struct sr_dev_inst *sdi) { struct dev_context *devc; - int ret; + int dummy, ret; devc = sdi->priv; - if (!(devc->config = lascar_get_config(devc->usb->devhdl))) + if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK) return SR_ERR; ret = SR_OK; @@ -336,13 +346,14 @@ 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 sr_datafeed_meta_analog meta; + struct sr_datafeed_meta meta; + struct sr_config *src; struct dev_context *devc; - struct drv_context *drvc = di->priv; + struct drv_context *drvc; struct libusb_transfer *xfer_in, *xfer_out; const struct libusb_pollfd **pfd; struct timeval tv; + uint64_t interval; int ret, i; unsigned char cmd[3], resp[4], *buf; @@ -351,6 +362,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_ERR; } + drvc = di->priv; devc = sdi->priv; devc->cb_data = cb_data; @@ -360,11 +372,15 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_dbg("Starting log retrieval."); /* Send header packet to the session bus. */ - sr_dbg("Sending SR_DF_HEADER."); - packet.type = SR_DF_HEADER; - packet.payload = (uint8_t *)&header; - header.feed_version = 1; + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + + interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000; + packet.type = SR_DF_META; + packet.payload = &meta; + src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval)); + meta.config = g_slist_append(NULL, src); sr_session_send(devc->cb_data, &packet); + g_free(src); if (devc->logged_samples == 0) { /* This ensures the frontend knows the session is done. */ @@ -431,12 +447,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->log_size = xfer_in->buffer[1] + (xfer_in->buffer[2] << 8); libusb_free_transfer(xfer_out); - /* Send metadata about the SR_DF_ANALOG packets to come. */ - packet.type = SR_DF_META_ANALOG; - packet.payload = &meta; - meta.num_probes = 1; - sr_session_send(devc->cb_data, &packet); - pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; pfd[i]; i++) { /* Handle USB events every 100ms, for decent latency. */ @@ -489,10 +499,11 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_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,