uni-t-dmm: Use sr_dev_inst to store connection handle.

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 08a9e74725f4b4824987264231068443f04cf142..37e06dc7d0eef1c99ae70db73bd389c2b7a50e9c 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -125,7 +125,8 @@ static GSList *hw_scan(GSList *options, int dmm)
                        return NULL;
                sdi->probes = g_slist_append(sdi->probes, probe);
 
-               devc->usb = usb;
+               sdi->inst_type = SR_INST_USB;
+               sdi->conn = usb;
 
                drvc->instances = g_slist_append(drvc->instances, sdi);
                devices = g_slist_append(devices, sdi);
@@ -142,13 +143,13 @@ static GSList *hw_dev_list(int dmm)
 static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
 {
        struct drv_context *drvc;
-       struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int ret;
 
        drvc = udmms[dmm].di->priv;
-       devc = sdi->priv;
+       usb = sdi->conn;
 
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb)) == SR_OK)
+       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
                sdi->status = SR_ST_ACTIVE;
 
        return ret;

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index 4e2c6b2d82b4163242349b31302ecd92a7599d30..a18c2e6c7c94fdaa8f54898f675fe7086fb5bb95 100644 (file)
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -102,14 +102,17 @@ static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf,
        devc->num_samples++;
 }
 
-static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
+static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
 {
        int ret;
        uint8_t buf[5];
+       struct sr_usb_dev_inst *usb;
 
+       usb = sdi->conn;
+       
        /* Detach kernel drivers which grabbed this device (if any). */
-       if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
-               ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0);
+       if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
+               ret = libusb_detach_kernel_driver(usb->devhdl, 0);
                if (ret < 0) {
                        sr_err("Failed to detach kernel driver: %s.",
                               libusb_error_name(ret));
@@ -121,7 +124,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
        }
 
        /* Claim interface 0. */
-       if ((ret = libusb_claim_interface(devc->usb->devhdl, 0)) < 0) {
+       if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
                sr_err("Failed to claim interface 0: %s.",
                       libusb_error_name(ret));
                return SR_ERR;
@@ -140,7 +143,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
        sr_spew("HID init = 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x (%d baud)",
                buf[0], buf[1], buf[2], buf[3], buf[4], baudrate);
        ret = libusb_control_transfer(
-               devc->usb->devhdl, /* libusb device handle */
+               usb->devhdl, /* libusb device handle */
                LIBUSB_REQUEST_TYPE_CLASS |
                LIBUSB_RECIPIENT_INTERFACE |
                LIBUSB_ENDPOINT_OUT,
@@ -187,13 +190,15 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
        struct dev_context *devc;
        uint8_t buf[CHUNK_SIZE], *pbuf;
        int i, ret, len, num_databytes_in_chunk;
+       struct sr_usb_dev_inst *usb;
 
        devc = sdi->priv;
+       usb = sdi->conn;
        pbuf = devc->protocol_buf;
 
        /* On the first run, we need to init the HID chip. */
        if (devc->first_run) {
-               if ((ret = hid_chip_init(devc, udmms[dmm].baudrate)) != SR_OK) {
+               if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) {
                        sr_err("HID chip init failed: %d.", ret);
                        return SR_ERR;
                }
@@ -205,7 +210,7 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
 
        /* Get data from EP2 using an interrupt transfer. */
        ret = libusb_interrupt_transfer(
-               devc->usb->devhdl, /* libusb device handle */
+               usb->devhdl, /* libusb device handle */
                LIBUSB_ENDPOINT_IN | 2, /* EP2, IN */
                (unsigned char *)&buf, /* receive buffer */
                CHUNK_SIZE, /* wLength */

diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index 4c75300017c270e7eb48ef8dd00220ea6ffa2f02..3376861aca982c76528b61b0a1cff023b4822dc0 100644 (file)
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -78,8 +78,6 @@ struct dev_context {
        /** The current number of already received samples. */
        uint64_t num_samples;
 
-       struct sr_usb_dev_inst *usb;
-
        gboolean first_run;
 
        uint8_t protocol_buf[DMM_BUFSIZE];