Changes in uspace/lib/usbhost/src/hcd.c [b7fd2a0:f527f58] in mainline

File:

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

uspace/lib/usbhost/src/hcd.c

@@ -49 +49 @@
  * @return Error code.
  */
-static errno_t register_helper(endpoint_t *ep, void *arg)
+static int register_helper(endpoint_t *ep, void *arg)
 {
         hcd_t *hcd = arg;
@@ -102 +102 @@
 }
 
-errno_t 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);
-}
-
-errno_t hcd_release_address(hcd_t *hcd, usb_address_t address)
+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_release_address(hcd_t *hcd, usb_address_t address)
 {
         assert(hcd);
@@ -115 +120 @@
 }
 
-errno_t hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed)
+int hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed)
 {
         assert(hcd);
@@ -122 +127 @@
 }
 
-errno_t hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
+int hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
     usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
     size_t size, usb_address_t tt_address, unsigned tt_port)
@@ -132 +137 @@
 }
 
-errno_t hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir)
+int hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir)
 {
         assert(hcd);
@@ -147 +152 @@
 } toggle_t;
 
-static void toggle_reset_callback(errno_t retval, void *arg)
+static void toggle_reset_callback(int retval, void *arg)
 {
         assert(arg);
@@ -172 +177 @@
  * @return Error code.
  */
-errno_t hcd_send_batch(
+int hcd_send_batch(
     hcd_t *hcd, usb_target_t target, usb_direction_t direction,
     void *data, size_t size, uint64_t setup_data,
@@ -232 +237 @@
         }
 
-        const errno_t ret = hcd->ops.schedule(hcd, batch);
+        const int ret = hcd->ops.schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_destroy(batch);
@@ -244 +249 @@
 typedef struct {
         volatile unsigned done;
-        errno_t ret;
+        int ret;
         size_t size;
 } sync_data_t;
 
-static void transfer_in_cb(errno_t ret, size_t size, void* data)
+static void transfer_in_cb(int ret, size_t size, void* data)
 {
         sync_data_t *d = data;
@@ -257 +262 @@
 }
 
-static void transfer_out_cb(errno_t ret, void* data)
+static void transfer_out_cb(int ret, void* data)
 {
         sync_data_t *d = data;
@@ -266 +271 @@
 
 /** this is really ugly version of sync usb communication */
-errno_t hcd_send_batch_sync(
+ssize_t 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, size_t *out_size)
+    void *data, size_t size, uint64_t setup_data, const char* name)
 {
         assert(hcd);
         sync_data_t sd = { .done = 0, .ret = EBUSY, .size = size };
 
-        const errno_t ret = hcd_send_batch(hcd, target, dir, data, size, setup_data,
+        const int ret = hcd_send_batch(hcd, target, dir, data, size, setup_data,
             dir == USB_DIRECTION_IN ? transfer_in_cb : NULL,
             dir == USB_DIRECTION_OUT ? transfer_out_cb : NULL, &sd, name);
@@ -284 +289 @@
 
         if (sd.ret == EOK)
-                *out_size = sd.size;
+                return sd.size;
         return sd.ret;
 }