Windows: UsbDk: Use a better macro for getting context

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c
index aaac437..25f2623 100644 (file)
--- a/libusb/os/windows_usbdk.c
+++ b/libusb/os/windows_usbdk.c
@@ -429,10 +429,8 @@ static void usbdk_close(struct libusb_device_handle *dev_handle)
 {
        struct usbdk_device_priv *priv = _usbdk_device_priv(dev_handle->dev);
 
-       if (!usbdk_helper.StopRedirect(priv->redirector_handle)) {
-               struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
-               usbi_err(ctx, "Redirector shutdown failed");
-       }
+       if (!usbdk_helper.StopRedirect(priv->redirector_handle))
+               usbi_err(HANDLE_CTX(dev_handle), "Redirector shutdown failed");
 }
 
 static int usbdk_get_configuration(struct libusb_device_handle *dev_handle, int *config)
@@ -458,7 +456,7 @@ static int usbdk_claim_interface(struct libusb_device_handle *dev_handle, int if
 
 static int usbdk_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting)
 {
-       struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+       struct libusb_context *ctx = HANDLE_CTX(dev_handle);
        struct usbdk_device_priv *priv = _usbdk_device_priv(dev_handle->dev);
 
        if (!usbdk_helper.SetAltsetting(priv->redirector_handle, iface, altsetting)) {
@@ -478,7 +476,7 @@ static int usbdk_release_interface(struct libusb_device_handle *dev_handle, int
 
 static int usbdk_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint)
 {
-       struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+       struct libusb_context *ctx = HANDLE_CTX(dev_handle);
        struct usbdk_device_priv *priv = _usbdk_device_priv(dev_handle->dev);
 
        if (!usbdk_helper.ResetPipe(priv->redirector_handle, endpoint)) {
@@ -491,7 +489,7 @@ static int usbdk_clear_halt(struct libusb_device_handle *dev_handle, unsigned ch
 
 static int usbdk_reset_device(struct libusb_device_handle *dev_handle)
 {
-       struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+       struct libusb_context *ctx = HANDLE_CTX(dev_handle);
        struct usbdk_device_priv *priv = _usbdk_device_priv(dev_handle->dev);
 
        if (!usbdk_helper.ResetDevice(priv->redirector_handle)) {
@@ -549,7 +547,7 @@ static int usbdk_do_control_transfer(struct usbi_transfer *itransfer)
        struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct usbdk_device_priv *priv = _usbdk_device_priv(transfer->dev_handle->dev);
        struct usbdk_transfer_priv *transfer_priv = _usbdk_transfer_priv(itransfer);
-       struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+       struct libusb_context *ctx = TRANSFER_CTX(transfer);
        struct winfd wfd;
        ULONG Length;
        TransferResult transResult;
@@ -598,7 +596,7 @@ static int usbdk_do_bulk_transfer(struct usbi_transfer *itransfer)
        struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct usbdk_device_priv *priv = _usbdk_device_priv(transfer->dev_handle->dev);
        struct usbdk_transfer_priv *transfer_priv = _usbdk_transfer_priv(itransfer);
-       struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+       struct libusb_context *ctx = TRANSFER_CTX(transfer);
        struct winfd wfd;
        TransferResult transferRes;
        HANDLE sysHandle;
@@ -656,7 +654,7 @@ static int usbdk_do_iso_transfer(struct usbi_transfer *itransfer)
        struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct usbdk_device_priv *priv = _usbdk_device_priv(transfer->dev_handle->dev);
        struct usbdk_transfer_priv *transfer_priv = _usbdk_transfer_priv(itransfer);
-       struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+       struct libusb_context *ctx = TRANSFER_CTX(transfer);
        struct winfd wfd;
        TransferResult transferRes;
        int i;
@@ -746,7 +744,7 @@ static int usbdk_submit_transfer(struct usbi_transfer *itransfer)
 static int usbdk_abort_transfers(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
-       struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+       struct libusb_context *ctx = TRANSFER_CTX(transfer);
        struct usbdk_device_priv *priv = _usbdk_device_priv(transfer->dev_handle->dev);
 
        if (!usbdk_helper.AbortPipe(priv->redirector_handle, transfer->endpoint)) {

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index c02f694..4b1272c 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11266
+#define LIBUSB_NANO 11267