X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=a50ea3f2cae298562abee4c0abc76f01ba5f4006;hb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;hp=c85a40892b69a297317d67c6267bfe0552c3f4d9;hpb=c50805d59ce85e00ef263c0a1edad2487bb8a9fe;p=libsigrok.git diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c index c85a4089..a50ea3f2 100644 --- a/src/hardware/zeroplus-logic-cube/api.c +++ b/src/hardware/zeroplus-logic-cube/api.c @@ -157,7 +157,7 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate) static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { - return std_init(sr_ctx, di, LOG_PREFIX); + return std_init(di, sr_ctx); } static GSList *scan(struct sr_dev_driver *di, GSList *options) @@ -256,58 +256,23 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; struct dev_context *devc; struct drv_context *drvc; struct sr_usb_dev_inst *usb; - libusb_device **devlist, *dev; - int device_count, ret, i; - char connection_id[64]; + int ret; drvc = di->context; usb = sdi->conn; + devc = sdi->priv; - if (!(devc = sdi->priv)) { - sr_err("%s: sdi->priv was NULL", __func__); - return SR_ERR_ARG; - } + ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb); + if (ret != SR_OK) + return ret; - device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, - &devlist); - if (device_count < 0) { - sr_err("Failed to retrieve device list."); - return SR_ERR; - } - - dev = NULL; - for (i = 0; i < device_count; i++) { - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); - if (!strcmp(sdi->connection_id, connection_id)) { - dev = devlist[i]; - break; - } - } - if (!dev) { - sr_err("Device on %d.%d (logical) / %s (physical) disappeared!", - usb->bus, usb->address, sdi->connection_id); - return SR_ERR; - } - - if (!(ret = libusb_open(dev, &(usb->devhdl)))) { - 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); - } else { - sr_err("Failed to open device: %s.", libusb_error_name(ret)); - return SR_ERR; - } + sdi->status = SR_ST_ACTIVE; ret = libusb_set_configuration(usb->devhdl, USB_CONFIGURATION); if (ret < 0) { @@ -377,11 +342,6 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(const struct sr_dev_driver *di) -{ - return std_dev_clear(di, NULL); -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -710,9 +670,9 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = { .longname = "ZEROPLUS Logic Cube LAP-C series", .api_version = 1, .init = init, - .cleanup = cleanup, + .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set,