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

Changeset a9b6bec in mainline for uspace/lib/net/generic/generic.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/lib/net/generic/generic.c

    r37f7cfe ra9b6bec  
    5959    int state, services_t target)
    6060{
    61         async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
    62             (ipcarg_t) state, target);
     61        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
     62            (sysarg_t) state, target);
    6363       
    6464        return EOK;
     
    8181    int arg2, services_t service)
    8282{
    83         return (int) async_req_3_0(phone, (ipcarg_t) message,
    84             (ipcarg_t) device_id, (ipcarg_t) arg2, (ipcarg_t) service);
     83        return (int) async_req_3_0(phone, (sysarg_t) message,
     84            (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
    8585}
    8686
     
    103103{
    104104        aid_t message_id;
    105         ipcarg_t result;
     105        sysarg_t result;
    106106        int string;
    107107
     
    110110
    111111        // request the address
    112         message_id = async_send_1(phone, (ipcarg_t) message,
    113             (ipcarg_t) device_id, NULL);
     112        message_id = async_send_1(phone, (sysarg_t) message,
     113            (sysarg_t) device_id, NULL);
    114114        string = measured_strings_return(phone, address, data, 1);
    115115        async_wait_for(message_id, &result);
     
    143143                return EBADMEM;
    144144       
    145         ipcarg_t addr_len;
    146         ipcarg_t prefix;
    147         ipcarg_t content;
    148         ipcarg_t suffix;
    149        
    150         ipcarg_t result = async_req_1_4(phone, (ipcarg_t) message,
    151             (ipcarg_t) device_id, &addr_len, &prefix, &content, &suffix);
     145        sysarg_t addr_len;
     146        sysarg_t prefix;
     147        sysarg_t content;
     148        sysarg_t suffix;
     149       
     150        sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
     151            (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
    152152       
    153153        packet_dimension->prefix = (size_t) prefix;
     
    175175{
    176176        if (error) {
    177                 async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
    178                     (ipcarg_t) packet_id, (ipcarg_t) target, (ipcarg_t) error);
     177                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
     178                    (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
    179179        } else {
    180                 async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
    181                     (ipcarg_t) packet_id, (ipcarg_t) target);
     180                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
     181                    (sysarg_t) packet_id, (sysarg_t) target);
    182182        }
    183183       
     
    201201{
    202202        if (error) {
    203                 async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
    204                     (ipcarg_t) packet_id, (ipcarg_t) sender, (ipcarg_t) error);
     203                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
     204                    (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
    205205        } else {
    206                 async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
    207                     (ipcarg_t) packet_id, (ipcarg_t) sender);
     206                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
     207                    (sysarg_t) packet_id, (sysarg_t) sender);
    208208        }
    209209       
     
    237237{
    238238        aid_t message_id;
    239         ipcarg_t result;
     239        sysarg_t result;
    240240        int string;
    241241
     
    246246
    247247        // request the translation
    248         message_id = async_send_3(phone, (ipcarg_t) message,
    249             (ipcarg_t) device_id, (ipcarg_t) count, (ipcarg_t) service, NULL);
     248        message_id = async_send_3(phone, (sysarg_t) message,
     249            (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
    250250        measured_strings_send(phone, configuration, count);
    251251        string = measured_strings_return(phone, translation, data, count);
Note: See TracChangeset for help on using the changeset viewer.