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_ops.c

    r37f7cfe ra9b6bec  
    371371       
    372372        /* Allocate a buffer to hold thread IDs */
    373         unative_t *id_buffer = malloc(buf_size + 1, 0);
     373        sysarg_t *id_buffer = malloc(buf_size + 1, 0);
    374374       
    375375        mutex_lock(&TASK->udebug.lock);
     
    385385        /* Copy down the thread IDs */
    386386       
    387         size_t max_ids = buf_size / sizeof(unative_t);
     387        size_t max_ids = buf_size / sizeof(sysarg_t);
    388388        size_t copied_ids = 0;
    389389        size_t extra_ids = 0;
     
    404404                if (copied_ids < max_ids) {
    405405                        /* Using thread struct pointer as identification hash */
    406                         id_buffer[copied_ids++] = (unative_t) thread;
     406                        id_buffer[copied_ids++] = (sysarg_t) thread;
    407407                } else
    408408                        extra_ids++;
     
    414414       
    415415        *buffer = id_buffer;
    416         *stored = copied_ids * sizeof(unative_t);
    417         *needed = (copied_ids + extra_ids) * sizeof(unative_t);
     416        *stored = copied_ids * sizeof(sysarg_t);
     417        *needed = (copied_ids + extra_ids) * sizeof(sysarg_t);
    418418       
    419419        return 0;
     
    463463{
    464464        /* Prepare a buffer to hold the arguments. */
    465         unative_t *arg_buffer = malloc(6 * sizeof(unative_t), 0);
     465        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
    466466       
    467467        /* On success, this will lock t->udebug.lock. */
     
    478478       
    479479        /* Copy to a local buffer before releasing the lock. */
    480         memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(unative_t));
     480        memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(sysarg_t));
    481481       
    482482        _thread_op_end(thread);
     
    539539 *
    540540 */
    541 int udebug_mem_read(unative_t uspace_addr, size_t n, void **buffer)
     541int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
    542542{
    543543        /* Verify task state */
Note: See TracChangeset for help on using the changeset viewer.