Changeset fc3dfe6d in mainline

Timestamp:

2018-02-11T17:18:17Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

d345ce2

Parents:

239eea41

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-10 22:16:55)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-11 17:18:17)

Message:

usb: fix relying on negative errnos

Location:

uspace/lib/usbhost

Files:

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

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

@@ -157 +157 @@
     usbhc_iface_transfer_callback_t, void *, const char *);
 
-ssize_t bus_device_send_batch_sync(device_t *, usb_target_t,
+errno_t bus_device_send_batch_sync(device_t *, usb_target_t,
     usb_direction_t direction, char *, size_t, uint64_t,
-    const char *);
+    const char *, size_t *);
 
 int bus_endpoint_add(device_t *, const usb_endpoint_descriptors_t *, endpoint_t **);

uspace/lib/usbhost/src/bus.c

@@ -646 +646 @@
  * @param name Communication identifier (for nicer output).
  */
-ssize_t bus_device_send_batch_sync(device_t *device, usb_target_t target,
+errno_t bus_device_send_batch_sync(device_t *device, usb_target_t target,
     usb_direction_t direction, char *data, size_t size, uint64_t setup_data,
-    const char *name)
+    const char *name, size_t *transferred_size)
 {
         sync_data_t sd = { .done = false };
@@ -668 +668 @@
         fibril_mutex_unlock(&sd.done_mtx);
 
-        return (sd.error == EOK)
-                ? (ssize_t) sd.transferred_size
-                : (ssize_t) sd.error;
+        if (transferred_size)
+                *transferred_size = sd.transferred_size;
+
+        return sd.error;
 }
 

uspace/lib/usbhost/src/usb2_bus.c

@@ -140 +140 @@
         usb_log_debug("Device(%d): Setting USB address.", address);
         err = bus_device_send_batch_sync(dev, usb2_default_target, USB_DIRECTION_OUT,
-            NULL, 0, *(uint64_t *)&set_address, "set address");
-        if (err != 0) {
+            NULL, 0, *(uint64_t *)&set_address, "set address", NULL);
+        if (err) {
                 usb_log_error("Device(%d): Failed to set new address: %s.",
                     address, str_error(err));

uspace/lib/usbhost/src/utility.c

@@ -94 +94 @@
 
         usb_log_debug("Requesting first 8B of device descriptor to determine MPS.");
-        ssize_t got = bus_device_send_batch_sync(dev, control_ep, USB_DIRECTION_IN,
-            (char *) &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
-            "read first 8 bytes of dev descriptor");
+        size_t got;
+        const errno_t err = bus_device_send_batch_sync(dev, control_ep,
+            USB_DIRECTION_IN, (char *) &desc, CTRL_PIPE_MIN_PACKET_SIZE,
+            *(uint64_t *)&get_device_desc_8,
+            "read first 8 bytes of dev descriptor", &got);
 
         if (got != CTRL_PIPE_MIN_PACKET_SIZE) {
-                const int err = got < 0 ? got : EOVERFLOW;
                 usb_log_error("Failed to get 8B of dev descr: %s.", str_error(err));
                 return err;
@@ -133 +134 @@
         usb_log_debug("Device(%d): Requesting full device descriptor.",
             device->address);
-        ssize_t got = bus_device_send_batch_sync(device, control_ep, USB_DIRECTION_IN,
-            (char *) desc, sizeof(*desc), *(uint64_t *)&get_device_desc,
-            "read device descriptor");
-
-        if (got < 0)
-                return got;
-
-        return got == sizeof(*desc) ? EOK : EOVERFLOW;
+        size_t got;
+        errno_t err = bus_device_send_batch_sync(device, control_ep,
+            USB_DIRECTION_IN, (char *) desc, sizeof(*desc),
+            *(uint64_t *)&get_device_desc, "read device descriptor", &got);
+
+        if (!err && got != sizeof(*desc))
+                err = EOVERFLOW;
+
+        return err;
 }
 
@@ -164 +166 @@
         usb_log_debug("Device(%d): Requesting hub descriptor.",
             device->address);
-        ssize_t got = bus_device_send_batch_sync(device, control_ep, USB_DIRECTION_IN,
-            (char *) desc, sizeof(*desc), *(uint64_t *)&get_hub_desc,
-            "get hub descriptor");
-
-        if (got < 0)
-                return got;
-
-        return got == sizeof(*desc) ? EOK : EOVERFLOW;
+
+        size_t got;
+        errno_t err = bus_device_send_batch_sync(device, control_ep,
+            USB_DIRECTION_IN, (char *) desc, sizeof(*desc),
+            *(uint64_t *)&get_hub_desc, "get hub descriptor", &got);
+
+        if (!err && got != sizeof(*desc))
+                err = EOVERFLOW;
+
+        return err;
 }