Changeset 00aece0 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -271 +271 @@
                         irq_spinlock_unlock(&answer->sender->lock, true);
                         
+                        uintptr_t dst_base = (uintptr_t) -1;
                         int rc = as_area_share(as, IPC_GET_ARG1(*olddata),
-                            IPC_GET_ARG2(*olddata), AS,
-                            IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
+                            IPC_GET_ARG2(*olddata), AS, IPC_GET_ARG3(*olddata),
+                            &dst_base, IPC_GET_ARG1(answer->data));
+                        
+                        if (rc == EOK)
+                                rc = copy_to_uspace((void *) IPC_GET_ARG2(answer->data),
+                                    &dst_base, sizeof(dst_base));
+                        
                         IPC_SET_RETVAL(answer->data, rc);
                         return rc;
                 }
         } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_SHARE_IN) {
-                if (!IPC_GET_RETVAL(answer->data)) { 
+                if (!IPC_GET_RETVAL(answer->data)) {
                         irq_spinlock_lock(&answer->sender->lock, true);
                         as_t *as = answer->sender->as;
                         irq_spinlock_unlock(&answer->sender->lock, true);
                         
+                        uintptr_t dst_base = (uintptr_t) -1;
                         int rc = as_area_share(AS, IPC_GET_ARG1(answer->data),
-                            IPC_GET_ARG2(*olddata), as, IPC_GET_ARG1(*olddata),
-                            IPC_GET_ARG2(answer->data));
+                            IPC_GET_ARG1(*olddata), as, IPC_GET_ARG2(answer->data),
+                            &dst_base, IPC_GET_ARG3(answer->data));
+                        IPC_SET_ARG4(answer->data, dst_base);
                         IPC_SET_RETVAL(answer->data, rc);
                 }
@@ -1185 +1193 @@
  *
  */
-sysarg_t sys_register_irq(inr_t inr, devno_t devno, sysarg_t imethod,
+sysarg_t sys_irq_register(inr_t inr, devno_t devno, sysarg_t imethod,
     irq_code_t *ucode)
 {
@@ -1202 +1210 @@
  *
  */
-sysarg_t sys_unregister_irq(inr_t inr, devno_t devno)
+sysarg_t sys_irq_unregister(inr_t inr, devno_t devno)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))