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

File:

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

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

@@ -48 +48 @@
 /*----------------------------------------------------------------------------*/
 
-const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
+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
 };
@@ -61 +59 @@
 
 /*----------------------------------------------------------------------------*/
+
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun);
-static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
+
+static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
     size_t size, size_t *act_size, int *event_nr, unsigned int flags);
+
 static int usb_generic_hid_client_connected(ddf_fun_t *fun);
+
 static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun);
-static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
+
+static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, 
     size_t size, size_t *actual_size);
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 static usbhid_iface_t usb_generic_iface = {
         .get_event = usb_generic_hid_get_event,
@@ -75 +80 @@
         .get_report_descriptor = usb_generic_get_report_descriptor
 };
-/*----------------------------------------------------------------------------*/
+
 static ddf_dev_ops_t usb_generic_hid_ops = {
         .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface,
         .open = usb_generic_hid_client_connected
 };
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 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;
-
+        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;
 }
-/*----------------------------------------------------------------------------*/
-static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
     size_t size, size_t *act_size, int *event_nr, unsigned int flags)
 {
         usb_log_debug2("Generic HID: Get event.\n");
-
+        
         if (fun == NULL || fun->driver_data == NULL || buffer == NULL
             || act_size == NULL || event_nr == NULL) {
@@ -109 +118 @@
         }
 
-        const 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->input_report_size > size) {
-                usb_log_debug("input_report_size > size (%zu, %zu)\n",
+                usb_log_debug("input_report_size > size (%zu, %zu)\n", 
                     hid_dev->input_report_size, size);
                 return EINVAL;  // TODO: other error code
         }
-
+        
         /*! @todo This should probably be somehow atomic. */
-        memcpy(buffer, hid_dev->input_report,
+        memcpy(buffer, hid_dev->input_report, 
             hid_dev->input_report_size);
         *act_size = hid_dev->input_report_size;
         *event_nr = usb_hid_report_number(hid_dev);
-
+        
         usb_log_debug2("OK\n");
-
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
 static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun)
 {
         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;
-
-        usb_log_debug2("hid_dev->report_desc_size = %zu\n",
+        
+        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;
 }
-/*----------------------------------------------------------------------------*/
-static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, 
     size_t size, size_t *actual_size)
 {
         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;
-
+        
+        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;
-}
-/*----------------------------------------------------------------------------*/
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
 static int usb_generic_hid_client_connected(ddf_fun_t *fun)
 {
@@ -172 +187 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-void usb_generic_hid_deinit(usb_hid_dev_t *hid_dev, void *data)
-{
-        ddf_fun_t *fun = data;
-        if (fun == NULL)
-                return;
-
-        if (ddf_fun_unbind(fun) != 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? */
         usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
@@ -204 +201 @@
                 return ENOMEM;
         }
-
-        /* This is nasty, both device and this function have the same
-         * driver data, thus destruction causes to double free */
+        
+        fun->ops = &usb_generic_hid_ops;
         fun->driver_data = hid_dev;
-        fun->ops = &usb_generic_hid_ops;
 
         int rc = ddf_fun_bind(fun);
@@ -214 +209 @@
                 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);
-        *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);
+}
+
+/*----------------------------------------------------------------------------*/
+
 bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
         return true;
 }
+
 /**
  * @}