Changeset 68e5406 in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2017-12-10T21:08:11Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

4c6de4f

Parents:

dd8ab1c

Message:

Separate return value from error code in gen_irq_code*() and hcd_send_batch_sync().

File:

• uspace/lib/usbhost/src/hcd.c (modified) (3 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -102 +102 @@
 }
 
-usb_address_t hcd_request_address(hcd_t *hcd, usb_speed_t speed)
-{
-        assert(hcd);
-        usb_address_t address = 0;
-        const int ret = usb_bus_request_address(
-            &hcd->bus, &address, false, speed);
-        if (ret != EOK)
-                return ret;
-        return address;
+int hcd_request_address(hcd_t *hcd, usb_speed_t speed, usb_address_t *address)
+{
+        assert(hcd);
+        return usb_bus_request_address(&hcd->bus, address, false, speed);
 }
 
@@ -271 +266 @@
 
 /** this is really ugly version of sync usb communication */
-ssize_t hcd_send_batch_sync(
+int hcd_send_batch_sync(
     hcd_t *hcd, usb_target_t target, usb_direction_t dir,
-    void *data, size_t size, uint64_t setup_data, const char* name)
+    void *data, size_t size, uint64_t setup_data, const char* name, size_t *out_size)
 {
         assert(hcd);
@@ -289 +284 @@
 
         if (sd.ret == EOK)
-                return sd.size;
+                *out_size = sd.size;
         return sd.ret;
 }