Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.c

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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) (12 diffs)

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

@@ -48 +48 @@
 /*----------------------------------------------------------------------------*/
 
-usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
+const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
         .interface_class = USB_CLASS_HID,
+        .interface_subclass = -1,
+        .interface_protocol = -1,
         .flags = 0
 };
@@ -92 +94 @@
         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;
@@ -98 +100 @@
 
         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;
 }
@@ -111 +113 @@
 {
         usb_log_debug2("Generic HID: Get event.\n");
-        
+
         if (fun == NULL || fun->driver_data == NULL || buffer == NULL
             || act_size == NULL || event_nr == NULL) {
@@ -119 +121 @@
 
         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", 
@@ -125 +127 @@
                 return EINVAL;  // TODO: other error code
         }
-        
+
         /*! @todo This should probably be somehow atomic. */
         memcpy(buffer, hid_dev->input_report, 
@@ -131 +133 @@
         *act_size = hid_dev->input_report_size;
         *event_nr = usb_hid_report_number(hid_dev);
-        
+
         usb_log_debug2("OK\n");
-        
+
         return EOK;
 }
@@ -142 +144 @@
 {
         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;
 }
@@ -162 +164 @@
 {
         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;
 }
@@ -190 +192 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
-{       
+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;
+        }
+
         /* Create the exposed function. */
         /** @todo Generate numbers for the devices? */
@@ -201 +224 @@
                 return ENOMEM;
         }
-        
+
         fun->ops = &usb_generic_hid_ops;
-        fun->driver_data = hid_dev;
 
         int rc = ddf_fun_bind(fun);
@@ -212 +234 @@
                 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);
-        
-        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);
+        *data = fun;
+
+        return EOK;
 }