drivers: use new sr_config struct

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

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index a389b0794799932f62ee0aeb803ff286b603faa0..e7fdb7850093f895904daabe347b197eac21a148 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -44,10 +44,6 @@ static const int hwcaps[] = {
        0
 };
 
-static const char *probe_names[] = {
-       "P1",
-};
-
 /* Properly close and free all devices. */
 static int clear_instances(void)
 {
@@ -194,8 +190,9 @@ 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 (libusb_detach_kernel_driver(devc->usb->devhdl, 0) < 0) {
-                       sr_err("Failed to detach kernel driver.");
+               if ((ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0)) < 0) {
+                       sr_err("Failed to detach kernel driver: %s.",
+                              libusb_error_name(ret));
                        return SR_ERR;
                }
        }
@@ -256,14 +253,7 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(1);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 
@@ -339,15 +329,15 @@ static void receive_transfer(struct libusb_transfer *transfer)
                if ((ret = libusb_submit_transfer(transfer) != 0)) {
                        sr_err("Unable to resubmit transfer: %s.",
                               libusb_error_name(ret));
-                       libusb_free_transfer(transfer);
                        g_free(transfer->buffer);
+                       libusb_free_transfer(transfer);
                        hw_dev_acquisition_stop(sdi, sdi);
                }
        } else {
                /* This was the last transfer we're going to receive, so
                 * clean up now. */
-               libusb_free_transfer(transfer);
                g_free(transfer->buffer);
+               libusb_free_transfer(transfer);
        }
 }
 
@@ -395,7 +385,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
-       struct sr_datafeed_meta_analog meta;
        struct dev_context *devc;
        struct drv_context *drvc = di->priv;
        const struct libusb_pollfd **pfd;
@@ -420,12 +409,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        header.feed_version = 1;
        sr_session_send(devc->cb_data, &packet);
 
-       /* Send metadata about the SR_DF_ANALOG packets to come. */
-       packet.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = 1;
-       sr_session_send(devc->cb_data, &packet);
-
        pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
        for (i = 0; pfd[i]; i++) {
                /* Handle USB events every 100ms, for decent latency. */