Changeset 38b4a25 in mainline

Timestamp:

2012-12-22T19:25:56Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

56a07e0

Parents:

1e2af6a9

Message:

usbhid, mouse: Reorganize init to avoid data_implant.

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (5 diffs)

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

@@ -34 +34 @@
  * USB Mouse driver API.
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <usb/debug.h>
@@ -259 +256 @@
 } else (void)0
 
-static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse)
-{
-        assert(hid_dev != NULL);
-        assert(mouse != NULL);
-
-        /* 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,
-            HID_MOUSE_FUN_NAME);
-        if (fun == NULL) {
-                usb_log_error("Could not create DDF function node `%s'.\n",
-                    HID_MOUSE_FUN_NAME);
-                return ENOMEM;
-        }
-
-        ddf_fun_set_ops(fun, &ops);
-        ddf_fun_data_implant(fun, mouse);
-
-        int rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                usb_log_error("Could not bind DDF function `%s': %s.\n",
-                    ddf_fun_get_name(fun), str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        usb_log_debug("Adding DDF function `%s' to category %s...\n",
-            ddf_fun_get_name(fun), 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 category %s: %s.\n",
-                    HID_MOUSE_CATEGORY, str_error(rc));
-                FUN_UNBIND_DESTROY(fun);
-                return rc;
-        }
-        mouse->mouse_fun = fun;
-        return EOK;
-}
-
 /** Get highest index of a button mentioned in given report.
  *
@@ -339 +296 @@
 }
 
-int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
-{
-        usb_log_debug("Initializing HID/Mouse structure...\n");
-
-        if (hid_dev == NULL) {
-                usb_log_error("Failed to init keyboard structure: no structure"
-                    " given.\n");
-                return EINVAL;
-        }
-
-        usb_mouse_t *mouse_dev = calloc(1, sizeof(usb_mouse_t));
-        if (mouse_dev == NULL) {
-                usb_log_error("Error while creating USB/HID Mouse device "
-                    "structure.\n");
-                return ENOMEM;
-        }
-
+static int mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev)
+{
         // FIXME: This may not be optimal since stupid hardware vendor may
         // use buttons 1, 2, 3 and 6000 and we would allocate array of
@@ -375 +317 @@
         usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
             hid_dev->usb_dev->interface_no, IDLE_RATE);
-
-        int rc = usb_mouse_create_function(hid_dev, mouse_dev);
-        if (rc != EOK) {
-                free(mouse_dev->buttons);
-                free(mouse_dev);
-                return rc;
-        }
+        return EOK;
+}
+
+int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
+{
+        usb_log_debug("Initializing HID/Mouse structure...\n");
+
+        if (hid_dev == NULL) {
+                usb_log_error("Failed to init keyboard structure: no structure"
+                    " given.\n");
+                return EINVAL;
+        }
+
+        /* 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,
+            HID_MOUSE_FUN_NAME);
+        if (fun == NULL) {
+                usb_log_error("Could not create DDF function node `%s'.\n",
+                    HID_MOUSE_FUN_NAME);
+                return ENOMEM;
+        }
+
+        usb_mouse_t *mouse_dev = ddf_fun_data_alloc(fun, sizeof(usb_mouse_t));
+        if (mouse_dev == NULL) {
+                usb_log_error("Failed to alloc HID mouse device structure.\n");
+                ddf_fun_destroy(fun);
+                return ENOMEM;
+        }
+
+        int ret = mouse_dev_init(mouse_dev, hid_dev);
+        if (ret != EOK) {
+                usb_log_error("Failed to init HID mouse device structure.\n");
+                return ret;
+        }
+
+        ddf_fun_set_ops(fun, &ops);
+
+        ret = ddf_fun_bind(fun);
+        if (ret != EOK) {
+                usb_log_error("Could not bind DDF function `%s': %s.\n",
+                    ddf_fun_get_name(fun), str_error(ret));
+                ddf_fun_destroy(fun);
+                return ret;
+        }
+
+        usb_log_debug("Adding DDF function `%s' to category %s...\n",
+            ddf_fun_get_name(fun), HID_MOUSE_CATEGORY);
+        ret = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
+        if (ret != EOK) {
+                usb_log_error(
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_CATEGORY, str_error(ret));
+                FUN_UNBIND_DESTROY(fun);
+                return ret;
+        }
+        mouse_dev->mouse_fun = fun;
 
         /* Save the Mouse device structure into the HID device structure. */
@@ -417 +409 @@
         }
 
+        free(mouse_dev->buttons);
         FUN_UNBIND_DESTROY(mouse_dev->mouse_fun);
-
-        free(mouse_dev->buttons);
 }