Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbflbk/main.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/usbflbk/main.c (modified) (2 diffs)

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

@@ -64 +64 @@
         }
 
+        dev->driver_data = ctl_fun;
+
         usb_log_info("Pretending to control %s `%s'" \
             " (node `%s', handle %" PRIun ").\n",
@@ -72 +74 @@
 }
 
+/** Callback when new device is about to be removed.
+ *
+ * @param dev Representation of a generic DDF device.
+ * @return Error code.
+ */
+static int usbfallback_device_remove(usb_device_t *dev)
+{
+        return EOK;
+}
+
+/** Callback when new device is removed and recognized as gone by DDF.
+ *
+ * @param dev Representation of a generic DDF device.
+ * @return Error code.
+ */
+static int usbfallback_device_gone(usb_device_t *dev)
+{
+        assert(dev);
+        ddf_fun_t *ctl_fun = dev->driver_data;
+        const int ret = ddf_fun_unbind(ctl_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind %s.\n", ctl_fun->name);
+                return ret;
+        }
+        ddf_fun_destroy(ctl_fun);
+        dev->driver_data = NULL;
+
+        return EOK;
+}
+
 /** USB fallback driver ops. */
-static usb_driver_ops_t usbfallback_driver_ops = {
+static const usb_driver_ops_t usbfallback_driver_ops = {
         .device_add = usbfallback_device_add,
+        .device_rem = usbfallback_device_remove,
+        .device_gone = usbfallback_device_gone,
 };
 
 /** USB fallback driver. */
-static usb_driver_t usbfallback_driver = {
+static const usb_driver_t usbfallback_driver = {
         .name = NAME,
         .ops = &usbfallback_driver_ops,