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

Timestamp:

2011-08-18T18:45:42Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

1f44b056

Parents:

ee24574 (diff), f55b12b (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 libposix changes.

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (2 diffs)

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

@@ -102 +102 @@
 
 const char *HID_KBD_FUN_NAME = "keyboard";
-const char *HID_KBD_CLASS_NAME = "keyboard";
+const char *HID_KBD_CATEGORY_NAME = "keyboard";
 
 static void usb_kbd_set_led(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev);
@@ -551 +551 @@
             HID_KBD_FUN_NAME, fun->handle);
         
-        usb_log_debug("Adding DDF function to class %s...\n", 
+        usb_log_debug("Adding DDF function to category %s...\n", 
             HID_KBD_CLASS_NAME);
-        rc = ddf_fun_add_to_class(fun, HID_KBD_CLASS_NAME);
+        rc = ddf_fun_add_to_category(fun, HID_KBD_CATEGORY_NAME);
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class %s: %s.\n",
+                    "Could not add DDF function to category %s: %s.\n",
                     HID_KBD_CLASS_NAME, str_error(rc));
                 ddf_fun_destroy(fun);