X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=e75b5b09e97bc5a1d7090b9b6b9e484a87aba125;hp=69852b28ad49dd76b19aaca3e1d32241586f44c7;hb=HEAD;hpb=566007e15e8ec0a23b064ba8ea44baae305508b5 diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c index 69852b28..6425e0f5 100644 --- a/src/hardware/lecroy-logicstudio/api.c +++ b/src/hardware/lecroy-logicstudio/api.c @@ -35,8 +35,13 @@ #define UNKNOWN_ADDRESS 0xff #define MAX_RENUM_DELAY_MS 3000 -static const uint32_t devopts[] = { +#define NUM_CHANNELS 16 + +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t devopts[] = { SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET, SR_CONF_TRIGGER_MATCH | SR_CONF_LIST, @@ -71,9 +76,8 @@ static const uint64_t samplerates[] = { SR_MHZ(500), }; -static struct sr_dev_inst *create_device(struct sr_dev_driver *di, - struct sr_usb_dev_inst *usb, enum sr_dev_inst_status status, - int64_t fw_updated) +static struct sr_dev_inst *create_device(struct sr_usb_dev_inst *usb, + enum sr_dev_inst_status status, int64_t fw_updated) { struct sr_dev_inst *sdi; struct dev_context *devc; @@ -84,11 +88,10 @@ static struct sr_dev_inst *create_device(struct sr_dev_driver *di, sdi->status = status; sdi->vendor = g_strdup("LeCroy"); sdi->model = g_strdup("LogicStudio16"); - sdi->driver = di; sdi->inst_type = SR_INST_USB; sdi->conn = usb; - for (i = 0; i < 16; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { snprintf(channel_name, sizeof(channel_name), "D%i", i); sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name); } @@ -131,7 +134,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (des.idVendor != LOGICSTUDIO16_VID) continue; - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); + if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) + continue; usb = NULL; @@ -140,7 +144,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); - sdi = create_device(di, usb, SR_ST_INACTIVE, 0); + sdi = create_device(usb, SR_ST_INACTIVE, 0); break; case LOGICSTUDIO16_PID_LACK_FIRMWARE: r = ezusb_upload_firmware(drvc->sr_ctx, devlist[i], @@ -161,7 +165,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), UNKNOWN_ADDRESS, NULL); - sdi = create_device(di, usb, SR_ST_INITIALIZING, + sdi = create_device(usb, SR_ST_INITIALIZING, g_get_monotonic_time()); break; default: @@ -174,13 +178,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->connection_id = g_strdup(connection_id); - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); } libusb_free_device_list(devlist, 1); - return devices; + return std_scan_complete(di, devices); } static int open_device(struct sr_dev_inst *sdi) @@ -194,9 +197,6 @@ static int open_device(struct sr_dev_inst *sdi) size_t i; int r; - if (sdi->status == SR_ST_ACTIVE) - return SR_ERR; - drvc = sdi->driver->context; usb = sdi->conn; @@ -211,7 +211,8 @@ static int open_device(struct sr_dev_inst *sdi) des.idProduct != LOGICSTUDIO16_PID_HAVE_FIRMWARE) continue; - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); + if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) + continue; /* * Check if this device is the same one that we associated @@ -343,15 +344,13 @@ static int dev_close(struct sr_dev_inst *sdi) } if (!usb->devhdl) - return SR_ERR; + return SR_ERR_BUG; libusb_release_interface(usb->devhdl, 0); libusb_close(usb->devhdl); usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; - return SR_OK; } @@ -393,16 +392,11 @@ static int config_set(uint32_t key, GVariant *data, devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - switch (key) { case SR_CONF_SAMPLERATE: return lls_set_samplerate(sdi, g_variant_get_uint64(data)); case SR_CONF_CAPTURE_RATIO: devc->capture_ratio = g_variant_get_uint64(data); - if (devc->capture_ratio > 100) - return SR_ERR; break; default: return SR_ERR_NA; @@ -414,30 +408,14 @@ static int config_set(uint32_t key, GVariant *data, static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - GVariantBuilder vb; - GVariant *var; - - (void)sdi; - (void)cg; - switch (key) { 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, NO_OPTS, drvopts, devopts); case SR_CONF_SAMPLERATE: - g_variant_builder_init(&vb, G_VARIANT_TYPE("a{sv}")); - var = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), - samplerates, ARRAY_SIZE(samplerates), - sizeof(uint64_t)); - g_variant_builder_add(&vb, "{sv}", "samplerates", var); - *data = g_variant_builder_end(&vb); + *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates)); break; case SR_CONF_TRIGGER_MATCH: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - trigger_matches, ARRAY_SIZE(trigger_matches), - sizeof(int32_t)); + *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); break; default: return SR_ERR_NA; @@ -475,15 +453,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct drv_context *drvc; int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - drvc = sdi->driver->context; if ((ret = lls_start_acquisition(sdi)) < 0) return ret; - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); return usb_source_add(sdi->session, drvc->sr_ctx, 100, receive_usb_data, drvc); @@ -491,9 +466,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - return lls_stop_acquisition(sdi); } @@ -505,6 +477,7 @@ static struct sr_dev_driver lecroy_logicstudio_driver_info = { .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list,