core: update usbi_dbg to take the context as an argument

[platform/upstream/libusb.git] / libusb / os / netbsd_usb.c

diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
index 485208d..d63a048 100644 (file)
--- a/libusb/os/netbsd_usb.c
+++ b/libusb/os/netbsd_usb.c
@@ -56,14 +56,14 @@ static int netbsd_get_active_config_descriptor(struct libusb_device *,
 static int netbsd_get_config_descriptor(struct libusb_device *, uint8_t,
     void *, size_t);
 
-static int netbsd_get_configuration(struct libusb_device_handle *, int *);
+static int netbsd_get_configuration(struct libusb_device_handle *, uint8_t *);
 static int netbsd_set_configuration(struct libusb_device_handle *, int);
 
-static int netbsd_claim_interface(struct libusb_device_handle *, int);
-static int netbsd_release_interface(struct libusb_device_handle *, int);
+static int netbsd_claim_interface(struct libusb_device_handle *, uint8_t);
+static int netbsd_release_interface(struct libusb_device_handle *, uint8_t);
 
-static int netbsd_set_interface_altsetting(struct libusb_device_handle *, int,
-    int);
+static int netbsd_set_interface_altsetting(struct libusb_device_handle *,
+    uint8_t, uint8_t);
 static int netbsd_clear_halt(struct libusb_device_handle *, unsigned char);
 static void netbsd_destroy_device(struct libusb_device *);
 
@@ -122,7 +122,7 @@ netbsd_get_device_list(struct libusb_context * ctx,
        char devnode[16];
        int fd, err, i;
 
-       usbi_dbg(" ");
+       usbi_dbg(ctx, " ");
 
        /* Only ugen(4) is supported */
        for (i = 0; i < USB_MAX_DEVICES; i++) {
@@ -205,7 +205,7 @@ netbsd_open(struct libusb_device_handle *handle)
        for (i = 0; i < USB_MAX_ENDPOINTS; i++)
                hpriv->endpoints[i] = -1;
 
-       usbi_dbg("open %s: fd %d", dpriv->devnode, dpriv->fd);
+       usbi_dbg(HANDLE_CTX(handle), "open %s: fd %d", dpriv->devnode, dpriv->fd);
 
        return (LIBUSB_SUCCESS);
 }
@@ -215,7 +215,7 @@ netbsd_close(struct libusb_device_handle *handle)
 {
        struct device_priv *dpriv = usbi_get_device_priv(handle->dev);
 
-       usbi_dbg("close: fd %d", dpriv->fd);
+       usbi_dbg(HANDLE_CTX(handle), "close: fd %d", dpriv->fd);
 
        close(dpriv->fd);
        dpriv->fd = -1;
@@ -227,13 +227,13 @@ netbsd_get_active_config_descriptor(struct libusb_device *dev,
 {
        struct device_priv *dpriv = usbi_get_device_priv(dev);
 
-       len = MIN(len, UGETW(dpriv->cdesc->wTotalLength));
+       len = MIN(len, (size_t)UGETW(dpriv->cdesc->wTotalLength));
 
-       usbi_dbg("len %d", len);
+       usbi_dbg(DEVICE_CTX(dev), "len %zu", len);
 
        memcpy(buf, dpriv->cdesc, len);
 
-       return len;
+       return (int)len;
 }
 
 int
@@ -244,7 +244,7 @@ netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
        struct usb_full_desc ufd;
        int fd, err;
 
-       usbi_dbg("index %d, len %d", idx, len);
+       usbi_dbg(DEVICE_CTX(dev), "index %u, len %zu", idx, len);
 
        /* A config descriptor may be requested before opening the device */
        if (dpriv->fd >= 0) {
@@ -269,20 +269,22 @@ netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
        if (dpriv->fd < 0)
                close(fd);
 
-       return len;
+       return (int)len;
 }
 
 int
-netbsd_get_configuration(struct libusb_device_handle *handle, int *config)
+netbsd_get_configuration(struct libusb_device_handle *handle, uint8_t *config)
 {
        struct device_priv *dpriv = usbi_get_device_priv(handle->dev);
+       int tmp;
 
-       usbi_dbg(" ");
+       usbi_dbg(HANDLE_CTX(handle), " ");
 
-       if (ioctl(dpriv->fd, USB_GET_CONFIG, config) < 0)
+       if (ioctl(dpriv->fd, USB_GET_CONFIG, &tmp) < 0)
                return _errno_to_libusb(errno);
 
-       usbi_dbg("configuration %d", *config);
+       usbi_dbg(HANDLE_CTX(handle), "configuration %d", tmp);
+       *config = (uint8_t)tmp;
 
        return (LIBUSB_SUCCESS);
 }
@@ -292,7 +294,7 @@ netbsd_set_configuration(struct libusb_device_handle *handle, int config)
 {
        struct device_priv *dpriv = usbi_get_device_priv(handle->dev);
 
-       usbi_dbg("configuration %d", config);
+       usbi_dbg(HANDLE_CTX(handle), "configuration %d", config);
 
        if (ioctl(dpriv->fd, USB_SET_CONFIG, &config) < 0)
                return _errno_to_libusb(errno);
@@ -301,11 +303,13 @@ netbsd_set_configuration(struct libusb_device_handle *handle, int config)
 }
 
 int
-netbsd_claim_interface(struct libusb_device_handle *handle, int iface)
+netbsd_claim_interface(struct libusb_device_handle *handle, uint8_t iface)
 {
        struct handle_priv *hpriv = usbi_get_device_handle_priv(handle);
        int i;
 
+       UNUSED(iface);
+
        for (i = 0; i < USB_MAX_ENDPOINTS; i++)
                hpriv->endpoints[i] = -1;
 
@@ -313,11 +317,13 @@ netbsd_claim_interface(struct libusb_device_handle *handle, int iface)
 }
 
 int
-netbsd_release_interface(struct libusb_device_handle *handle, int iface)
+netbsd_release_interface(struct libusb_device_handle *handle, uint8_t iface)
 {
        struct handle_priv *hpriv = usbi_get_device_handle_priv(handle);
        int i;
 
+       UNUSED(iface);
+
        for (i = 0; i < USB_MAX_ENDPOINTS; i++)
                if (hpriv->endpoints[i] >= 0)
                        close(hpriv->endpoints[i]);
@@ -326,13 +332,13 @@ netbsd_release_interface(struct libusb_device_handle *handle, int iface)
 }
 
 int
-netbsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface,
-    int altsetting)
+netbsd_set_interface_altsetting(struct libusb_device_handle *handle, uint8_t iface,
+    uint8_t altsetting)
 {
        struct device_priv *dpriv = usbi_get_device_priv(handle->dev);
        struct usb_alt_interface intf;
 
-       usbi_dbg("iface %d, setting %d", iface, altsetting);
+       usbi_dbg(HANDLE_CTX(handle), "iface %u, setting %u", iface, altsetting);
 
        memset(&intf, 0, sizeof(intf));
 
@@ -351,7 +357,7 @@ netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
        struct device_priv *dpriv = usbi_get_device_priv(handle->dev);
        struct usb_ctl_request req;
 
-       usbi_dbg(" ");
+       usbi_dbg(HANDLE_CTX(handle), " ");
 
        req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT;
        req.ucr_request.bRequest = UR_CLEAR_FEATURE;
@@ -370,7 +376,7 @@ netbsd_destroy_device(struct libusb_device *dev)
 {
        struct device_priv *dpriv = usbi_get_device_priv(dev);
 
-       usbi_dbg(" ");
+       usbi_dbg(DEVICE_CTX(dev), " ");
 
        free(dpriv->cdesc);
 }
@@ -379,13 +385,11 @@ int
 netbsd_submit_transfer(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer;
-       struct handle_priv *hpriv;
        int err = 0;
 
-       usbi_dbg(" ");
+       usbi_dbg(ITRANSFER_CTX(itransfer), " ");
 
        transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
-       hpriv = usbi_get_device_handle_priv(transfer->dev_handle);
 
        switch (transfer->type) {
        case LIBUSB_TRANSFER_TYPE_CONTROL:
@@ -424,7 +428,9 @@ netbsd_submit_transfer(struct usbi_transfer *itransfer)
 int
 netbsd_cancel_transfer(struct usbi_transfer *itransfer)
 {
-       usbi_dbg(" ");
+       UNUSED(itransfer);
+
+       usbi_dbg(ITRANSFER_CTX(itransfer), " ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }
@@ -452,7 +458,7 @@ _errno_to_libusb(int err)
                return (LIBUSB_ERROR_TIMEOUT);
        }
 
-       usbi_dbg("error: %s", strerror(err));
+       usbi_dbg(NULL, "error: %s", strerror(err));
 
        return (LIBUSB_ERROR_OTHER);
 }
@@ -466,14 +472,14 @@ _cache_active_config_descriptor(struct libusb_device *dev, int fd)
        void *buf;
        int len;
 
-       usbi_dbg("fd %d", fd);
+       usbi_dbg(DEVICE_CTX(dev), "fd %d", fd);
 
        ucd.ucd_config_index = USB_CURRENT_CONFIG_INDEX;
 
        if ((ioctl(fd, USB_GET_CONFIG_DESC, &ucd)) < 0)
                return _errno_to_libusb(errno);
 
-       usbi_dbg("active bLength %d", ucd.ucd_desc.bLength);
+       usbi_dbg(DEVICE_CTX(dev), "active bLength %d", ucd.ucd_desc.bLength);
 
        len = UGETW(ucd.ucd_desc.wTotalLength);
        buf = malloc((size_t)len);
@@ -484,7 +490,7 @@ _cache_active_config_descriptor(struct libusb_device *dev, int fd)
        ufd.ufd_size = len;
        ufd.ufd_data = buf;
 
-       usbi_dbg("index %d, len %d", ufd.ufd_config_index, len);
+       usbi_dbg(DEVICE_CTX(dev), "index %d, len %d", ufd.ufd_config_index, len);
 
        if ((ioctl(fd, USB_GET_FULL_DESC, &ufd)) < 0) {
                free(buf);
@@ -510,7 +516,7 @@ _sync_control_transfer(struct usbi_transfer *itransfer)
        dpriv = usbi_get_device_priv(transfer->dev_handle->dev);
        setup = (struct libusb_control_setup *)transfer->buffer;
 
-       usbi_dbg("type %d request %d value %d index %d length %d timeout %d",
+       usbi_dbg(ITRANSFER_CTX(itransfer), "type %d request %d value %d index %d length %d timeout %d",
            setup->bmRequestType, setup->bRequest,
            libusb_le16_to_cpu(setup->wValue),
            libusb_le16_to_cpu(setup->wIndex),
@@ -535,7 +541,7 @@ _sync_control_transfer(struct usbi_transfer *itransfer)
 
        itransfer->transferred = req.ucr_actlen;
 
-       usbi_dbg("transferred %d", itransfer->transferred);
+       usbi_dbg(ITRANSFER_CTX(itransfer), "transferred %d", itransfer->transferred);
 
        return (0);
 }
@@ -555,7 +561,7 @@ _access_endpoint(struct libusb_transfer *transfer)
        endpt = UE_GET_ADDR(transfer->endpoint);
        mode = IS_XFERIN(transfer) ? O_RDONLY : O_WRONLY;
 
-       usbi_dbg("endpoint %d mode %d", endpt, mode);
+       usbi_dbg(ITRANFER_CTX(itransfer), "endpoint %d mode %d", endpt, mode);
 
        if (hpriv->endpoints[endpt] < 0) {
                /* Pick the right node given the control one */