Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

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

@@ -246 +246 @@
 }
 
+#define FUN_UNBIND_DESTROY(fun) \
+if (fun) { \
+        if (ddf_fun_unbind((fun)) == EOK) { \
+                ddf_fun_destroy((fun)); \
+        } else { \
+                usb_log_error("Could not unbind function `%s', it " \
+                    "will not be destroyed.\n", ddf_fun_get_name(fun)); \
+        } \
+} else (void)0
+
 /** Get highest index of a button mentioned in given report.
  *
@@ -286 +296 @@
 }
 
-int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
-{
-        ddf_fun_t *fun = NULL;
-        usb_mouse_t *mouse_dev = NULL;
-        bool bound = false;
-        int rc;
-
-        usb_log_debug("Initializing HID/Mouse structure...\n");
-
-        if (hid_dev == NULL) {
-                usb_log_error("Failed to init mouse structure: no structure"
-                    " given.\n");
-                rc = EINVAL;
-                goto error;
-        }
-
-        /* Create the exposed function. */
-        usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
-        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);
-                rc = ENOMEM;
-                goto error;
-        }
-
-        ddf_fun_set_ops(fun, &ops);
-
-        mouse_dev = ddf_fun_data_alloc(fun, sizeof(usb_mouse_t));
-        if (mouse_dev == NULL) {
-                usb_log_error("Error while creating USB/HID Mouse device "
-                    "structure.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
+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
@@ -335 +310 @@
         if (mouse_dev->buttons == NULL) {
                 usb_log_error(NAME ": out of memory, giving up on device!\n");
-                rc = ENOMEM;
-                goto error;
+                free(mouse_dev);
+                return ENOMEM;
         }
 
         // TODO: how to know if the device supports the request???
-        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
-            hid_dev->usb_dev->interface_no, IDLE_RATE);
-
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
+        usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
+            usb_device_get_iface_number(hid_dev->usb_dev), IDLE_RATE);
+        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 = usb_device_ddf_fun_create(hid_dev->usb_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(rc));
-                goto error;
-        }
-
-        bound = true;
+                    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);
-        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));
-                goto error;
-        }
-
+        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. */
         *data = mouse_dev;
+
         return EOK;
-error:
-        if (bound)
-                ddf_fun_unbind(fun);
-        if (mouse_dev != NULL)
-                free(mouse_dev->buttons);
-        if (fun != NULL)
-                ddf_fun_destroy(fun);
-        return rc;
 }
 
@@ -404 +409 @@
         }
 
-        ddf_fun_unbind(mouse_dev->mouse_fun);
         free(mouse_dev->buttons);
-        ddf_fun_destroy(mouse_dev->mouse_fun);
+        FUN_UNBIND_DESTROY(mouse_dev->mouse_fun);
 }
 
@@ -421 +425 @@
         }
 
-        rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
-            hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
+        rc = usbhid_req_set_protocol(
+            usb_device_get_default_pipe(hid_dev->usb_dev),
+            usb_device_get_iface_number(hid_dev->usb_dev),
+            USB_HID_PROTOCOL_BOOT);
 
         if (rc != EOK) {