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

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (2 diffs)
• cmd.c (modified) (2 diffs)
• kconsole.c (modified) (2 diffs)

kernel/generic/src/console/chardev.c

@@ -47 +47 @@
  *
  */
-void indev_initialize(char *name, indev_t *indev,
+void indev_initialize(const char *name, indev_t *indev,
     indev_operations_t *op)
 {
@@ -130 +130 @@
  *
  */
-void outdev_initialize(char *name, outdev_t *outdev,
+void outdev_initialize(const char *name, outdev_t *outdev,
     outdev_operations_t *op)
 {

kernel/generic/src/console/cmd.c

@@ -1033 +1033 @@
         /* Execute the test */
         test_quiet = false;
-        char *ret = test->entry();
+        const char *ret = test->entry();
         
         /* Update and read thread accounting */
@@ -1086 +1086 @@
                 /* Execute the test */
                 test_quiet = true;
-                char * ret = test->entry();
+                const char *ret = test->entry();
                 
                 /* Update and read thread accounting */

kernel/generic/src/console/kconsole.c

@@ -224 +224 @@
                 printf("\n");
                 pos = NULL;
-                while ((hint = cmdtab_search_one(name, &pos))) {
+                while (cmdtab_search_one(name, &pos)) {
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
                         printf("%s (%s)\n", hlp->name, hlp->description);
@@ -643 +643 @@
  *
  */
-void kconsole(char *prompt, char *msg, bool kcon)
+void kconsole(const char *prompt, const char *msg, bool kcon)
 {
         if (!stdin) {