Changes in kernel/generic/src/ipc/sysipc.c [a53ed3a:cde999a] in mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (29 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -158 +158 @@
  *
  */
-errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
-{
-        errno_t rc = EOK;
+int answer_preprocess(call_t *answer, ipc_data_t *olddata)
+{
+        int rc = EOK;
 
         spinlock_lock(&answer->forget_lock);
@@ -194 +194 @@
         spinlock_unlock(&answer->forget_lock);
 
-        if ((errno_t) IPC_GET_RETVAL(answer->data) == EHANGUP) {
+        if ((int) IPC_GET_RETVAL(answer->data) == EHANGUP) {
                 phone_t *phone = answer->caller_phone;
                 mutex_lock(&phone->lock);
@@ -222 +222 @@
  *
  */
-static errno_t request_preprocess(call_t *call, phone_t *phone)
+static int request_preprocess(call_t *call, phone_t *phone)
 {
         call->request_method = IPC_GET_IMETHOD(call->data);
@@ -239 +239 @@
 static void process_answer(call_t *call)
 {
-        if (((errno_t) IPC_GET_RETVAL(call->data) == EHANGUP) &&
+        if (((int) IPC_GET_RETVAL(call->data) == EHANGUP) &&
             (call->flags & IPC_CALL_FORWARDED))
                 IPC_SET_RETVAL(call->data, EFORWARD);
@@ -271 +271 @@
  *
  */
-errno_t ipc_req_internal(cap_handle_t handle, ipc_data_t *data, sysarg_t priv)
+int ipc_req_internal(cap_handle_t handle, ipc_data_t *data, sysarg_t priv)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -281 +281 @@
         memcpy(call->data.args, data->args, sizeof(data->args));
         
-        errno_t rc = request_preprocess(call, kobj->phone);
+        int rc = request_preprocess(call, kobj->phone);
         if (!rc) {
 #ifdef CONFIG_UDEBUG
@@ -362 +362 @@
  *
  */
-sys_errno_t sys_ipc_call_async_fast(sysarg_t handle, sysarg_t imethod,
+sysarg_t sys_ipc_call_async_fast(sysarg_t handle, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t label)
 {
@@ -389 +389 @@
         call->data.label = label;
         
-        errno_t res = request_preprocess(call, kobj->phone);
+        int res = request_preprocess(call, kobj->phone);
         
         if (!res)
@@ -409 +409 @@
  *
  */
-sys_errno_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data,
+sysarg_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data,
     sysarg_t label)
 {
@@ -422 +422 @@
 
         call_t *call = ipc_call_alloc(0);
-        errno_t rc = copy_from_uspace(&call->data.args, &data->args,
+        int rc = copy_from_uspace(&call->data.args, &data->args,
             sizeof(call->data.args));
-        if (rc != EOK) {
+        if (rc != 0) {
                 kobject_put(call->kobject);
                 kobject_put(kobj);
-                return (sys_errno_t) rc;
+                return (sysarg_t) rc;
         }
 
@@ -433 +433 @@
         call->data.label = label;
         
-        errno_t res = request_preprocess(call, kobj->phone);
+        int res = request_preprocess(call, kobj->phone);
         
         if (!res)
@@ -466 +466 @@
  *
  */
-static sys_errno_t sys_ipc_forward_common(sysarg_t chandle, sysarg_t phandle,
+static sysarg_t sys_ipc_forward_common(sysarg_t chandle, sysarg_t phandle,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
@@ -482 +482 @@
         
         bool after_forward = false;
-        errno_t rc;
+        int rc;
 
         kobject_t *pkobj = kobject_get(TASK, phandle, KOBJECT_TYPE_PHONE);
@@ -577 +577 @@
  *
  */
-sys_errno_t sys_ipc_forward_fast(sysarg_t chandle, sysarg_t phandle,
+sysarg_t sys_ipc_forward_fast(sysarg_t chandle, sysarg_t phandle,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
@@ -601 +601 @@
  *
  */
-sys_errno_t sys_ipc_forward_slow(sysarg_t chandle, sysarg_t phandle,
+sysarg_t sys_ipc_forward_slow(sysarg_t chandle, sysarg_t phandle,
     ipc_data_t *data, unsigned int mode)
 {
         ipc_data_t newdata;
-        errno_t rc = copy_from_uspace(&newdata.args, &data->args,
+        int rc = copy_from_uspace(&newdata.args, &data->args,
             sizeof(newdata.args));
-        if (rc != EOK)
-                return (sys_errno_t) rc;
+        if (rc != 0)
+                return (sysarg_t) rc;
         
         return sys_ipc_forward_common(chandle, phandle,
@@ -631 +631 @@
  *
  */
-sys_errno_t sys_ipc_answer_fast(sysarg_t chandle, sysarg_t retval, sysarg_t arg1,
+sysarg_t sys_ipc_answer_fast(sysarg_t chandle, sysarg_t retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
@@ -660 +660 @@
          */
         IPC_SET_ARG5(call->data, 0);
-        errno_t rc = answer_preprocess(call, saved ? &saved_data : NULL);
+        int rc = answer_preprocess(call, saved ? &saved_data : NULL);
         
         ipc_answer(&TASK->answerbox, call);
@@ -678 +678 @@
  *
  */
-sys_errno_t sys_ipc_answer_slow(sysarg_t chandle, ipc_data_t *data)
+sysarg_t sys_ipc_answer_slow(sysarg_t chandle, ipc_data_t *data)
 {
         kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -695 +695 @@
                 saved = false;
         
-        errno_t rc = copy_from_uspace(&call->data.args, &data->args, 
+        int rc = copy_from_uspace(&call->data.args, &data->args, 
             sizeof(call->data.args));
-        if (rc != EOK) {
+        if (rc != 0) {
                 /*
                  * Republish the capability so that the call does not get lost.
@@ -722 +722 @@
  *
  */
-sys_errno_t sys_ipc_hangup(sysarg_t handle)
+sysarg_t sys_ipc_hangup(sysarg_t handle)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -728 +728 @@
                 return ENOENT;
         
-        errno_t rc = ipc_phone_hangup(kobj->phone);
+        int rc = ipc_phone_hangup(kobj->phone);
         kobject_put(kobj);
         return rc;
@@ -742 +742 @@
  * @return An error code on error.
  */
-sys_errno_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
+sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -800 +800 @@
         
         cap_handle_t handle;
-        errno_t rc = cap_alloc(TASK, &handle);
+        int rc = cap_alloc(TASK, &handle);
         if (rc != EOK) {
                 goto error;
@@ -848 +848 @@
  *
  */
-sys_errno_t sys_ipc_poke(void)
+sysarg_t sys_ipc_poke(void)
 {
         waitq_unsleep(&TASK->answerbox.wq);
@@ -866 +866 @@
  *
  */
-sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode,
+sysarg_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode,
         cap_handle_t *uspace_handle)
 {
@@ -883 +883 @@
  *
  */
-sys_errno_t sys_ipc_irq_unsubscribe(sysarg_t cap)
+sysarg_t sys_ipc_irq_unsubscribe(sysarg_t cap)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
@@ -898 +898 @@
  *
  */
-sys_errno_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
+sysarg_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
@@ -904 +904 @@
         cap_handle_t phone;
         
-        errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));
         if (rc == EOK) {
                 rc = ipc_connect_kbox((task_id_t) taskid, &phone);
@@ -917 +917 @@
         }
         
-        return (sys_errno_t) rc;
+        return (sysarg_t) rc;
 #else
-        return (sys_errno_t) ENOTSUP;
+        return (sysarg_t) ENOTSUP;
 #endif
 }