Changeset 9848c77 in mainline for uspace/lib/usbhost

Timestamp:

2018-01-11T04:14:40Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17783bf

Parents:

0892663a

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:10:46)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:14:40)

Message:

usbhost: renamed bus_device_remove to bus_device_gone

Location:

uspace/lib/usbhost

Files:

• include/usb/host/bus.h (modified) (2 diffs)
• src/bus.c (modified) (3 diffs)
• src/ddf_helpers.c (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/bus.h

@@ -103 +103 @@
         /* Operations on device */
         int (*device_enumerate)(device_t *);
-        void (*device_remove)(device_t *);
+        void (*device_gone)(device_t *);
         int (*device_online)(device_t *);                       /**< Optional */
         void (*device_offline)(device_t *);                     /**< Optional */
@@ -149 +149 @@
 
 int bus_device_enumerate(device_t *);
-void bus_device_remove(device_t *);
+void bus_device_gone(device_t *);
 
 int bus_device_online(device_t *);

uspace/lib/usbhost/src/bus.c

@@ -167 +167 @@
                  */
                 fibril_mutex_unlock(&dev->guard);
-                bus_device_remove(child);
+                bus_device_gone(child);
                 fibril_mutex_lock(&dev->guard);
         }
@@ -176 +176 @@
  * Resolve a USB device that is gone.
  */
-void bus_device_remove(device_t *dev)
+void bus_device_gone(device_t *dev)
 {
         assert(dev);
         assert(dev->fun == NULL);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_gone);
         assert(ops);
 
@@ -212 +212 @@
 
         /* Tell the HC to release its resources. */
-        ops->device_remove(dev);
+        ops->device_gone(dev);
 
         /* Release the EP0 bus reference */

uspace/lib/usbhost/src/ddf_helpers.c

@@ -354 +354 @@
         assert(victim->hub == hub);
 
-        bus_device_remove(victim);
+        bus_device_gone(victim);
         return EOK;
 }