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

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• uspace/drv/bus/usb/usbflbk/main.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Petr Manek
  * All rights reserved.
  *
@@ -48 +49 @@
 static errno_t usbfallback_device_add(usb_device_t *dev)
 {
-        usb_log_info("Pretending to control %s `%s'.\n",
+        usb_log_info("Pretending to control %s `%s'.",
             usb_device_get_iface_number(dev) < 0 ? "device" : "interface",
             usb_device_get_name(dev));
@@ -62 +63 @@
 {
         assert(dev);
+        usb_log_info("Device '%s' gone.", usb_device_get_name(dev));
+        return EOK;
+}
+
+static errno_t usbfallback_device_remove(usb_device_t *dev)
+{
+        assert(dev);
+        usb_log_info("Device '%s' removed.", usb_device_get_name(dev));
         return EOK;
 }
@@ -68 +77 @@
 static const usb_driver_ops_t usbfallback_driver_ops = {
         .device_add = usbfallback_device_add,
-        .device_rem = usbfallback_device_gone,
+        .device_remove = usbfallback_device_remove,
         .device_gone = usbfallback_device_gone,
 };