Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 4ca28512 in mainline


Ignore:
Timestamp:
2009-11-19T21:08:45Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
c70ce74
Parents:
35bb2e7
Message:

Remove ipc_call_static_init() and IPC_CALL_STATIC_ALLOC.

Location:
kernel/generic
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/ipc/ipc.h

    r35bb2e7 r4ca28512  
    5151/** This is answer to a call */
    5252#define IPC_CALL_ANSWERED       (1 << 0)
    53 /** This call will not be freed on error */
    54 #define IPC_CALL_STATIC_ALLOC   (1 << 1)
    5553/** Answer will not be passed to userspace, will be discarded */
    56 #define IPC_CALL_DISCARD_ANSWER (1 << 2)
     54#define IPC_CALL_DISCARD_ANSWER (1 << 1)
    5755/** Call was forwarded */
    58 #define IPC_CALL_FORWARDED      (1 << 3)
     56#define IPC_CALL_FORWARDED      (1 << 2)
    5957/** Identify connect_me_to answer */
    60 #define IPC_CALL_CONN_ME_TO     (1 << 4)
     58#define IPC_CALL_CONN_ME_TO     (1 << 3)
    6159/** Interrupt notification */
    62 #define IPC_CALL_NOTIF          (1 << 5)
     60#define IPC_CALL_NOTIF          (1 << 4)
    6361
    6462/*
     
    326324extern call_t * ipc_call_alloc(int);
    327325extern void ipc_answerbox_init(answerbox_t *, struct task *);
    328 extern void ipc_call_static_init(call_t *);
    329326extern void task_print_list(void);
    330327extern int ipc_forward(call_t *, phone_t *, answerbox_t *, int);
  • kernel/generic/src/ipc/ipc.c

    r35bb2e7 r4ca28512  
    9696}
    9797
    98 /** Initialize a statically allocated call structure.
    99  *
    100  * @param call          Statically allocated kernel call structure to be
    101  *                      initialized.
    102  */
    103 void ipc_call_static_init(call_t *call)
    104 {
    105         _ipc_call_init(call);
    106         call->flags |= IPC_CALL_STATIC_ALLOC;
    107 }
    108 
    10998/** Deallocate a call structure.
    11099 *
     
    113102void ipc_call_free(call_t *call)
    114103{
    115         ASSERT(!(call->flags & IPC_CALL_STATIC_ALLOC));
    116104        /* Check to see if we have data in the IPC_M_DATA_SEND buffer. */
    117105        if (call->buffer)
     
    574562                ASSERT((call->flags & IPC_CALL_ANSWERED) ||
    575563                    (call->flags & IPC_CALL_NOTIF));
    576                 ASSERT(!(call->flags & IPC_CALL_STATIC_ALLOC));
    577564               
    578565                /*
  • kernel/generic/src/ipc/sysipc.c

    r35bb2e7 r4ca28512  
    10001000
    10011001        if (call->flags & IPC_CALL_NOTIF) {
    1002                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
    1003 
    10041002                /* Set in_phone_hash to the interrupt counter */
    10051003                call->data.phone = (void *) call->priv;
     
    10141012        if (call->flags & IPC_CALL_ANSWERED) {
    10151013                process_answer(call);
    1016 
    1017                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
    10181014
    10191015                if (call->flags & IPC_CALL_DISCARD_ANSWER) {
Note: See TracChangeset for help on using the changeset viewer.