Changeset b5e68c8 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/console/kconsole.c (modified) (4 diffs)

kernel/generic/src/console/kconsole.c

@@ -426 +426 @@
 
 NO_TRACE static bool parse_int_arg(const char *text, size_t len,
-    unative_t *result)
+    sysarg_t *result)
 {
         bool isaddr = false;
@@ -461 +461 @@
                 case EOK:
                         if (isaddr)
-                                *result = (unative_t) symaddr;
+                                *result = (sysarg_t) symaddr;
                         else if (isptr)
-                                *result = **((unative_t **) symaddr);
+                                *result = **((sysarg_t **) symaddr);
                         else
-                                *result = *((unative_t *) symaddr);
+                                *result = *((sysarg_t *) symaddr);
                         break;
                 default:
@@ -483 +483 @@
                         return false;
                 case EOK:
-                        *result = (unative_t) value;
+                        *result = (sysarg_t) value;
                         if (isptr)
-                                *result = *((unative_t *) *result);
+                                *result = *((sysarg_t *) *result);
                         break;
                 default:
@@ -629 +629 @@
                                             cmdline + start + 1,
                                             (end - start) - 1);
-                                        cmd->argv[i].intval = (unative_t) buf;
+                                        cmd->argv[i].intval = (sysarg_t) buf;
                                         cmd->argv[i].vartype = ARG_TYPE_STRING;
                                 } else {