Changeset a9b6bec in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-12-14T20:19:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• kernel/generic/src/console/cmd.c (modified) (9 diffs)

kernel/generic/src/console/cmd.c

@@ -601 +601 @@
         
         /* This doesn't have to be very accurate */
-        unative_t sec = uptime->seconds1;
+        sysarg_t sec = uptime->seconds1;
         
         printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
@@ -656 +656 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(void);
+        sysarg_t (*fnc)(void);
         fncptr_t fptr;
         int rc;
@@ -672 +672 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(void)) arch_construct_function(&fptr,
+                fnc = (sysarg_t (*)(void)) arch_construct_function(&fptr,
                     (void *) symaddr, (void *) cmd_call0);
                 printf("Calling %s() (%p)\n", symbol, (void *) symaddr);
@@ -720 +720 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, ...);
-        unative_t arg1 = argv[1].intval;
+        sysarg_t (*fnc)(sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
         fncptr_t fptr;
         int rc;
@@ -737 +737 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call1);
@@ -756 +756 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, unative_t, ...);
-        unative_t arg1 = argv[1].intval;
-        unative_t arg2 = argv[2].intval;
+        sysarg_t (*fnc)(sysarg_t, sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
+        sysarg_t arg2 = argv[2].intval;
         fncptr_t fptr;
         int rc;
@@ -774 +774 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call2);
@@ -792 +792 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
-        unative_t arg1 = argv[1].intval;
-        unative_t arg2 = argv[2].intval;
-        unative_t arg3 = argv[3].intval;
+        sysarg_t (*fnc)(sysarg_t, sysarg_t, sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
+        sysarg_t arg2 = argv[2].intval;
+        sysarg_t arg3 = argv[3].intval;
         fncptr_t fptr;
         int rc;
@@ -811 +811 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call3);