Changeset 973ef9fc in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/ipc.c (modified) (8 diffs)

kernel/generic/src/ipc/ipc.c

@@ -270 +270 @@
  *
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err)
+void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
         call->data.phone = phone;
@@ -367 +367 @@
                 
                 call_t *call = ipc_call_alloc(0);
-                IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
+                IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                 call->flags |= IPC_CALL_DISCARD_ANSWER;
                 _ipc_call(phone, box, call);
@@ -547 +547 @@
                          * disconnected.
                          */
-                        IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
+                        IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                         call->flags |= IPC_CALL_DISCARD_ANSWER;
                         _ipc_call(phone, box, call);
@@ -655 +655 @@
                     (call->flags & IPC_CALL_NOTIF));
                 
-                /*
-                 * Record the receipt of this call in the current task's counter
-                 * of active calls. IPC_M_PHONE_HUNGUP calls do not contribute
-                 * to this counter so do not record answers to them either.
-                 */
-                if (!(call->flags & IPC_CALL_DISCARD_ANSWER))
-                        atomic_dec(&TASK->active_calls);
-                
                 ipc_call_free(call);
         }
@@ -702 +694 @@
         for (i = 0; i < IPC_MAX_PHONES; i++) {
                 if (SYNCH_FAILED(mutex_trylock(&task->phones[i].lock))) {
-                        printf("%d: mutex busy\n", i);
+                        printf("%zu: mutex busy\n", i);
                         continue;
                 }
                 
                 if (task->phones[i].state != IPC_PHONE_FREE) {
-                        printf("%" PRIs ": ", i);
+                        printf("%zu: ", i);
                         
                         switch (task->phones[i].state) {
@@ -749 +741 @@
                     " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
                     call->sender->taskid,
-                    IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
+                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
@@ -765 +757 @@
                     " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
                     call->sender->taskid,
-                    IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
+                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
@@ -779 +771 @@
                 printf("Callid:%p M:%" PRIun " A1:%" PRIun " A2:%" PRIun
                     " A3:%" PRIun " A4:%" PRIun " A5:%" PRIun " Flags:%x\n",
-                    call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
+                    call, IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),