Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.c

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/kbd/kbddev.c (modified) (1 diff)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -666 +666 @@
 
         usb_log_debug("Adding DDF function to category %s...\n",
-            HID_KBD_CLASS_NAME);
+            HID_KBD_CATEGORY_NAME);
         ret = ddf_fun_add_to_category(fun, HID_KBD_CATEGORY_NAME);
         if (ret != EOK) {
                 usb_log_error(
                     "Could not add DDF function to category %s: %s.\n",
-                    HID_KBD_CLASS_NAME, str_error(ret));
+                    HID_KBD_CATEGORY_NAME, str_error(ret));
                 usb_kbd_destroy(kbd_dev);
                 if (ddf_fun_unbind(fun) == EOK) {