Changes in uspace/lib/drv/generic/remote_usb.c [b7fd2a0:90c340fb] in mainline

File:

• uspace/lib/drv/generic/remote_usb.c (modified) (27 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -79 +79 @@
  * @return Error code.
  */
-errno_t usb_get_my_interface(async_exch_t *exch, int *usb_iface)
+int usb_get_my_interface(async_exch_t *exch, int *usb_iface)
 {
         if (!exch)
                 return EBADMEM;
         sysarg_t iface_no;
-        const errno_t ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_MY_INTERFACE, &iface_no);
         if (ret == EOK && usb_iface)
@@ -99 +99 @@
  *
  */
-errno_t usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
+int usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
 {
         devman_handle_t h = 0;
-        const errno_t ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_MY_DEVICE_HANDLE, &h);
         if (ret == EOK && handle)
@@ -114 +114 @@
  * @return Error code.
  */
-errno_t usb_reserve_default_address(async_exch_t *exch, usb_speed_t speed)
+int usb_reserve_default_address(async_exch_t *exch, usb_speed_t speed)
 {
         if (!exch)
@@ -129 +129 @@
  *
  */
-errno_t usb_release_default_address(async_exch_t *exch)
+int usb_release_default_address(async_exch_t *exch)
 {
         if (!exch)
@@ -145 +145 @@
  *
  */
-errno_t usb_device_enumerate(async_exch_t *exch, unsigned port)
-{
-        if (!exch)
-                return EBADMEM;
-        const errno_t ret = async_req_2_0(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+int usb_device_enumerate(async_exch_t *exch, unsigned port)
+{
+        if (!exch)
+                return EBADMEM;
+        const int ret = async_req_2_0(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_DEVICE_ENUMERATE, port);
         return ret;
@@ -162 +162 @@
  *
  */
-errno_t usb_device_remove(async_exch_t *exch, unsigned port)
+int usb_device_remove(async_exch_t *exch, unsigned port)
 {
         if (!exch)
@@ -177 +177 @@
 } pack8_t;
 
-errno_t usb_register_endpoint(async_exch_t *exch, usb_endpoint_t endpoint,
+int usb_register_endpoint(async_exch_t *exch, usb_endpoint_t endpoint,
     usb_transfer_type_t type, usb_direction_t direction,
     size_t mps, unsigned packets, unsigned interval)
@@ -194 +194 @@
 }
 
-errno_t usb_unregister_endpoint(async_exch_t *exch, usb_endpoint_t endpoint,
+int usb_unregister_endpoint(async_exch_t *exch, usb_endpoint_t endpoint,
     usb_direction_t direction)
 {
@@ -203 +203 @@
 }
 
-errno_t usb_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
+int usb_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
     void *data, size_t size, size_t *rec_size)
 {
@@ -233 +233 @@
 
         /* Wait for the answer. */
-        errno_t data_request_rc;
-        errno_t opening_request_rc;
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -241 +241 @@
                 /* Prefer the return code of the opening request. */
                 if (opening_request_rc != EOK) {
-                        return (errno_t) opening_request_rc;
+                        return (int) opening_request_rc;
                 } else {
-                        return (errno_t) data_request_rc;
+                        return (int) data_request_rc;
                 }
         }
         if (opening_request_rc != EOK) {
-                return (errno_t) opening_request_rc;
+                return (int) opening_request_rc;
         }
 
@@ -254 +254 @@
 }
 
-errno_t usb_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
+int usb_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,
     const void *data, size_t size)
 {
@@ -273 +273 @@
         /* Send the data if any. */
         if (size > 0) {
-                const errno_t ret = async_data_write_start(exch, data, size);
+                const int ret = async_data_write_start(exch, data, size);
                 if (ret != EOK) {
                         async_forget(opening_request);
@@ -281 +281 @@
 
         /* Wait for the answer. */
-        errno_t opening_request_rc;
+        sysarg_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
 
-        return (errno_t) opening_request_rc;
+        return (int) opening_request_rc;
 }
 
@@ -330 +330 @@
 
         int iface_no;
-        const errno_t ret = usb_iface->get_my_interface(fun, &iface_no);
+        const int ret = usb_iface->get_my_interface(fun, &iface_no);
         if (ret != EOK) {
                 async_answer_0(callid, ret);
@@ -349 +349 @@
 
         devman_handle_t handle;
-        const errno_t ret = usb_iface->get_my_device_handle(fun, &handle);
+        const int ret = usb_iface->get_my_device_handle(fun, &handle);
         if (ret != EOK) {
                 async_answer_0(callid, ret);
@@ -368 +368 @@
 
         usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
-        const errno_t ret = usb_iface->reserve_default_address(fun, speed);
+        const int ret = usb_iface->reserve_default_address(fun, speed);
         async_answer_0(callid, ret);
 }
@@ -382 +382 @@
         }
 
-        const errno_t ret = usb_iface->release_default_address(fun);
+        const int ret = usb_iface->release_default_address(fun);
         async_answer_0(callid, ret);
 }
@@ -397 +397 @@
 
         const unsigned port = DEV_IPC_GET_ARG1(*call);
-        const errno_t ret = usb_iface->device_enumerate(fun, port);
+        const int ret = usb_iface->device_enumerate(fun, port);
         async_answer_0(callid, ret);
 }
@@ -412 +412 @@
 
         const unsigned port = DEV_IPC_GET_ARG1(*call);
-        const errno_t ret = usb_iface->device_remove(fun, port);
+        const int ret = usb_iface->device_remove(fun, port);
         async_answer_0(callid, ret);
 }
@@ -435 +435 @@
         unsigned interval = pack.arr[3];
 
-        const errno_t ret = usb_iface->register_endpoint(fun, endpoint,
+        const int ret = usb_iface->register_endpoint(fun, endpoint,
             transfer_type, direction, max_packet_size, packets, interval);
 
@@ -454 +454 @@
         usb_direction_t direction = (usb_direction_t) DEV_IPC_GET_ARG2(*call);
 
-        errno_t rc = usb_iface->unregister_endpoint(fun, endpoint, direction);
+        int rc = usb_iface->unregister_endpoint(fun, endpoint, direction);
 
         async_answer_0(callid, rc);
@@ -491 +491 @@
 }
 
-static void callback_out(errno_t outcome, void *arg)
+static void callback_out(int outcome, void *arg)
 {
         async_transaction_t *trans = arg;
@@ -500 +500 @@
 }
 
-static void callback_in(errno_t outcome, size_t actual_size, void *arg)
+static void callback_in(int outcome, size_t actual_size, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
@@ -563 +563 @@
         }
 
-        const errno_t rc = usb_iface->read(
+        const int rc = usb_iface->read(
             fun, ep, setup, trans->buffer, size, callback_in, trans);
 
@@ -601 +601 @@
         size_t size = 0;
         if (data_buffer_len > 0) {
-                const errno_t rc = async_data_write_accept(&trans->buffer, false,
+                const int rc = async_data_write_accept(&trans->buffer, false,
                     1, data_buffer_len, 0, &size);
 
@@ -611 +611 @@
         }
 
-        const errno_t rc = usb_iface->write(
+        const int rc = usb_iface->write(
             fun, ep, setup, trans->buffer, size, callback_out, trans);