Changeset 357b5f5 in mainline for uspace/lib/net/il/arp_remote.c


Ignore:
Timestamp:
2011-01-23T20:09:13Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fdb9982c
Parents:
cead2aa (diff), 7e36c8d (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/il/arp_remote.c

    rcead2aa r357b5f5  
    8686{
    8787        aid_t message_id;
    88         ipcarg_t result;
     88        sysarg_t result;
    8989
    9090        message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
    91             (ipcarg_t) device_id, protocol, NULL);
     91            (sysarg_t) device_id, protocol, NULL);
    9292        measured_strings_send(arp_phone, address, 1);
    9393        async_wait_for(message_id, &result);
     
    106106{
    107107        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
    108             (ipcarg_t) device_id);
     108            (sysarg_t) device_id);
    109109}
    110110
     
    136136{
    137137        aid_t message_id;
    138         ipcarg_t result;
     138        sysarg_t result;
    139139
    140140        message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
    141             (ipcarg_t) device_id, protocol, netif, NULL);
     141            (sysarg_t) device_id, protocol, netif, NULL);
    142142        measured_strings_send(arp_phone, address, 1);
    143143        async_wait_for(message_id, &result);
     
    165165int
    166166arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
    167     measured_string_t *address, measured_string_t **translation, char **data)
     167    measured_string_t *address, measured_string_t **translation, uint8_t **data)
    168168{
    169169        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,
Note: See TracChangeset for help on using the changeset viewer.