Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.c

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/bus/usb/usbhid/generic/hiddev.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -46 +46 @@
 #include "usbhid.h"
 
-
-
 const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
@@ -58 +56 @@
 
 const char *HID_GENERIC_FUN_NAME = "hid";
-const char *HID_GENERIC_CLASS_NAME = "hid";
+const char *HID_GENERIC_CATEGORY = "hid";
 
 
@@ -223 +221 @@
         return true;
 }
+
 /**
  * @}