X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=4e76dccf4fdfd4e504fcd0f39e7545242af3b27b;hp=9cf7018eb810e93f7a72a76a499da046675c04d2;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018 diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c index 9cf7018e..4e76dccf 100644 --- a/src/hardware/lecroy-logicstudio/api.c +++ b/src/hardware/lecroy-logicstudio/api.c @@ -35,8 +35,11 @@ #define UNKNOWN_ADDRESS 0xff #define MAX_RENUM_DELAY_MS 3000 -static const uint32_t devopts[] = { +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,16 +74,8 @@ static const uint64_t samplerates[] = { SR_MHZ(500), }; -SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info; - -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - -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; @@ -91,7 +86,6 @@ 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; @@ -127,7 +121,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) (void)options; drvc = di->context; - drvc->instances = NULL; devices = NULL; @@ -148,7 +141,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], @@ -169,7 +162,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: @@ -182,13 +175,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) @@ -202,9 +194,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; @@ -263,19 +252,12 @@ static int open_device(struct sr_dev_inst *sdi) static int dev_open(struct sr_dev_inst *sdi) { - struct drv_context *drvc; struct dev_context *devc; int64_t timediff_us, timediff_ms; int ret; - drvc = sdi->driver->context; devc = sdi->priv; - if (!drvc) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - /* * If we didn't need to upload FX2 firmware in scan(), open the device * right away. Otherwise, wait up to MAX_RENUM_DELAY_MS ms for the @@ -358,15 +340,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; } @@ -408,9 +388,6 @@ 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)); @@ -432,15 +409,9 @@ static int config_list(uint32_t key, GVariant **data, 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, NULL, 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"), @@ -490,15 +461,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); @@ -506,20 +474,18 @@ 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); } -SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = { +static struct sr_dev_driver lecroy_logicstudio_driver_info = { .name = "lecroy-logicstudio", .longname = "LeCroy LogicStudio", .api_version = 1, - .init = init, + .init = std_init, .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, @@ -530,3 +496,4 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(lecroy_logicstudio_driver_info);