Changeset 56db65d in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2017-10-24T11:06:32Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0206d35

Parents:

894f58c

Message:

usbhost: provide usb_endpoint_desc_t to bus when registering endpoint

This finishes the path of arbitrary information fetched from device all the way down to registering the endpoint in the bus.

File:

• uspace/lib/usbhost/src/bus.c (modified) (4 diffs)

uspace/lib/usbhost/src/bus.c

@@ -66 +66 @@
 }
 
-int bus_add_ep(bus_t *bus, device_t *device, usb_endpoint_t endpoint,
-    usb_direction_t dir, usb_transfer_type_t type, size_t max_packet_size,
-    unsigned packets, size_t size)
+int bus_add_ep(bus_t *bus, device_t *device, const usb_endpoint_desc_t *desc)
 {
         assert(bus);
@@ -78 +76 @@
                 return ENOMEM;
 
-        ep->target = (usb_target_t) {
-                .address = device->address,
-                .endpoint = endpoint,
-        };
-
         ep->device = device;
-        ep->direction = dir;
-        ep->transfer_type = type;
-        ep->max_packet_size = max_packet_size;
-        ep->packets = packets;
-
-        ep->bandwidth = bus_count_bw(ep, size);
-
-        const int err = bus_register_endpoint(bus, ep);
+        const int err = bus_register_endpoint(bus, ep, desc);
 
         /* drop Temporary reference */
@@ -165 +151 @@
 }
 
-int bus_register_endpoint(bus_t *bus, endpoint_t *ep)
+int bus_register_endpoint(bus_t *bus, endpoint_t *ep, const usb_endpoint_desc_t *desc)
 {
         assert(bus);
@@ -174 +160 @@
 
         fibril_mutex_lock(&bus->guard);
-        const int r = bus->ops.register_endpoint(bus, ep);
+        const int r = bus->ops.register_endpoint(bus, ep, desc);
         fibril_mutex_unlock(&bus->guard);