Changeset 903bac0a in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/multimedia/multimedia.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

@@ -185 +185 @@
     usb_multimedia_t *multim_dev)
 {
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             NAME);
@@ -205 +205 @@
         }
         
-        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
+        usb_log_debug("%s function created (handle: %" PRIun ").\n",
             NAME, fun->handle);
         
-        rc = ddf_fun_add_to_class(fun, "keyboard");
+        rc = ddf_fun_add_to_category(fun, "keyboard");
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class 'keyboard': %s.\n",
+                    "Could not add DDF function to category 'keyboard': %s.\n",
                     str_error(rc));
                 // TODO: Can / should I destroy the DDF function?