Changeset 9efad54 in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2018-01-06T21:15:48Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

56257ba

Parents:

c901632

Message:

usb: move endpoint descriptor parsing to HC

This better separates responsibilities. Now the device driver does not
care about the contents of an endpoint descriptor, and HC can parse the
values according to device's actual speed.

Currently, it is device driver's responsibility to fetch endpoint
descriptors, map them and register pipes - sending the endpoint
descriptor back to HC. HC then parses it, and fills the pipe
description, which then sends back to device driver. We shall probably
fetch the endpoint descriptor from inside the HC (also fixing the USB
spec violation of communication with EP0).

File:

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

uspace/lib/usbhost/src/bus.c

@@ -128 +128 @@
 }
 
-int bus_endpoint_add(device_t *device, const usb_endpoint_desc_t *desc, endpoint_t **out_ep)
+int bus_endpoint_add(device_t *device, const usb_endpoint_descriptors_t *desc, endpoint_t **out_ep)
 {
         int err;
@@ -134 +134 @@
 
         bus_t *bus = device->bus;
-
-        if (desc->max_packet_size == 0 || desc->packets == 0) {
-                usb_log_warning("Invalid endpoint description (mps %zu, %u packets)", desc->max_packet_size, desc->packets);
-                return EINVAL;
-        }
 
         const bus_ops_t *create_ops = BUS_OPS_LOOKUP(bus->ops, endpoint_create);
@@ -149 +144 @@
                 return ENOMEM;
 
-        /* Temporary reference */
+        /* Bus reference */
         endpoint_add_ref(ep);
+
+        if (ep->max_transfer_size == 0) {
+                usb_log_warning("Invalid endpoint description (mps %zu, "
+                        "%u packets)", ep->max_packet_size, ep->packets_per_uframe);
+                /* Bus reference */
+                endpoint_del_ref(ep);
+                return EINVAL;
+        }
+
+        usb_log_debug("Register endpoint %d:%d %s-%s %zuB.\n",
+            device->address, ep->endpoint,
+            usb_str_transfer_type(ep->transfer_type),
+            usb_str_direction(ep->direction),
+            ep->max_transfer_size);
 
         fibril_mutex_lock(&bus->guard);
@@ -162 +171 @@
         }
 
-        /* Temporary reference */
-        endpoint_del_ref(ep);
         return err;
 }
@@ -193 +200 @@
 {
         assert(ep);
+        assert(ep->device);
+        assert(ep->device->bus);
+        assert(ep->device->bus->ops);
 
         bus_t *bus = endpoint_get_bus(ep);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(ep->device->bus->ops, endpoint_unregister);
-        if (!ops)
-                return ENOTSUP;
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, endpoint_unregister);
+        if (!ops)
+                return ENOTSUP;
+
+        usb_log_debug("Unregister endpoint %d:%d %s-%s %zuB.\n",
+            ep->device->address, ep->endpoint,
+            usb_str_transfer_type(ep->transfer_type),
+            usb_str_direction(ep->direction),
+            ep->max_transfer_size);
 
         fibril_mutex_lock(&bus->guard);