scpi-pps: Support for the EEZ PSU series

[libsigrok.git] / src / usb.c

diff --git a/src/usb.c b/src/usb.c
index 96df219fd734fa168d6347bfeeddad0d2e331f03..6bd9e8182960cc330164350ccc4f37facd8a7aea 100644 (file)
--- a/src/usb.c
+++ b/src/usb.c
@@ -38,7 +38,6 @@ typedef int libusb_os_handle;
 #endif
 
 /** Custom GLib event source for libusb I/O.
- * @internal
  */
 struct usb_source {
        GSource base;
@@ -139,7 +138,7 @@ static gboolean usb_source_dispatch(GSource *source,
                sr_err("Callback not set, cannot dispatch event.");
                return G_SOURCE_REMOVE;
        }
-       keep = (*(sr_receive_data_callback)callback)(-1, revents, user_data);
+       keep = (*SR_RECEIVE_DATA_CALLBACK(callback))(-1, revents, user_data);
 
        if (G_LIKELY(keep) && G_LIKELY(!g_source_is_destroyed(source))) {
                if (usource->timeout_us >= 0)
@@ -184,7 +183,7 @@ static LIBUSB_CALL void usb_pollfd_added(libusb_os_handle fd,
                return;
 
        pollfd = g_slice_new(GPollFD);
-#ifdef G_OS_WIN32
+#ifdef _WIN32
        events = G_IO_IN;
 #endif
        pollfd->fd = (gintptr)fd;
@@ -384,8 +383,7 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
                sr_dbg("Found USB device (VID:PID = %04x:%04x, bus.address = "
                       "%d.%d).", des.idVendor, des.idProduct, b, a);
 
-               usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
-                               libusb_get_device_address(devlist[i]), NULL);
+               usb = sr_usb_dev_inst_new(b, a, NULL);
                devices = g_slist_append(devices, usb);
        }
        libusb_free_device_list(devlist, 1);
@@ -457,7 +455,7 @@ SR_PRIV int usb_source_add(struct sr_session *session, struct sr_context *ctx,
        if (!source)
                return SR_ERR;
 
-       g_source_set_callback(source, (GSourceFunc)cb, cb_data, NULL);
+       g_source_set_callback(source, G_SOURCE_FUNC(cb), cb_data, NULL);
 
        ret = sr_session_source_add_internal(session, ctx->libusb_ctx, source);
        g_source_unref(source);
@@ -510,7 +508,7 @@ SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len)
 }
 
 /**
- * Check the USB configuration to determine if this device has a given 
+ * Check the USB configuration to determine if this device has a given
  * manufacturer and product string.
  *
  * @return TRUE if the device's configuration profile strings