Changeset 15d0046 in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

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

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

@@ -35 +35 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
@@ -48 +45 @@
 #include "hiddev.h"
 #include "usbhid.h"
-
-
 
 const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
@@ -61 +56 @@
 
 const char *HID_GENERIC_FUN_NAME = "hid";
-const char *HID_GENERIC_CLASS_NAME = "hid";
+const char *HID_GENERIC_CATEGORY = "hid";
 
 
@@ -226 +221 @@
         return true;
 }
+
 /**
  * @}