Changeset 5a6cc679 in mainline for uspace/lib/drv/generic/remote_usbhc.c

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/generic/remote_usbhc.c (modified) (15 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -104 +104 @@
  *
  */
-int usbhc_device_remove(async_exch_t *exch, unsigned port)
+errno_t usbhc_device_remove(async_exch_t *exch, unsigned port)
 {
         if (!exch)
@@ -112 +112 @@
 }
 
-int usbhc_register_endpoint(async_exch_t *exch, usb_pipe_desc_t *pipe_desc,
+errno_t usbhc_register_endpoint(async_exch_t *exch, usb_pipe_desc_t *pipe_desc,
     const usb_endpoint_descriptors_t *desc)
 {
@@ -153 +153 @@
 }
 
-int usbhc_unregister_endpoint(async_exch_t *exch, const usb_pipe_desc_t *pipe_desc)
+errno_t usbhc_unregister_endpoint(async_exch_t *exch, const usb_pipe_desc_t *pipe_desc)
 {
         if (!exch)
@@ -178 +178 @@
 }
 
-int usbhc_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
+errno_t usbhc_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
     void *data, size_t size, size_t *rec_size)
 {
@@ -208 +208 @@
 
         /* Wait for the answer. */
-        int data_request_rc;
-        int opening_request_rc;
+        errno_t data_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -216 +216 @@
                 /* Prefer the return code of the opening request. */
                 if (opening_request_rc != EOK) {
-                        return (int) opening_request_rc;
+                        return (errno_t) opening_request_rc;
                 } else {
-                        return (int) data_request_rc;
+                        return (errno_t) data_request_rc;
                 }
         }
         if (opening_request_rc != EOK) {
-                return (int) opening_request_rc;
+                return (errno_t) opening_request_rc;
         }
 
@@ -229 +229 @@
 }
 
-int usbhc_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
+errno_t usbhc_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
     const void *data, size_t size)
 {
@@ -248 +248 @@
         /* Send the data if any. */
         if (size > 0) {
-                const int ret = async_data_write_start(exch, data, size);
+                const errno_t ret = async_data_write_start(exch, data, size);
                 if (ret != EOK) {
                         async_forget(opening_request);
@@ -256 +256 @@
 
         /* Wait for the answer. */
-        int opening_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
 
-        return (int) opening_request_rc;
+        return (errno_t) opening_request_rc;
 }
 
@@ -433 +433 @@
 }
 
-static int callback_out(void *arg, int error, size_t transferred_size)
+static errno_t callback_out(void *arg, int error, size_t transferred_size)
 {
         async_transaction_t *trans = arg;
 
-        const int err = async_answer_0(trans->caller, error);
+        const errno_t err = async_answer_0(trans->caller, error);
 
         async_transaction_destroy(trans);
@@ -444 +444 @@
 }
 
-static int callback_in(void *arg, int error, size_t transferred_size)
+static errno_t callback_in(void *arg, int error, size_t transferred_size)
 {
         async_transaction_t *trans = arg;
@@ -457 +457 @@
         }
 
-        const int err = async_answer_0(trans->caller, error);
+        const errno_t err = async_answer_0(trans->caller, error);
         async_transaction_destroy(trans);
         return err;
@@ -507 +507 @@
         }};
 
-        const int rc = usbhc_iface->read(
+        const errno_t rc = usbhc_iface->read(
             fun, target, setup, trans->buffer, size, callback_in, trans);
 
@@ -545 +545 @@
         size_t size = 0;
         if (data_buffer_len > 0) {
-                const int rc = async_data_write_accept(&trans->buffer, false,
+                const errno_t rc = async_data_write_accept(&trans->buffer, false,
                     1, data_buffer_len, 0, &size);
 
@@ -562 +562 @@
         }};
 
-        const int rc = usbhc_iface->write(
+        const errno_t rc = usbhc_iface->write(
             fun, target, setup, trans->buffer, size, callback_out, trans);