Changeset 52c4264 in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.c

Timestamp:

2012-08-17T12:23:52Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (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/generic/hiddev.c (modified) (9 diffs)

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -35 +35 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
@@ -81 +84 @@
 };
 
+/** Return hid_dev_t * for generic HID function node.
+ *
+ * For the generic HID subdriver the 'hid' function has usb_hid_gen_fun_t
+ * as soft state. Through that we can get to the usb_hid_dev_t.
+ */
+static usb_hid_dev_t *fun_hid_dev(ddf_fun_t *fun)
+{
+        return ((usb_hid_gen_fun_t *)ddf_fun_data_get(fun))->hid_dev;
+}
+
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
 {
         usb_log_debug2("Generic HID: Get event length (fun: %p, "
-            "fun->driver_data: %p.\n", fun, fun->driver_data);
-
-        if (fun == NULL || fun->driver_data == NULL) {
-                return 0;
-        }
-
-        const usb_hid_dev_t *hid_dev = fun->driver_data;
+            "fun->driver_data: %p.\n", fun, ddf_fun_data_get(fun));
+
+        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
 
         usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n",
@@ -103 +112 @@
         usb_log_debug2("Generic HID: Get event.\n");
 
-        if (fun == NULL || fun->driver_data == NULL || buffer == NULL
-            || act_size == NULL || event_nr == NULL) {
+        if (buffer == NULL || act_size == NULL || event_nr == NULL) {
                 usb_log_debug("No function");
                 return EINVAL;
         }
 
-        const usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
 
         if (hid_dev->input_report_size > size) {
@@ -132 +140 @@
         usb_log_debug("Generic HID: Get report descriptor length.\n");
 
-        if (fun == NULL || fun->driver_data == NULL) {
-                usb_log_debug("No function");
-                return EINVAL;
-        }
-
-        const usb_hid_dev_t *hid_dev = fun->driver_data;
+        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
 
         usb_log_debug2("hid_dev->report_desc_size = %zu\n",
@@ -150 +153 @@
         usb_log_debug2("Generic HID: Get report descriptor.\n");
 
-        if (fun == NULL || fun->driver_data == NULL) {
-                usb_log_debug("No function");
-                return EINVAL;
-        }
-
-        const usb_hid_dev_t *hid_dev = fun->driver_data;
+        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
 
         if (hid_dev->report_desc_size > size) {
@@ -183 +181 @@
                 return;
         }
-        usb_log_debug2("%s unbound.\n", fun->name);
-        /* We did not allocate this, so leave this alone
-         * the device would take care of it */
-        fun->driver_data = NULL;
+        usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun));
         ddf_fun_destroy(fun);
 }
@@ -192 +187 @@
 int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
 {
+        usb_hid_gen_fun_t *hid_fun;
+
         if (hid_dev == NULL) {
                 return EINVAL;
@@ -205 +202 @@
         }
 
-        /* This is nasty, both device and this function have the same
-         * driver data, thus destruction causes to double free */
-        fun->driver_data = hid_dev;
-        fun->ops = &usb_generic_hid_ops;
+        /* Create softstate */
+        hid_fun = ddf_fun_data_alloc(fun, sizeof(usb_hid_gen_fun_t));
+        hid_fun->hid_dev = hid_dev;
+        ddf_fun_set_ops(fun, &usb_generic_hid_ops);
 
         int rc = ddf_fun_bind(fun);
@@ -214 +211 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                fun->driver_data = NULL;
                 ddf_fun_destroy(fun);
                 return rc;
         }
 
-        usb_log_debug("HID function created. Handle: %" PRIun "\n", fun->handle);
+        usb_log_debug("HID function created. Handle: %" PRIun "\n",
+            ddf_fun_get_handle(fun));
         *data = fun;