Changeset 5a6cc679 in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/drv/include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -139 +139 @@
 } usb_endpoint_descriptors_t;
 
-extern int usbhc_reserve_default_address(async_exch_t *);
-extern int usbhc_release_default_address(async_exch_t *);
+extern errno_t usbhc_reserve_default_address(async_exch_t *);
+extern errno_t usbhc_release_default_address(async_exch_t *);
 
-extern int usbhc_device_enumerate(async_exch_t *, unsigned, usb_speed_t);
-extern int usbhc_device_remove(async_exch_t *, unsigned);
+extern errno_t usbhc_device_enumerate(async_exch_t *, unsigned, usb_speed_t);
+extern errno_t usbhc_device_remove(async_exch_t *, unsigned);
 
-extern int usbhc_register_endpoint(async_exch_t *, usb_pipe_desc_t *, const usb_endpoint_descriptors_t *);
-extern int usbhc_unregister_endpoint(async_exch_t *, const usb_pipe_desc_t *);
+extern errno_t usbhc_register_endpoint(async_exch_t *, usb_pipe_desc_t *, const usb_endpoint_descriptors_t *);
+extern errno_t usbhc_unregister_endpoint(async_exch_t *, const usb_pipe_desc_t *);
 
-extern int usbhc_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
+extern errno_t usbhc_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
     size_t *);
-extern int usbhc_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *,
+extern errno_t usbhc_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *,
     size_t);
 
 /** Callback for outgoing transfer */
-typedef int (*usbhc_iface_transfer_callback_t)(void *, int, size_t);
+typedef errno_t (*usbhc_iface_transfer_callback_t)(void *, int, size_t);
 
 /** USB device communication interface. */
@@ -166 +166 @@
         int (*unregister_endpoint)(ddf_fun_t *, const usb_pipe_desc_t *);
 
-        int (*read)(ddf_fun_t *, usb_target_t,
+        errno_t (*read)(ddf_fun_t *, usb_target_t,
                 uint64_t, char *, size_t,
                 usbhc_iface_transfer_callback_t, void *);
-        int (*write)(ddf_fun_t *, usb_target_t,
+        errno_t (*write)(ddf_fun_t *, usb_target_t,
                 uint64_t, const char *, size_t,
                 usbhc_iface_transfer_callback_t, void *);