Changeset 98604cc in mainline

Timestamp:

2011-10-14T16:22:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

68dbe3e

Parents:

f2964e45

Message:

usbhid: Implement device_gone.

Location:

uspace/drv/bus/usb/usbhid

Files:

• main.c (modified) (3 diffs)
• usbhid.c (modified) (1 diff)

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

@@ -95 +95 @@
                 usb_hid_destroy(hid_dev);
                 return rc;
-        }       
+        }
 
         usb_log_debug("USB/HID device structure initialized.\n");
@@ -130 +130 @@
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
                     dev->ddf_dev->name);
+                usb_hid_destroy(hid_dev);
                 return rc;
         }
+        dev->driver_data = hid_dev;
 
         /*
@@ -182 +184 @@
 /*----------------------------------------------------------------------------*/
 
-/* 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;
+        usb_hid_destroy(hid_dev);
+        return EOK;
+}
+
+/** USB generic driver callbacks */
 static usb_driver_ops_t usb_hid_driver_ops = {
-        .device_add = usb_hid_device_add,
+        .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,

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

@@ -630 +630 @@
         }
 
-        usb_hid_destroy(hid_dev);
+//      usb_hid_destroy(hid_dev);
 }