Changeset db96017 in mainline for kernel/generic/src/console

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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.

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (3 diffs)
• kconsole.c (modified) (1 diff)

kernel/generic/src/console/cmd.c

@@ -906 +906 @@
                    ((char *) argv->buffer)[0] <= '9') {
                 uint64_t value;
-                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+                rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value);
                 if (rc == EOK)
                         addr = (uintptr_t) value;
@@ -1177 +1177 @@
                 /* Execute the test */
                 test_quiet = true;
-                const char *ret = test->entry();
+                const char *test_ret = test->entry();
                 
                 /* Update and read thread accounting */
@@ -1185 +1185 @@
                 irq_spinlock_unlock(&TASK->lock, true);
                 
-                if (ret != NULL) {
-                        printf("%s\n", ret);
+                if (test_ret != NULL) {
+                        printf("%s\n", test_ret);
                         ret = false;
                         break;

kernel/generic/src/console/kconsole.c

@@ -472 +472 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                int rc = str_uint64(text, NULL, 0, true, &value);
+                int rc = str_uint64_t(text, NULL, 0, true, &value);
                 switch (rc) {
                 case EINVAL: