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
  • kernel/generic/src/udebug/udebug_ipc.c

    r37f7cfe ra9b6bec  
    210210static void udebug_receive_name_read(call_t *call)
    211211{
    212         unative_t uspace_addr;
    213         unative_t to_copy;
     212        sysarg_t uspace_addr;
     213        sysarg_t to_copy;
    214214        size_t data_size;
    215215        size_t buf_size;
     
    257257static void udebug_receive_areas_read(call_t *call)
    258258{
    259         unative_t uspace_addr;
    260         unative_t to_copy;
     259        sysarg_t uspace_addr;
     260        sysarg_t to_copy;
    261261        size_t data_size;
    262262        size_t buf_size;
     
    304304{
    305305        thread_t *t;
    306         unative_t uspace_addr;
     306        sysarg_t uspace_addr;
    307307        int rc;
    308308        void *buffer;
     
    328328           (no way to distinguish method in answer) */
    329329        IPC_SET_ARG1(call->data, uspace_addr);
    330         IPC_SET_ARG2(call->data, 6 * sizeof(unative_t));
     330        IPC_SET_ARG2(call->data, 6 * sizeof(sysarg_t));
    331331        call->buffer = buffer;
    332332
     
    341341{
    342342        thread_t *t;
    343         unative_t uspace_addr;
    344         unative_t to_copy;
     343        sysarg_t uspace_addr;
     344        sysarg_t to_copy;
    345345        void *buffer;
    346346        int rc;
     
    382382static void udebug_receive_mem_read(call_t *call)
    383383{
    384         unative_t uspace_dst;
    385         unative_t uspace_src;
     384        sysarg_t uspace_dst;
     385        sysarg_t uspace_src;
    386386        unsigned size;
    387387        void *buffer;
Note: See TracChangeset for help on using the changeset viewer.