Changeset 47a9633 in mainline for uspace/drv/bus/usb/usbdiag/device.c

Timestamp:

2017-12-20T13:57:14Z (6 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

02a7575

Parents:

9fd8f14

Message:

usbdiag: mapping endpoints for diagnostic devices the right way

File:

• uspace/drv/bus/usb/usbdiag/device.c (modified) (2 diffs)

uspace/drv/bus/usb/usbdiag/device.c

@@ -43 +43 @@
 
 #define NAME "usbdiag"
-
-#define EP_DIR_OUT    0
-#define EP_DIR_IN     0x80
-#define EP_INT_IN     (EP_DIR_IN | 0x01)
-#define EP_INT_OUT    (EP_DIR_OUT | 0x02)
-#define EP_BULK_IN    (EP_DIR_IN | 0x03)
-#define EP_BULK_OUT   (EP_DIR_OUT | 0x04)
-#define EP_ISOC_IN    (EP_DIR_IN | 0x05)
-#define EP_ISOC_OUT   (EP_DIR_OUT | 0x06)
 
 
@@ -114 +105 @@
         dev->fun = fun;
 
-        usb_endpoint_mapping_t *epm_out = usb_device_get_mapped_ep(dev->usb_dev, EP_BULK_OUT);
-        usb_endpoint_mapping_t *epm_in = usb_device_get_mapped_ep(dev->usb_dev, EP_BULK_IN);
+        usb_endpoint_mapping_t *epm_out = usb_device_get_mapped_ep(dev->usb_dev, USB_DIAG_EP_BULK_OUT);
+        usb_endpoint_mapping_t *epm_in = usb_device_get_mapped_ep(dev->usb_dev, USB_DIAG_EP_BULK_IN);
 
         if (!epm_in || !epm_out || !epm_in->present || !epm_out->present) {