Changeset e6b9182 in mainline for uspace/lib/usbhost

Timestamp:

2017-10-13T08:49:29Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

741bcdeb

Parents:

0a5833d7

Message:

WIP usbhost refactoring: ohci completed

Along with that we noticed hcd_t in bus_t is superfluous and it complicates initialization (and breaks isolation), so we removed it. Also, type of the toggle has changed to bool in the functions.

Location:

uspace/lib/usbhost

Files:

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

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

@@ -68 +68 @@
         /* Endpoint ops, optional (have generic fallback) */
         void (*destroy_endpoint)(endpoint_t *);
-        int (*endpoint_get_toggle)(endpoint_t *);
-        void (*endpoint_set_toggle)(endpoint_t *, unsigned);
+        bool (*endpoint_get_toggle)(endpoint_t *);
+        void (*endpoint_set_toggle)(endpoint_t *, bool);
 } bus_ops_t;
 
 /** Endpoint management structure */
 typedef struct bus {
-        hcd_t *hcd;
-
         /* Synchronization of ops */
         fibril_mutex_t guard;
@@ -85 +83 @@
 } bus_t;
 
-void bus_init(bus_t *, hcd_t *hcd);
+void bus_init(bus_t *);
 
 endpoint_t *bus_create_endpoint(bus_t *);

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

@@ -65 +65 @@
 } usb2_bus_t;
 
-extern int usb2_bus_init(usb2_bus_t *, hcd_t *, size_t, count_bw_func_t);
+extern int usb2_bus_init(usb2_bus_t *, size_t, count_bw_func_t);
 
 #endif

uspace/lib/usbhost/src/bus.c

@@ -43 +43 @@
  * Initializes the bus structure.
  */
-void bus_init(bus_t *bus, hcd_t *hcd)
+void bus_init(bus_t *bus)
 {
         memset(bus, 0, sizeof(bus_t));
 
-        bus->hcd = hcd;
         fibril_mutex_initialize(&bus->guard);
 }

uspace/lib/usbhost/src/usb2_bus.c

@@ -41 +41 @@
 #include <errno.h>
 #include <macros.h>
+#include <stdlib.h>
 #include <stdbool.h>
 
@@ -110 +111 @@
 }
 
+static endpoint_t *usb2_bus_create_ep(bus_t *bus)
+{
+        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        if (!ep)
+                return NULL;
+
+        endpoint_init(ep, bus);
+        return ep;
+}
+
 /** Register an endpoint to the bus. Reserves bandwidth.
  * @param bus usb_bus structure, non-null.
@@ -271 +282 @@
 
 static const bus_ops_t usb2_bus_ops = {
+        .create_endpoint = usb2_bus_create_ep,
         .find_endpoint = usb2_bus_find_ep,
         .release_endpoint = usb2_bus_release_ep,
@@ -287 +299 @@
  * @return Error code.
  */
-int usb2_bus_init(usb2_bus_t *bus, hcd_t *hcd, size_t available_bandwidth, count_bw_func_t count_bw)
+int usb2_bus_init(usb2_bus_t *bus, size_t available_bandwidth, count_bw_func_t count_bw)
 {
         assert(bus);
 
-        bus_init(&bus->base, hcd);
+        bus_init(&bus->base);
 
         bus->base.ops = usb2_bus_ops;