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

Changeset a9b6bec in mainline for kernel/generic/src/proc/thread.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
  • kernel/generic/src/proc/thread.c

    r37f7cfe ra9b6bec  
    755755 *
    756756 */
    757 unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     757sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
    758758    size_t name_len, thread_id_t *uspace_thread_id)
    759759{
     
    764764        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
    765765        if (rc != 0)
    766                 return (unative_t) rc;
     766                return (sysarg_t) rc;
    767767       
    768768        namebuf[name_len] = 0;
     
    779779        if (rc != 0) {
    780780                free(kernel_uarg);
    781                 return (unative_t) rc;
     781                return (sysarg_t) rc;
    782782        }
    783783       
     
    804804                                free(kernel_uarg);
    805805                               
    806                                 return (unative_t) rc;
     806                                return (sysarg_t) rc;
    807807                         }
    808808                }
     
    827827                free(kernel_uarg);
    828828       
    829         return (unative_t) ENOMEM;
     829        return (sysarg_t) ENOMEM;
    830830}
    831831
     
    833833 *
    834834 */
    835 unative_t sys_thread_exit(int uspace_status)
     835sysarg_t sys_thread_exit(int uspace_status)
    836836{
    837837        thread_exit();
     
    849849 *
    850850 */
    851 unative_t sys_thread_get_id(thread_id_t *uspace_thread_id)
     851sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
    852852{
    853853        /*
     
    856856         *
    857857         */
    858         return (unative_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
     858        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
    859859            sizeof(THREAD->tid));
    860860}
    861861
    862862/** Syscall wrapper for sleeping. */
    863 unative_t sys_thread_usleep(uint32_t usec)
     863sysarg_t sys_thread_usleep(uint32_t usec)
    864864{
    865865        thread_usleep(usec);
Note: See TracChangeset for help on using the changeset viewer.