Changeset 357b5f5 in mainline for kernel/generic/src/proc/thread.c

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:

• kernel/generic/src/proc/thread.c (modified) (8 diffs)

kernel/generic/src/proc/thread.c

@@ -755 +755 @@
  *
  */
-unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
+sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     size_t name_len, thread_id_t *uspace_thread_id)
 {
@@ -764 +764 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;
@@ -779 +779 @@
         if (rc != 0) {
                 free(kernel_uarg);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -804 +804 @@
                                 free(kernel_uarg);
                                 
-                                return (unative_t) rc;
+                                return (sysarg_t) rc;
                          }
                 }
@@ -827 +827 @@
                 free(kernel_uarg);
         
-        return (unative_t) ENOMEM;
+        return (sysarg_t) ENOMEM;
 }
 
@@ -833 +833 @@
  *
  */
-unative_t sys_thread_exit(int uspace_status)
+sysarg_t sys_thread_exit(int uspace_status)
 {
         thread_exit();
@@ -849 +849 @@
  *
  */
-unative_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
 {
         /*
@@ -856 +856 @@
          *
          */
-        return (unative_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
+        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
             sizeof(THREAD->tid));
 }
 
 /** Syscall wrapper for sleeping. */
-unative_t sys_thread_usleep(uint32_t usec)
+sysarg_t sys_thread_usleep(uint32_t usec)
 {
         thread_usleep(usec);