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

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

    r37f7cfe ra9b6bec  
    7878        }
    7979       
    80         ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
     80        ipc_answer_2(callid, EOK, (sysarg_t) *addr, AS_AREA_READ);
    8181}
    8282
     
    135135               
    136136                task_id_t id;
    137                 ipcarg_t retval;
    138                
    139                 switch (IPC_GET_METHOD(call)) {
     137                sysarg_t retval;
     138               
     139                switch (IPC_GET_IMETHOD(call)) {
    140140                case IPC_M_SHARE_IN:
    141141                        switch (IPC_GET_ARG3(call)) {
Note: See TracChangeset for help on using the changeset viewer.