Changeset 903bac0a in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.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/mouse/mousedev.c (modified) (4 diffs)

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. */
@@ -325 +325 @@
         assert(mouse != NULL);
         
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
@@ -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;