Changeset fc0271a5 in mainline for uspace/lib/usbhost

Timestamp:

2017-10-12T16:06:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

f9d787c

Parents:

d0db4a0

Message:

WIP usbhost refactoring: uhci converted

Location:

uspace/lib/usbhost

Files:

• include/usb/host/bandwidth.h (modified) (1 diff)
• include/usb/host/hcd.h (modified) (1 diff)
• include/usb/host/usb2_bus.h (modified) (1 diff)
• src/bandwidth.c (modified) (5 diffs)
• src/usb2_bus.c (modified) (1 diff)

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

@@ -49 +49 @@
 #define BANDWIDTH_AVAILABLE_USB20  1
 
-extern size_t bandwidth_count_usb11(usb_speed_t, usb_transfer_type_t, size_t, size_t);
+typedef struct endpoint endpoint_t;
 
-extern size_t bandwidth_count_usb20(usb_speed_t, usb_transfer_type_t, size_t, size_t);
+extern size_t bandwidth_count_usb11(endpoint_t *, size_t);
+
+extern size_t bandwidth_count_usb20(endpoint_t *, size_t);
 
 #endif

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

@@ -58 +58 @@
         /** Transfer scheduling, implement in device driver. */
         schedule_hook_t schedule;
-        /** Hook called upon registering new endpoint. */
-        ep_add_hook_t ep_add_hook;
-        /** Hook called upon removing of an endpoint. */
-        ep_remove_hook_t ep_remove_hook;
         /** Hook to be called on device interrupt, passes ARG1 */
         interrupt_hook_t irq_hook;

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

@@ -50 +50 @@
 /** Endpoint management structure */
 typedef struct usb2_bus {
-        bus_t bus;                      /**< Inheritance - keep this first */
+        bus_t base;                     /**< Inheritance - keep this first */
 
         /* Device bookkeeping */

uspace/lib/usbhost/src/bandwidth.c

@@ -35 +35 @@
 
 #include <usb/host/bandwidth.h>
+#include <usb/host/endpoint.h>
 
 #include <assert.h>
@@ -46 +47 @@
  * @param max_packet_size Maximum bytes in one packet.
  */
-size_t bandwidth_count_usb11(usb_speed_t speed, usb_transfer_type_t type,
-    size_t size, size_t max_packet_size)
+size_t bandwidth_count_usb11(endpoint_t *ep, size_t size)
 {
+        assert(ep);
+
+        const usb_transfer_type_t type = ep->transfer_type;
+
         /* We care about bandwidth only for interrupt and isochronous. */
         if ((type != USB_TRANSFER_INTERRUPT)
@@ -55 +59 @@
         }
 
+        const size_t max_packet_size = ep->max_packet_size;
+
         const unsigned packet_count =
             (size + max_packet_size - 1) / max_packet_size;
@@ -60 +66 @@
          * transaction, but I did not find text in USB spec to confirm this */
         /* NOTE: All data packets will be considered to be max_packet_size */
-        switch (speed)
+        switch (ep->speed)
         {
         case USB_SPEED_LOW:
@@ -94 +100 @@
  * @param max_packet_size Maximum bytes in one packet.
  */
-size_t bandwidth_count_usb20(usb_speed_t speed, usb_transfer_type_t type,
-    size_t size, size_t max_packet_size)
+size_t bandwidth_count_usb20(endpoint_t *ep, size_t size)
 {
+        assert(ep);
+
+        const usb_transfer_type_t type = ep->transfer_type;
+
         /* We care about bandwidth only for interrupt and isochronous. */
         if ((type != USB_TRANSFER_INTERRUPT)

uspace/lib/usbhost/src/usb2_bus.c

@@ -291 +291 @@
         assert(bus);
 
-        bus_init(&bus->bus, hcd);
-
-        bus->bus.ops = usb2_bus_ops;
-        bus->bus.ops.count_bw = count_bw;
+        bus_init(&bus->base, hcd);
+
+        bus->base.ops = usb2_bus_ops;
+        bus->base.ops.count_bw = count_bw;
 
         bus->free_bw = available_bandwidth;