Changeset c83a55c in mainline for uspace/drv/bus/usb/usbflbk/main.c

Timestamp:

2011-10-31T06:52:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c25e39b

Parents:

e8ab32f (diff), 3ce78580 (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/usbflbk/main.c (modified) (2 diffs)

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

@@ -74 +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.
  *
@@ -93 +103 @@
         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,