Changes in uspace/drv/bus/usb/usbhid/generic/hiddev.c [065064e6:15f3c3f] in mainline

File:

• uspace/drv/bus/usb/usbhid/generic/hiddev.c (modified) (12 diffs)

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

@@ -52 +52 @@
         .direction = USB_DIRECTION_IN,
         .interface_class = USB_CLASS_HID,
-        .interface_subclass = -1,
-        .interface_protocol = -1,
         .flags = 0
 };
@@ -94 +92 @@
         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;
@@ -100 +98 @@
 
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-
+        
         usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n",
             hid_dev, hid_dev->max_input_report_size);
-
+        
         return hid_dev->max_input_report_size;
 }
@@ -113 +111 @@
 {
         usb_log_debug2("Generic HID: Get event.\n");
-
+        
         if (fun == NULL || fun->driver_data == NULL || buffer == NULL
             || act_size == NULL || event_nr == NULL) {
@@ -121 +119 @@
 
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-
+        
         if (hid_dev->input_report_size > size) {
                 usb_log_debug("input_report_size > size (%zu, %zu)\n", 
@@ -127 +125 @@
                 return EINVAL;  // TODO: other error code
         }
-
+        
         /*! @todo This should probably be somehow atomic. */
         memcpy(buffer, hid_dev->input_report, 
@@ -133 +131 @@
         *act_size = hid_dev->input_report_size;
         *event_nr = usb_hid_report_number(hid_dev);
-
+        
         usb_log_debug2("OK\n");
-
+        
         return EOK;
 }
@@ -144 +142 @@
 {
         usb_log_debug("Generic HID: Get report descriptor length.\n");
-
+        
         if (fun == NULL || fun->driver_data == NULL) {
                 usb_log_debug("No function");
                 return EINVAL;
         }
-
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-
+        
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
         usb_log_debug2("hid_dev->report_desc_size = %zu\n", 
             hid_dev->report_desc_size);
-
+        
         return hid_dev->report_desc_size;
 }
@@ -164 +162 @@
 {
         usb_log_debug2("Generic HID: Get report descriptor.\n");
-
+        
         if (fun == NULL || fun->driver_data == NULL) {
                 usb_log_debug("No function");
                 return EINVAL;
         }
-
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-
+        
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
         if (hid_dev->report_desc_size > size) {
                 return EINVAL;
         }
-
+        
         memcpy(desc, hid_dev->report_desc, hid_dev->report_desc_size);
         *actual_size = hid_dev->report_desc_size;
-
+        
         return EOK;
 }
@@ -192 +190 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_generic_hid_deinit(usb_hid_dev_t *hid_dev, void *data)
-{
-        ddf_fun_t *fun = data;
-        const int ret = ddf_fun_unbind(fun);
-        if (ret != EOK) {
-                usb_log_error("Failed to unbind generic hid fun.\n");
-                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;
-        ddf_fun_destroy(fun);
-}
-
-/*----------------------------------------------------------------------------*/
-
-int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
-{
-        if (hid_dev == NULL) {
-                return EINVAL;
-        }
-
+static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
+{       
         /* Create the exposed function. */
         /** @todo Generate numbers for the devices? */
@@ -224 +201 @@
                 return ENOMEM;
         }
-
+        
         fun->ops = &usb_generic_hid_ops;
+        fun->driver_data = hid_dev;
 
         int rc = ddf_fun_bind(fun);
@@ -234 +212 @@
                 return rc;
         }
-        /* This is nasty both device and this function have the same
-         * driver data, thus destruction would lead to double free */
-        fun->driver_data = hid_dev;
-
+        
         usb_log_debug("HID function created. Handle: %" PRIun "\n", fun->handle);
-        *data = fun;
-
-        return EOK;
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
+{
+        if (hid_dev == NULL) {
+                return EINVAL;
+        }
+        
+        return usb_generic_hid_create_function(hid_dev);
 }