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

Changeset a9b6bec in mainline for uspace/srv/loader/main.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
  • uspace/srv/loader/main.c

    r37f7cfe ra9b6bec  
    383383                callid = async_get_call(&call);
    384384               
    385                 switch (IPC_GET_METHOD(call)) {
     385                switch (IPC_GET_IMETHOD(call)) {
    386386                case IPC_M_PHONE_HUNGUP:
    387387                        exit(0);
     
    411411                        break;
    412412                }
    413                 if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
     413                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
    414414                        DPRINTF("Responding EINVAL to method %d.\n",
    415                             IPC_GET_METHOD(call));
     415                            IPC_GET_IMETHOD(call));
    416416                        ipc_answer_0(callid, EINVAL);
    417417                }
     
    423423int main(int argc, char *argv[])
    424424{
    425         ipcarg_t phonead;
     425        sysarg_t phonead;
    426426        task_id_t id;
    427427        int rc;
Note: See TracChangeset for help on using the changeset viewer.