Changeset 4ca28512 in mainline

Timestamp:

2009-11-19T21:08:45Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c70ce74

Parents:

35bb2e7

Message:

Remove ipc_call_static_init() and IPC_CALL_STATIC_ALLOC.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (3 diffs)
• src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -51 +51 @@
 /** This is answer to a call */
 #define IPC_CALL_ANSWERED       (1 << 0)
-/** This call will not be freed on error */
-#define IPC_CALL_STATIC_ALLOC   (1 << 1)
 /** Answer will not be passed to userspace, will be discarded */
-#define IPC_CALL_DISCARD_ANSWER (1 << 2)
+#define IPC_CALL_DISCARD_ANSWER (1 << 1)
 /** Call was forwarded */
-#define IPC_CALL_FORWARDED      (1 << 3)
+#define IPC_CALL_FORWARDED      (1 << 2)
 /** Identify connect_me_to answer */
-#define IPC_CALL_CONN_ME_TO     (1 << 4)
+#define IPC_CALL_CONN_ME_TO     (1 << 3)
 /** Interrupt notification */
-#define IPC_CALL_NOTIF          (1 << 5)
+#define IPC_CALL_NOTIF          (1 << 4)
 
 /*
@@ -326 +324 @@
 extern call_t * ipc_call_alloc(int);
 extern void ipc_answerbox_init(answerbox_t *, struct task *);
-extern void ipc_call_static_init(call_t *);
 extern void task_print_list(void);
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, int);

kernel/generic/src/ipc/ipc.c

@@ -96 +96 @@
 }
 
-/** Initialize a statically allocated call structure.
- *
- * @param call          Statically allocated kernel call structure to be
- *                      initialized.
- */
-void ipc_call_static_init(call_t *call)
-{
-        _ipc_call_init(call);
-        call->flags |= IPC_CALL_STATIC_ALLOC;
-}
-
 /** Deallocate a call structure.
  *
@@ -113 +102 @@
 void ipc_call_free(call_t *call)
 {
-        ASSERT(!(call->flags & IPC_CALL_STATIC_ALLOC));
         /* Check to see if we have data in the IPC_M_DATA_SEND buffer. */
         if (call->buffer)
@@ -574 +562 @@
                 ASSERT((call->flags & IPC_CALL_ANSWERED) ||
                     (call->flags & IPC_CALL_NOTIF));
-                ASSERT(!(call->flags & IPC_CALL_STATIC_ALLOC));
                 
                 /*

kernel/generic/src/ipc/sysipc.c

@@ -1000 +1000 @@
 
         if (call->flags & IPC_CALL_NOTIF) {
-                ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
-
                 /* Set in_phone_hash to the interrupt counter */
                 call->data.phone = (void *) call->priv;
@@ -1014 +1012 @@
         if (call->flags & IPC_CALL_ANSWERED) {
                 process_answer(call);
-
-                ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
 
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {