X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic16%2Fapi.c;h=e66d845b9f6d41189fa4dddbaed8bcd517cba7b9;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=bee0ea4ad95f30a755fcc00463b7d587f34c0b60;hpb=a5c38703eeea8661e563c30631601b8334dd2b7c;p=libsigrok.git diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c index bee0ea4a..e66d845b 100644 --- a/src/hardware/saleae-logic16/api.c +++ b/src/hardware/saleae-logic16/api.c @@ -39,14 +39,15 @@ #define MAX_RENUM_DELAY_MS 3000 #define NUM_SIMUL_TRANSFERS 32 -SR_PRIV struct sr_dev_driver saleae_logic16_driver_info; - static const uint32_t scanopts[] = { SR_CONF_CONN, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_CONN | SR_CONF_GET, @@ -56,7 +57,7 @@ static const uint32_t devopts[] = { SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET, }; -static const int32_t soft_trigger_matches[] = { +static const int32_t trigger_matches[] = { SR_TRIGGER_ZERO, SR_TRIGGER_ONE, SR_TRIGGER_RISING, @@ -71,11 +72,14 @@ static const char *channel_names[] = { static const struct { enum voltage_range range; - gdouble low; - gdouble high; -} volt_thresholds[] = { - { VOLTAGE_RANGE_18_33_V, 0.7, 1.4 }, - { VOLTAGE_RANGE_5_V, 1.4, 3.6 }, +} volt_thresholds_ranges[] = { + { VOLTAGE_RANGE_18_33_V, }, + { VOLTAGE_RANGE_5_V, }, +}; + +static const double volt_thresholds[][2] = { + { 0.7, 1.4 }, + { 1.4, 3.6 }, }; static const uint64_t samplerates[] = { @@ -88,18 +92,15 @@ static const uint64_t samplerates[] = { SR_MHZ(10), SR_KHZ(12500), SR_MHZ(16), + SR_MHZ(20), SR_MHZ(25), SR_MHZ(32), SR_MHZ(40), + SR_MHZ(50), SR_MHZ(80), SR_MHZ(100), }; -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static gboolean check_conf_profile(libusb_device *dev) { struct libusb_device_descriptor des; @@ -196,17 +197,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->status = SR_ST_INITIALIZING; sdi->vendor = g_strdup("Saleae"); sdi->model = g_strdup("Logic16"); - sdi->driver = di; sdi->connection_id = g_strdup(connection_id); for (j = 0; j < ARRAY_SIZE(channel_names); j++) sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE, - channel_names[j]); + channel_names[j]); devc = g_malloc0(sizeof(struct dev_context)); devc->selected_voltage_range = VOLTAGE_RANGE_18_33_V; sdi->priv = devc; - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); if (check_conf_profile(devlist[i])) { @@ -232,12 +231,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) libusb_free_device_list(devlist, 1); g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free); - return devices; -} - -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; + return std_scan_complete(di, devices); } static int logic16_dev_open(struct sr_dev_inst *sdi) @@ -247,17 +241,13 @@ static int logic16_dev_open(struct sr_dev_inst *sdi) struct sr_usb_dev_inst *usb; struct libusb_device_descriptor des; struct drv_context *drvc; - int ret, i, device_count; + int ret = SR_ERR, i, device_count; char connection_id[64]; di = sdi->driver; drvc = di->context; usb = sdi->conn; - if (sdi->status == SR_ST_ACTIVE) - /* Device is already in use. */ - return SR_ERR; - device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); if (device_count < 0) { sr_err("Failed to get device list: %s.", @@ -292,6 +282,7 @@ static int logic16_dev_open(struct sr_dev_inst *sdi) } else { sr_err("Failed to open device: %s.", libusb_error_name(ret)); + ret = SR_ERR; break; } @@ -299,13 +290,16 @@ static int logic16_dev_open(struct sr_dev_inst *sdi) if (ret == LIBUSB_ERROR_BUSY) { sr_err("Unable to claim USB interface. Another " "program or driver has already claimed it."); + ret = SR_ERR; break; } else if (ret == LIBUSB_ERROR_NO_DEVICE) { sr_err("Device has been disconnected."); + ret = SR_ERR; break; } else if (ret != 0) { sr_err("Unable to claim interface: %s.", libusb_error_name(ret)); + ret = SR_ERR; break; } @@ -314,15 +308,17 @@ static int logic16_dev_open(struct sr_dev_inst *sdi) break; } - sdi->status = SR_ST_ACTIVE; sr_info("Opened device on %d.%d (logical) / %s (physical), interface %d.", usb->bus, usb->address, sdi->connection_id, USB_INTERFACE); + ret = SR_OK; + break; } + libusb_free_device_list(devlist, 1); - if (sdi->status != SR_ST_ACTIVE) { + if (ret != SR_OK) { if (usb->devhdl) { libusb_release_interface(usb->devhdl, USB_INTERFACE); libusb_close(usb->devhdl); @@ -389,41 +385,24 @@ static int dev_close(struct sr_dev_inst *sdi) struct sr_usb_dev_inst *usb; usb = sdi->conn; + if (!usb->devhdl) - return SR_ERR; + return SR_ERR_BUG; sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.", usb->bus, usb->address, sdi->connection_id, USB_INTERFACE); libusb_release_interface(usb->devhdl, USB_INTERFACE); libusb_close(usb->devhdl); usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; return SR_OK; } -static int cleanup(const struct sr_dev_driver *di) -{ - int ret; - struct drv_context *drvc; - - if (!(drvc = di->context)) - /* Can get called on an unused driver, doesn't matter. */ - return SR_OK; - - ret = std_dev_clear(di, NULL); - g_free(drvc); - - return ret; -} - -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_usb_dev_inst *usb; - GVariant *range[2]; - char str[128]; int ret; unsigned int i; @@ -439,8 +418,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s /* Device still needs to re-enumerate after firmware * upload, so we don't know its (future) address. */ return SR_ERR; - snprintf(str, 128, "%d.%d", usb->bus, usb->address); - *data = g_variant_new_string(str); + *data = g_variant_new_printf("%d.%d", usb->bus, usb->address); break; case SR_CONF_SAMPLERATE: if (!sdi) @@ -461,11 +439,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s ret = SR_ERR; for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) { if (devc->selected_voltage_range != - volt_thresholds[i].range) + volt_thresholds_ranges[i].range) continue; - range[0] = g_variant_new_double(volt_thresholds[i].low); - range[1] = g_variant_new_double(volt_thresholds[i].high); - *data = g_variant_new_tuple(range, 2); + *data = std_gvar_tuple_double(volt_thresholds[i][0], volt_thresholds[i][1]); ret = SR_OK; break; } @@ -477,19 +453,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return ret; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; - gdouble low, high; - int ret; - unsigned int i; + int ret, idx; (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; ret = SR_OK; @@ -505,17 +476,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK; break; case SR_CONF_VOLTAGE_THRESHOLD: - g_variant_get(data, "(dd)", &low, &high); - ret = SR_ERR_ARG; - for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) { - if (fabs(volt_thresholds[i].low - low) < 0.1 && - fabs(volt_thresholds[i].high - high) < 0.1) { - devc->selected_voltage_range = - volt_thresholds[i].range; - ret = SR_OK; - break; - } - } + if ((idx = std_double_tuple_idx(data, ARRAY_AND_SIZE(volt_thresholds))) < 0) + return SR_ERR_ARG; + devc->selected_voltage_range = volt_thresholds_ranges[idx].range; break; default: ret = SR_ERR_NA; @@ -524,54 +487,27 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return ret; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - GVariant *gvar, *range[2]; - GVariantBuilder gvb; - int ret; - unsigned int i; - - (void)sdi; - (void)cg; - - ret = SR_OK; switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_SAMPLERATE: - g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); - gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), - samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t)); - g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); - *data = g_variant_builder_end(&gvb); + *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates)); break; case SR_CONF_VOLTAGE_THRESHOLD: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) { - range[0] = g_variant_new_double(volt_thresholds[i].low); - range[1] = g_variant_new_double(volt_thresholds[i].high); - gvar = g_variant_new_tuple(range, 2); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + *data = std_gvar_thresholds(ARRAY_AND_SIZE(volt_thresholds)); break; case SR_CONF_TRIGGER_MATCH: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches), - sizeof(int32_t)); + *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); break; default: return SR_ERR_NA; } - return ret; + return SR_OK; } static void abort_acquisition(struct dev_context *devc) @@ -688,7 +624,7 @@ static int receive_data(int fd, int revents, void *cb_data) return TRUE; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; struct dev_context *devc; @@ -701,9 +637,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) unsigned char *buf; size_t size, convsize; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - drvc = di->context; devc = sdi->priv; usb = sdi->conn; @@ -714,7 +647,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR; } - devc->cb_data = cb_data; devc->sent_samples = 0; devc->empty_transfer_count = 0; devc->cur_channel = 0; @@ -789,8 +721,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) usb_source_add(sdi->session, devc->ctx, timeout, receive_data, (void *)sdi); - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi); if ((ret = logic16_start_acquisition(sdi)) != SR_OK) { abort_acquisition(devc); @@ -800,15 +731,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { int ret; - (void)cb_data; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - ret = logic16_abort_acquisition(sdi); abort_acquisition(sdi->priv); @@ -816,15 +742,15 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) return ret; } -SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = { +static struct sr_dev_driver saleae_logic16_driver_info = { .name = "saleae-logic16", .longname = "Saleae Logic16", .api_version = 1, - .init = init, - .cleanup = cleanup, + .init = std_init, + .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, - .dev_clear = NULL, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list, @@ -834,3 +760,4 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(saleae_logic16_driver_info);