Changeset 5e2b1ae6 in mainline for uspace/lib/usbhost/include

Timestamp:

2018-01-07T01:54:45Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3dc3f99

Parents:

63431db2

Message:

usbhost: reserve default speed in library

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (3 diffs)
• usb2_bus.h (modified) (2 diffs)

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

@@ -100 +100 @@
         void (*interrupt)(bus_t *, uint32_t);
         int (*status)(bus_t *, uint32_t *);
-        int (*reserve_default_address)(bus_t *, usb_speed_t);
-        int (*release_default_address)(bus_t *);
 
         /* Operations on device */
@@ -139 +137 @@
         const bus_ops_t *ops;
 
+        /* Reserving default address - USB_SPEED_MAX when free. */
+        usb_speed_t default_address_speed;
+
         /* This structure is meant to be extended by overriding. */
 } bus_t;
@@ -166 +167 @@
 
 int bus_reserve_default_address(bus_t *, usb_speed_t);
-int bus_release_default_address(bus_t *);
+void bus_release_default_address(bus_t *);
 
 #endif

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

@@ -50 +50 @@
         bus_t base;                     /**< Inheritance - keep this first */
 
-        /** The speed which reserved default address. Invalid unless reserved. */
-        usb_speed_t default_address_speed;
-
         /** Map of occupied addresses */
         bool address_occupied [USB_ADDRESS_COUNT];
@@ -64 +61 @@
 extern const bus_ops_t usb2_bus_ops;
 
-extern int usb2_bus_init(usb2_bus_t *, size_t);
+extern void usb2_bus_init(usb2_bus_t *, size_t);
 
 #endif