Changeset 72d120e in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

File:

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

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

@@ -49 +49 @@
 #include "usbhid.h"
 
-
-
 const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
@@ -61 +59 @@
 
 const char *HID_GENERIC_FUN_NAME = "hid";
-const char *HID_GENERIC_CLASS_NAME = "hid";
+const char *HID_GENERIC_CATEGORY = "hid";
 
 
@@ -226 +224 @@
         return true;
 }
+
 /**
  * @}