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

Timestamp:

2017-10-30T22:18:28Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17873ac7

Parents:

ef1a3a8

Message:

uhci: fixed buffer copying on IN transaction

Lost in some refactoring, masked by deadlock.

File:

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

uspace/lib/usbhost/src/bus.c

@@ -36 +36 @@
 #include <usb/host/bus.h>
 #include <usb/host/endpoint.h>
+#include <usb/debug.h>
 #include <ddf/driver.h>
 
@@ -127 +128 @@
 int bus_add_endpoint(bus_t *bus, device_t *device, const usb_endpoint_desc_t *desc, endpoint_t **out_ep)
 {
+        assert(bus);
+        assert(device);
+
+        fibril_mutex_lock(&bus->guard);
+
+        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;
+        }
+
         int err = ENOMEM;
-
-        assert(bus);
-        assert(device);
-
-        fibril_mutex_lock(&bus->guard);
-
         endpoint_t *ep = bus->ops.create_endpoint(bus);
         if (!ep)