Changes in uspace/lib/drv/generic/remote_usbhc.c [99172baf:50b581d] in mainline

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (20 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -37 +37 @@
 #include <errno.h>
 #include <assert.h>
-#include <macros.h>
 
 #include "usbhc_iface.h"
@@ -166 +165 @@
 {
         if (!exch || !address)
-                return EBADMEM;
+                return EINVAL;
         sysarg_t new_address;
         const int ret = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
@@ -174 +173 @@
         return ret;
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_bind_address(async_exch_t *exch, usb_address_t address,
     devman_handle_t handle)
 {
         if (!exch)
-                return EBADMEM;
+                return EINVAL;
         return async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_BIND_ADDRESS, address, handle);
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_get_handle(async_exch_t *exch, usb_address_t address,
     devman_handle_t *handle)
 {
         if (!exch)
-                return EBADMEM;
+                return EINVAL;
         sysarg_t h;
         const int ret = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
@@ -196 +195 @@
         return ret;
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_release_address(async_exch_t *exch, usb_address_t address)
 {
         if (!exch)
-                return EBADMEM;
+                return EINVAL;
         return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_register_endpoint(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, usb_transfer_type_t type,
@@ -210 +209 @@
 {
         if (!exch)
-                return EBADMEM;
+                return EINVAL;
         const usb_target_t target =
             {{ .address = address, .endpoint = endpoint }};
@@ -221 +220 @@
 #undef _PACK2
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_unregister_endpoint(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, usb_direction_t direction)
 {
         if (!exch)
-                return EBADMEM;
+                return EINVAL;
         return async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_UNREGISTER_ENDPOINT, address, endpoint, direction);
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_read(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size,
     size_t *rec_size)
 {
-        if (!exch)
-                return EBADMEM;
-
         if (size == 0 && setup == 0)
                 return EOK;
 
+        if (!exch)
+                return EINVAL;
         const usb_target_t target =
             {{ .address = address, .endpoint = endpoint }};
@@ -286 +284 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 int usbhc_write(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size)
 {
-        if (!exch)
-                return EBADMEM;
-
         if (size == 0 && setup == 0)
                 return EOK;
 
+        if (!exch)
+                return EINVAL;
         const usb_target_t target =
             {{ .address = address, .endpoint = endpoint }};
@@ -322 +319 @@
         return (int) opening_request_rc;
 }
-
+/*----------------------------------------------------------------------------*/
 
 static void remote_usbhc_request_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -335 +332 @@
 
 /** Remote USB host controller interface operations. */
-static const remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
+static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
         [IPC_M_USBHC_REQUEST_ADDRESS] = remote_usbhc_request_address,
         [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
@@ -350 +347 @@
 /** Remote USB host controller interface structure.
  */
-const remote_iface_t remote_usbhc_iface = {
-        .method_count = ARRAY_SIZE(remote_usbhc_iface_ops),
+remote_iface_t remote_usbhc_iface = {
+        .method_count = sizeof(remote_usbhc_iface_ops) /
+            sizeof(remote_usbhc_iface_ops[0]),
         .methods = remote_usbhc_iface_ops
 };
@@ -363 +361 @@
 static void async_transaction_destroy(async_transaction_t *trans)
 {
-        if (trans == NULL)
-                return;
-        
-        if (trans->buffer != NULL)
+        if (trans == NULL) {
+                return;
+        }
+        if (trans->buffer != NULL) {
                 free(trans->buffer);
-        
+        }
+
         free(trans);
 }
@@ -385 +384 @@
         return trans;
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_request_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -407 +406 @@
         }
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_bind_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -424 +423 @@
         async_answer_0(callid, ret);
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_get_handle(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -445 +444 @@
         }
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_release_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -461 +460 @@
         async_answer_0(callid, ret);
 }
-
+/*----------------------------------------------------------------------------*/
 static void callback_out(ddf_fun_t *fun,
     int outcome, void *arg)
@@ -471 +470 @@
         async_transaction_destroy(trans);
 }
-
+/*----------------------------------------------------------------------------*/
 static void callback_in(ddf_fun_t *fun,
     int outcome, size_t actual_size, void *arg)
@@ -495 +494 @@
         async_transaction_destroy(trans);
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_register_endpoint(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -584 +583 @@
                 async_answer_0(callid, ENOMEM);
                 async_transaction_destroy(trans);
-                return;
         }
 
@@ -596 +594 @@
         }
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_write(
     ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)