hantek-dso: use default libusb context

[libsigrok.git] / hardware / genericdmm / api.c

diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c
index 4683eebd21d11043fbbccfd5d3a37ce2120f8529..e83bce16ea967b18da4ca37c0f9bced91fba107c 100644 (file)
--- a/hardware/genericdmm/api.c
+++ b/hardware/genericdmm/api.c
@@ -28,14 +28,15 @@
 
 
 extern SR_PRIV struct dmmchip dmmchip_fs9922;
+extern SR_PRIV struct dmmchip dmmchip_victor70c;
 
 static struct sr_hwopt victor_70c_vidpid[] = {
        { SR_HWOPT_CONN, "1244.d237" },
        { 0, NULL }
 };
 static struct dev_profile dev_profiles[] = {
-       { "victor-70c", "Victor", "70C", &dmmchip_fs9922,
-               DMM_TRANSPORT_USBHID, victor_70c_vidpid
+       { "victor-70c", "Victor", "70C", &dmmchip_victor70c,
+               DMM_TRANSPORT_USBHID, 1000, victor_70c_vidpid
        },
        { "mastech-va18b", "Mastech", "VA18B", NULL, DMM_TRANSPORT_SERIAL, 0, NULL},
        { NULL, NULL, NULL, NULL, 0, 0, NULL }
@@ -297,7 +298,6 @@ static int clear_instances(void)
                if (devc->profile) {
                        switch (devc->profile->transport) {
                        case DMM_TRANSPORT_USBHID:
-                               /* TODO */
                                sr_usb_dev_inst_free(devc->usb);
                                break;
                        case DMM_TRANSPORT_SERIAL:
@@ -464,7 +464,6 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                ret = open_usb(sdi);
                break;
        case DMM_TRANSPORT_SERIAL:
-               /* TODO: O_NONBLOCK? */
                sr_dbg("genericdmm: Opening serial port '%s'.", devc->serial->port);
                devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
                if (devc->serial->fd == -1) {