X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=35571549eaafc4c9121fee945b7bd8d0af05d3d5;hb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;hp=023388f4f345705eb1db72d9d71cd0c6ae04fdee;hpb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;p=libsigrok.git diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c index 023388f4..35571549 100644 --- a/src/hardware/victor-dmm/api.c +++ b/src/hardware/victor-dmm/api.c @@ -52,7 +52,7 @@ static const uint32_t devopts[] = { 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) @@ -86,6 +86,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->driver = di; sdi->connection_id = g_strdup(connection_id); devc = g_malloc0(sizeof(struct dev_context)); + sr_sw_limits_init(&devc->limits); sdi->priv = devc; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); @@ -101,43 +102,18 @@ 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 drv_context *drvc = di->context; struct sr_usb_dev_inst *usb; - libusb_device **devlist; - int ret, i; - char connection_id[64]; - - if (!di->context) { - sr_err("Driver was not initialized."); - return SR_ERR; - } + int ret; usb = sdi->conn; - libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); - for (i = 0; devlist[i]; i++) { - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); - if (strcmp(sdi->connection_id, connection_id)) - continue; - if ((ret = libusb_open(devlist[i], &usb->devhdl))) { - sr_err("Failed to open device: %s.", libusb_error_name(ret)); - return SR_ERR; - } - break; - } - libusb_free_device_list(devlist, 1); - if (!devlist[i]) { - sr_err("Device not found."); - return SR_ERR; - } + ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb); + if (ret != SR_OK) + return ret; /* The device reports as HID class, so the kernel would have * claimed it. */ @@ -161,14 +137,8 @@ static int dev_open(struct sr_dev_inst *sdi) static int dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_driver *di = sdi->driver; struct sr_usb_dev_inst *usb; - if (!di->context) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; if (!usb->devhdl) @@ -186,6 +156,7 @@ static int dev_close(struct sr_dev_inst *sdi) 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 = sdi->priv; struct sr_usb_dev_inst *usb; char str[128]; @@ -199,6 +170,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s snprintf(str, 128, "%d.%d", usb->bus, usb->address); *data = g_variant_new_string(str); break; + case SR_CONF_LIMIT_SAMPLES: + case SR_CONF_LIMIT_MSEC: + return sr_sw_limits_config_get(&devc->limits, key, data); default: return SR_ERR_NA; } @@ -209,36 +183,16 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - struct sr_dev_driver *di = sdi->driver; struct dev_context *devc; - gint64 now; (void)cg; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - if (!di->context) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - devc = sdi->priv; - switch (key) { - case SR_CONF_LIMIT_MSEC: - devc->limit_msec = g_variant_get_uint64(data); - now = g_get_monotonic_time() / 1000; - devc->end_time = now + devc->limit_msec; - break; - case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return sr_sw_limits_config_set(&devc->limits, key, data); } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, @@ -282,10 +236,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) sr_dbg("Got %d-byte packet.", transfer->actual_length); if (transfer->actual_length == DMM_DATA_SIZE) { victor_dmm_receive_data(sdi, transfer->buffer); - if (devc->limit_samples) { - if (devc->num_samples >= devc->limit_samples) - dev_acquisition_stop(sdi); - } + if (sr_sw_limits_check(&devc->limits)) + dev_acquisition_stop(sdi); } } /* Anything else is either an error or a timeout, which is fine: @@ -315,7 +267,6 @@ static int handle_events(int fd, int revents, void *cb_data) struct sr_dev_inst *sdi; struct sr_dev_driver *di; struct timeval tv; - gint64 now; (void)fd; (void)revents; @@ -325,11 +276,8 @@ static int handle_events(int fd, int revents, void *cb_data) di = sdi->driver; drvc = di->context; - if (devc->limit_msec) { - now = g_get_monotonic_time() / 1000; - if (now > devc->end_time) - dev_acquisition_stop(sdi); - } + if (sr_sw_limits_check(&devc->limits)) + dev_acquisition_stop(sdi); if (sdi->status == SR_ST_STOPPING) { usb_source_remove(sdi->session, drvc->sr_ctx); @@ -356,11 +304,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - if (!di->context) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; std_session_send_df_header(sdi, LOG_PREFIX); @@ -389,13 +332,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - struct sr_dev_driver *di = sdi->driver; - - if (!di->context) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - if (sdi->status != SR_ST_ACTIVE) { sr_err("Device not active, can't stop acquisition."); return SR_ERR; @@ -413,7 +349,7 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = { .init = init, .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,