Changeset 25696fea in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (8 diffs)

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

@@ -76 +76 @@
 {
         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 +87 @@
                 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);
                 return rc;
-        }       
-        
+        }
+
         usb_log_debug("USB/HID device structure initialized.\n");
-        
+
         /*
          * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
@@ -109 +108 @@
          *    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 +124 @@
            /* Custom argument. */
            hid_dev);
-        
-        
+
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
                     dev->ddf_dev->name);
+                usb_hid_destroy(hid_dev);
                 return rc;
         }
+        hid_dev->running = true;
+        dev->driver_data = hid_dev;
 
         /*
@@ -150 +151 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usb_hid_add_device(usb_device_t *dev)
-{
-        usb_log_debug("usb_hid_add_device()\n");
-        
+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 +166 @@
                 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 +175 @@
                 return rc;
         }
-        
+
         usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
 
@@ -182 +183 @@
 /*----------------------------------------------------------------------------*/
 
-/* Currently, the framework supports only device adding. Once the framework
- * supports unplug, more callbacks will be added. */
+/**
+ * Callback for removing a device from the driver.
+ *
+ * @param dev Structure representing the device.
+ *
+ * @retval EOK if successful. 
+ * @retval EREFUSED if the device is not supported.
+ */
+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 EINPROGRESS;
+                }
+        }
+
+        assert(!hid_dev->running);
+        usb_hid_destroy(hid_dev);
+        usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
+        return EOK;
+}
+
+/** USB generic driver callbacks */
 static usb_driver_ops_t usb_hid_driver_ops = {
-        .add_device = usb_hid_add_device,
+        .device_add = usb_hid_device_add,
+        .device_gone = usb_hid_device_gone,
 };
 
 
-/* The driver itself. */
+/** The driver itself. */
 static usb_driver_t usb_hid_driver = {
         .name = NAME,