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

Timestamp:

2011-10-30T19:50:54Z (14 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/main.c (modified) (10 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -46 +46 @@
 #include "usbhid.h"
 
-/*----------------------------------------------------------------------------*/
-
 #define NAME "usbhid"
 
@@ -67 +65 @@
  *
  * @param dev Device to add.
- *
- * @retval EOK if successful.
- * @retval ENOMEM if there
- * @return Other error code inherited from one of functions usb_kbd_init(),
- *         ddf_fun_bind() and ddf_fun_add_to_class().
+ * @return Error code.
  */
 static int usb_hid_try_add_device(usb_device_t *dev)
 {
         assert(dev != NULL);
-        
-        /* 
-         * Initialize device (get and process descriptors, get address, etc.)
-         */
+
+        /* Initialize device (get and process descriptors, get address, etc.) */
         usb_log_debug("Initializing USB/HID device...\n");
-        
-        usb_hid_dev_t *hid_dev = usb_hid_new();
+
+        usb_hid_dev_t *hid_dev =
+            usb_device_data_alloc(dev, sizeof(usb_hid_dev_t));
         if (hid_dev == NULL) {
                 usb_log_error("Error while creating USB/HID device "
@@ -88 +81 @@
                 return ENOMEM;
         }
-        
+
         int rc = usb_hid_init(hid_dev, dev);
-        
+
         if (rc != EOK) {
                 usb_log_error("Failed to initialize USB/HID device.\n");
-                usb_hid_destroy(hid_dev);
+                usb_hid_deinit(hid_dev);
                 return rc;
-        }       
-        
+        }
+
         usb_log_debug("USB/HID device structure initialized.\n");
-        
+
         /*
          * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
@@ -109 +102 @@
          *    pouzit usb/classes/hid/iface.h - prvy int je telefon
          */
-        
+
         /* Start automated polling function.
          * This will create a separate fibril that will query the device
@@ -125 +118 @@
            /* Custom argument. */
            hid_dev);
-        
-        
+
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
                     dev->ddf_dev->name);
+                usb_hid_deinit(hid_dev);
                 return rc;
         }
+        hid_dev->running = true;
 
         /*
@@ -138 +132 @@
         return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -146 +139 @@
  *
  * @param dev Structure representing the new device.
- *
- * @retval EOK if successful. 
- * @retval EREFUSED if the device is not supported.
+ * @return Error code.
  */
 static int usb_hid_device_add(usb_device_t *dev)
 {
         usb_log_debug("usb_hid_device_add()\n");
-        
+
         if (dev == NULL) {
                 usb_log_warning("Wrong parameter given for add_device().\n");
                 return EINVAL;
         }
-        
+
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported HID device.\n");
@@ -165 +156 @@
                 return ENOTSUP;
         }
-        
+
         int rc = usb_hid_try_add_device(dev);
-        
+
         if (rc != EOK) {
                 usb_log_warning("Device is not a supported HID device.\n");
@@ -174 +165 @@
                 return rc;
         }
-        
+
         usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
 
         return EOK;
 }
-
-/*----------------------------------------------------------------------------*/
-
-/* Currently, the framework supports only device adding. Once the framework
- * supports unplug, more callbacks will be added. */
-static usb_driver_ops_t usb_hid_driver_ops = {
-        .device_add = usb_hid_device_add,
+/*----------------------------------------------------------------------------*/
+/**
+ * Callback for a device about to be removed from the driver.
+ *
+ * @param dev Structure representing the device.
+ * @return Error code.
+ */
+static int usb_hid_device_rem(usb_device_t *dev)
+{
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Callback for removing a device from the driver.
+ *
+ * @param dev Structure representing the device.
+ * @return Error code.
+ */
+static int usb_hid_device_gone(usb_device_t *dev)
+{
+        usb_hid_dev_t *hid_dev = dev->driver_data;
+        unsigned tries = 10;
+        while (hid_dev->running) {
+                async_usleep(100000);
+                if (!tries--) {
+                        usb_log_error("Can't remove hub, still running.\n");
+                        return EBUSY;
+                }
+        }
+
+        assert(!hid_dev->running);
+        usb_hid_deinit(hid_dev);
+        usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+/** USB generic driver callbacks */
+static const usb_driver_ops_t usb_hid_driver_ops = {
+        .device_add = usb_hid_device_add,
+        .device_rem = usb_hid_device_rem,
+        .device_gone = usb_hid_device_gone,
 };
-
-
-/* The driver itself. */
-static usb_driver_t usb_hid_driver = {
+/*----------------------------------------------------------------------------*/
+/** The driver itself. */
+static const usb_driver_t usb_hid_driver = {
         .name = NAME,
         .ops = &usb_hid_driver_ops,
         .endpoints = usb_hid_endpoints
 };
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
@@ -206 +228 @@
         return usb_driver_main(&usb_hid_driver);
 }
-
 /**
  * @}