X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fvictor-dmm%2Fapi.c;h=aa33e1f1420168d882232b9591fc8a87169c407d;hb=115f82939661da6ad2d26d5ceca709bbc0ad25b5;hp=75c893d1779150fb34aa1e868b0bec7e78b79bf9;hpb=063e7aef6d41d4c44591ff93672079998bf9622f;p=libsigrok.git diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c index 75c893d1..aa33e1f1 100644 --- a/hardware/victor-dmm/api.c +++ b/hardware/victor-dmm/api.c @@ -36,12 +36,15 @@ static struct sr_dev_driver *di = &victor_dmm_driver_info; static int hw_dev_close(struct sr_dev_inst *sdi); static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static const int hwcaps[] = { +static const int32_t hwopts[] = { + SR_CONF_CONN, +}; + +static const int32_t hwcaps[] = { SR_CONF_MULTIMETER, SR_CONF_LIMIT_MSEC, SR_CONF_LIMIT_SAMPLES, SR_CONF_CONTINUOUS, - 0 }; /* Properly close and free all devices. */ @@ -62,7 +65,7 @@ static int clear_instances(void) if (!(devc = sdi->priv)) continue; hw_dev_close(sdi); - sr_usb_dev_inst_free(devc->usb); + sr_usb_dev_inst_free(sdi->conn); sr_dev_inst_free(sdi); } @@ -92,9 +95,6 @@ static GSList *hw_scan(GSList *options) drvc = di->priv; - /* USB scan is always authoritative. */ - clear_instances(); - devices = NULL; libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { @@ -121,9 +121,10 @@ static GSList *hw_scan(GSList *options) return NULL; sdi->probes = g_slist_append(NULL, probe); - if (!(devc->usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), + if (!(sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL))) return NULL; + sdi->inst_type = SR_INST_USB; drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); @@ -135,20 +136,13 @@ 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) { - struct dev_context *devc; struct drv_context *drvc = di->priv; + struct sr_usb_dev_inst *usb; libusb_device **devlist; int ret, i; @@ -157,13 +151,14 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_ERR; } - devc = sdi->priv; + usb = sdi->conn; + libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { - if (libusb_get_bus_number(devlist[i]) != devc->usb->bus - || libusb_get_device_address(devlist[i]) != devc->usb->address) + if (libusb_get_bus_number(devlist[i]) != usb->bus + || libusb_get_device_address(devlist[i]) != usb->address) continue; - if ((ret = libusb_open(devlist[i], &devc->usb->devhdl))) { + if ((ret = libusb_open(devlist[i], &usb->devhdl))) { sr_err("Failed to open device: %s.", libusb_error_name(ret)); return SR_ERR; } @@ -177,15 +172,15 @@ static int hw_dev_open(struct sr_dev_inst *sdi) /* The device reports as HID class, so the kernel would have * claimed it. */ - if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) { - if ((ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0)) < 0) { + if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) { + if ((ret = libusb_detach_kernel_driver(usb->devhdl, 0)) < 0) { sr_err("Failed to detach kernel driver: %s.", libusb_error_name(ret)); return SR_ERR; } } - if ((ret = libusb_claim_interface(devc->usb->devhdl, + if ((ret = libusb_claim_interface(usb->devhdl, VICTOR_INTERFACE))) { sr_err("Failed to claim interface: %s.", libusb_error_name(ret)); return SR_ERR; @@ -197,21 +192,22 @@ static int hw_dev_open(struct sr_dev_inst *sdi) static int hw_dev_close(struct sr_dev_inst *sdi) { - struct dev_context *devc; + struct sr_usb_dev_inst *usb; if (!di->priv) { sr_err("Driver was not initialized."); return SR_ERR; } - devc = sdi->priv; - if (!devc->usb->devhdl) + usb = sdi->conn; + + if (!usb->devhdl) /* Nothing to do. */ return SR_OK; - libusb_release_interface(devc->usb->devhdl, VICTOR_INTERFACE); - libusb_close(devc->usb->devhdl); - devc->usb->devhdl = NULL; + libusb_release_interface(usb->devhdl, VICTOR_INTERFACE); + libusb_close(usb->devhdl); + usb->devhdl = NULL; sdi->status = SR_ST_INACTIVE; return SR_OK; @@ -232,56 +228,78 @@ static int hw_cleanup(void) return SR_OK; } -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) +{ + struct sr_usb_dev_inst *usb; + char str[128]; + + switch (id) { + case SR_CONF_CONN: + if (!sdi || !sdi->conn) + return SR_ERR_ARG; + usb = sdi->conn; + snprintf(str, 128, "%d.%d", usb->bus, usb->address); + *data = g_variant_new_string(str); + break; + default: + return SR_ERR_NA; + } + + return SR_OK; +} + +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { struct dev_context *devc; gint64 now; int ret; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + if (!di->priv) { sr_err("Driver was not initialized."); return SR_ERR; } - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't set config options."); - return SR_ERR; - } - devc = sdi->priv; ret = SR_OK; switch (id) { case SR_CONF_LIMIT_MSEC: - devc->limit_msec = *(const int64_t *)value; + devc->limit_msec = g_variant_get_uint64(data); now = g_get_monotonic_time() / 1000; devc->end_time = now + devc->limit_msec; sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec); break; case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = *(const uint64_t *)value; + 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.", id); - ret = SR_ERR_ARG; + ret = SR_ERR_NA; } return ret; } -static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +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 = hwcaps; + *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_ERR_NA; } return SR_OK; @@ -370,31 +388,28 @@ static int handle_events(int fd, int revents, void *cb_data) 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 dev_context *devc; struct drv_context *drvc = di->priv; const struct libusb_pollfd **pfd; + struct sr_usb_dev_inst *usb; struct libusb_transfer *transfer; int ret, i; unsigned char *buf; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + if (!di->priv) { sr_err("Driver was not initialized."); return SR_ERR; } - sr_dbg("Starting acquisition."); - devc = sdi->priv; + usb = sdi->conn; devc->cb_data = cb_data; /* 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; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; pfd[i]; i++) { @@ -412,7 +427,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, * The device only sends 1 transfer/second no matter how many * times you ask, but we want to keep step with the USB events * handling above. */ - libusb_fill_interrupt_transfer(transfer, devc->usb->devhdl, + libusb_fill_interrupt_transfer(transfer, usb->devhdl, VICTOR_ENDPOINT, buf, DMM_DATA_SIZE, receive_transfer, cb_data, 100); if ((ret = libusb_submit_transfer(transfer) != 0)) { @@ -453,6 +468,7 @@ SR_PRIV struct sr_dev_driver victor_dmm_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,