Changes in kernel/generic/src/ipc/sysipc.c [fafb8e5:5a5269d] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -419 +419 @@
  *
  */
-sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, ipc_data_t *data,
+sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, uspace_ptr_ipc_data_t data,
     sysarg_t label)
 {
@@ -437 +437 @@
         }
 
-        errno_t rc = copy_from_uspace(&call->data.args, &data->args,
+        errno_t rc = copy_from_uspace(&call->data.args, data + offsetof(ipc_data_t, args),
             sizeof(call->data.args));
         if (rc != EOK) {
@@ -623 +623 @@
  */
 sys_errno_t sys_ipc_forward_slow(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, ipc_data_t *data, unsigned int mode)
+    cap_phone_handle_t phandle, uspace_ptr_ipc_data_t data, unsigned int mode)
 {
         ipc_data_t newdata;
-        errno_t rc = copy_from_uspace(&newdata.args, &data->args,
+        errno_t rc = copy_from_uspace(&newdata.args, data + offsetof(ipc_data_t, args),
             sizeof(newdata.args));
         if (rc != EOK)
@@ -700 +700 @@
  *
  */
-sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, ipc_data_t *data)
+sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, uspace_ptr_ipc_data_t data)
 {
         kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -718 +718 @@
                 saved = false;
 
-        errno_t rc = copy_from_uspace(&call->data.args, &data->args,
+        errno_t rc = copy_from_uspace(&call->data.args, data + offsetof(ipc_data_t, args),
             sizeof(call->data.args));
         if (rc != EOK) {
@@ -766 +766 @@
  * @return An error code on error.
  */
-sys_errno_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
+sys_errno_t sys_ipc_wait_for_call(uspace_ptr_ipc_data_t calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -888 +888 @@
  */
 sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod,
-    irq_code_t *ucode, cap_irq_handle_t *uspace_handle)
+    uspace_ptr_irq_code_t ucode, uspace_ptr_cap_irq_handle_t uspace_handle)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
@@ -918 +918 @@
  *
  */
-sys_errno_t sys_ipc_connect_kbox(task_id_t *uspace_taskid,
-    cap_phone_handle_t *uspace_phone)
+sys_errno_t sys_ipc_connect_kbox(uspace_ptr_task_id_t uspace_taskid,
+    uspace_ptr_cap_phone_handle_t uspace_phone)
 {
 #ifdef CONFIG_UDEBUG