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

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/lib/net/generic/packet_remote.c

    r37f7cfe ra9b6bec  
    8686        }
    8787       
    88         ipcarg_t result;
     88        sysarg_t result;
    8989        async_wait_for(message, &result);
    9090       
     
    116116        *packet = pm_find(packet_id);
    117117        if (!*packet) {
    118                 ipcarg_t size;
     118                sysarg_t size;
    119119               
    120120                rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
     
    151151    size_t max_prefix, size_t max_suffix)
    152152{
    153         ipcarg_t packet_id;
    154         ipcarg_t size;
     153        sysarg_t packet_id;
     154        sysarg_t size;
    155155        int rc;
    156156       
     
    182182packet_t *packet_get_1_remote(int phone, size_t content)
    183183{
    184         ipcarg_t packet_id;
    185         ipcarg_t size;
     184        sysarg_t packet_id;
     185        sysarg_t size;
    186186        int rc;
    187187       
Note: See TracChangeset for help on using the changeset viewer.