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

Changeset a9b6bec in mainline for kernel/generic/src/ipc/event.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/event.c

    r37f7cfe ra9b6bec  
    5757                events[i].answerbox = NULL;
    5858                events[i].counter = 0;
    59                 events[i].method = 0;
     59                events[i].imethod = 0;
    6060        }
    6161}
    6262
    63 static int event_subscribe(event_type_t evno, unative_t method,
     63static int event_subscribe(event_type_t evno, sysarg_t imethod,
    6464    answerbox_t *answerbox)
    6565{
     
    7373        if (events[evno].answerbox == NULL) {
    7474                events[evno].answerbox = answerbox;
    75                 events[evno].method = method;
     75                events[evno].imethod = imethod;
    7676                events[evno].counter = 0;
    7777                res = EOK;
     
    8484}
    8585
    86 unative_t sys_event_subscribe(unative_t evno, unative_t method)
     86sysarg_t sys_event_subscribe(sysarg_t evno, sysarg_t imethod)
    8787{
    88         return (unative_t) event_subscribe((event_type_t) evno, (unative_t)
    89             method, &TASK->answerbox);
     88        return (sysarg_t) event_subscribe((event_type_t) evno, (sysarg_t)
     89            imethod, &TASK->answerbox);
    9090}
    9191
     
    113113                        events[i].answerbox = NULL;
    114114                        events[i].counter = 0;
    115                         events[i].method = 0;
     115                        events[i].imethod = 0;
    116116                }
    117117                spinlock_unlock(&events[i].lock);
     
    119119}
    120120
    121 void event_notify(event_type_t evno, unative_t a1, unative_t a2, unative_t a3,
    122     unative_t a4, unative_t a5)
     121void event_notify(event_type_t evno, sysarg_t a1, sysarg_t a2, sysarg_t a3,
     122    sysarg_t a4, sysarg_t a5)
    123123{
    124124        ASSERT(evno < EVENT_END);
     
    130130                        call->flags |= IPC_CALL_NOTIF;
    131131                        call->priv = ++events[evno].counter;
    132                         IPC_SET_METHOD(call->data, events[evno].method);
     132                        IPC_SET_IMETHOD(call->data, events[evno].imethod);
    133133                        IPC_SET_ARG1(call->data, a1);
    134134                        IPC_SET_ARG2(call->data, a2);
Note: See TracChangeset for help on using the changeset viewer.