Changeset 1dc4a5e in mainline for uspace/drv/bus/usb/usbhid

Timestamp:

2011-08-18T13:34:33Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

763e0cd

Parents:

99ac5cf

Message:

Renaming to reflect classes are gone.

Location:

uspace/drv/bus/usb/usbhid

Files:

• kbd/kbddev.c (modified) (2 diffs)
• mouse/mousedev.c (modified) (3 diffs)
• mouse/mousedev.h (modified) (1 diff)
• multimedia/multimedia.c (modified) (1 diff)

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);

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -74 +74 @@
 const char *HID_MOUSE_FUN_NAME = "mouse";
 const char *HID_MOUSE_WHEEL_FUN_NAME = "mouse-wheel";
-const char *HID_MOUSE_CLASS_NAME = "mouse";
-const char *HID_MOUSE_WHEEL_CLASS_NAME = "keyboard";
+const char *HID_MOUSE_CATEGORY = "mouse";
+const char *HID_MOUSE_WHEEL_CATEGORY = "keyboard";
 
 /** Default idle rate for mouses. */
@@ -345 +345 @@
         }
         
-        usb_log_debug("Adding DDF function to class %s...\n", 
-            HID_MOUSE_CLASS_NAME);
-        rc = ddf_fun_add_to_class(fun, HID_MOUSE_CLASS_NAME);
+        usb_log_debug("Adding DDF function to category %s...\n", 
+            HID_MOUSE_CATEGORY);
+        rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class %s: %s.\n",
-                    HID_MOUSE_CLASS_NAME, str_error(rc));
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_CATEGORY, str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;
@@ -383 +383 @@
         }
         
-        usb_log_debug("Adding DDF function to class %s...\n", 
-            HID_MOUSE_WHEEL_CLASS_NAME);
-        rc = ddf_fun_add_to_class(fun, HID_MOUSE_WHEEL_CLASS_NAME);
+        usb_log_debug("Adding DDF function to category %s...\n", 
+            HID_MOUSE_WHEEL_CATEGORY);
+        rc = ddf_fun_add_to_category(fun, HID_MOUSE_WHEEL_CATEGORY);
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class %s: %s.\n",
-                    HID_MOUSE_WHEEL_CLASS_NAME, str_error(rc));
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -59 +59 @@
 
 const char *HID_MOUSE_FUN_NAME;
-const char *HID_MOUSE_CLASS_NAME;
+const char *HID_MOUSE_CATEGORY;
 
 /*----------------------------------------------------------------------------*/

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

@@ -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?