Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbhid/usbhid.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbhid/usbhid.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/usbhid.h

@@ -103 +103 @@
         usb_device_t *usb_dev;
 
-        /** Index of the polling pipe in usb_hid_endpoints array. */
-        unsigned poll_pipe_index;
+        /** Endpont mapping of the polling pipe. */
+        usb_endpoint_mapping_t *poll_pipe_mapping;
 
         /** Subdrivers. */
@@ -132 +132 @@
 };
 
-
-
-enum {
-        USB_HID_KBD_POLL_EP_NO = 0,
-        USB_HID_MOUSE_POLL_EP_NO = 1,
-        USB_HID_GENERIC_POLL_EP_NO = 2,
-        USB_HID_POLL_EP_COUNT = 3
-};
-
 extern const usb_endpoint_description_t *usb_hid_endpoints[];
-
-
 
 int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev);