Put driver pointers into special section

[libsigrok.git] / src / hardware / victor-dmm / api.c

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 8f20f599fca7ead98f9cffe0ce06b11d45ba930c..6a70b14537a1659cd895e3a64c3bc3c08c1186c5 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -31,8 +31,6 @@
 #define VICTOR_VENDOR "Victor"
 #define VICTOR_INTERFACE 0
 #define VICTOR_ENDPOINT (LIBUSB_ENDPOINT_IN | 1)
-
-SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static const uint32_t drvopts[] = {
@@ -50,11 +48,6 @@ static const uint32_t devopts[] = {
        SR_CONF_CONN | SR_CONF_GET,
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
@@ -86,6 +79,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");
@@ -106,28 +100,13 @@ 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];
+       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. */
@@ -170,6 +149,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];
 
@@ -183,6 +163,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;
        }
@@ -194,7 +177,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       gint64 now;
 
        (void)cg;
 
@@ -203,20 +185,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        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,
@@ -260,10 +229,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:
@@ -293,7 +260,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;
@@ -303,11 +269,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);
@@ -372,11 +335,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
+static struct sr_dev_driver victor_dmm_driver_info = {
        .name = "victor-dmm",
        .longname = "Victor DMMs",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -390,3 +353,4 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(victor_dmm_driver_info);