Changeset f0d7bd9 in mainline

Timestamp:

2012-07-10T12:32:56Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aca4a04

Parents:

1e01a35

Message:

Create function for displaying —more— prompt

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• generic/include/console/prompt.h (added)
• generic/include/symtab.h (modified) (1 diff)
• generic/src/console/kconsole.c (modified) (5 diffs)
• generic/src/console/prompt.c (added)
• generic/src/debug/symtab.c (modified) (5 diffs)

kernel/Makefile

@@ -196 +196 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \

kernel/generic/include/symtab.h

@@ -36 +36 @@
 #define KERN_SYMTAB_H_
 
-#define MAX_TAB_HINTS 37
-
 #include <symtab_lookup.h>
 #include <console/chardev.h>

kernel/generic/src/console/kconsole.c

@@ -43 +43 @@
 #include <console/chardev.h>
 #include <console/cmd.h>
+#include <console/prompt.h>
 #include <print.h>
 #include <panic.h>
@@ -214 +215 @@
         const char *hint;
         char *output = malloc(MAX_CMDLINE, 0);
-        char display = 'y';
         size_t hints_to_show = MAX_TAB_HINTS - 1;
         size_t total_hints_shown = 0;
-        char continue_showing_hints = 'y';
+        bool continue_showing_hints = true;
         
         output[0] = 0;
@@ -232 +232 @@
         if (found > MAX_TAB_HINTS) {
                 printf("\nDisplay all %zu possibilities? (y or n)", found);
+                wchar_t display;
                 do {
                         display = indev_pop_character(indev);
                 } while (display != 'y' && display != 'n' && display != 'Y' && display != 'N');
+                continue_showing_hints = (display == 'y') || (display == 'Y');
         }
         
@@ -243 +245 @@
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
 
-                        if (display == 'y' || display == 'Y') { /* We are still showing hints */
+                        if (continue_showing_hints) {
                                 printf("%s (%s)\n", hlp->name, hlp->description);
                                 --hints_to_show;
@@ -249 +251 @@
 
                                 if (hints_to_show == 0 && total_hints_shown != found) { /* Time to ask user to continue */
-                                        printf("--More--");
-                                        do {
-                                                continue_showing_hints = indev_pop_character(indev);
-                                                if (continue_showing_hints == 'y' || continue_showing_hints == 'Y'
-                                                                || continue_showing_hints == ' ') {
-                                                        hints_to_show = MAX_TAB_HINTS - 1; /* Display a full page again */
-                                                        break;
-                                                }
-
-                                                if (continue_showing_hints == 'n' || continue_showing_hints == 'N'
-                                                                || continue_showing_hints == 'q' || continue_showing_hints == 'Q') {
-                                                        display = 'n'; /* Stop displaying hints */
-                                                        break;
-                                                }
-
-                                                if (continue_showing_hints == '\n') {
-                                                        hints_to_show = 1; /* Show one more hint */
-                                                        break;
-                                                }
-                                        } while (1);
-
-                                        printf("\r         \r"); /* Delete the --More-- option */
+                                        continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show);
                                 }
                         }

kernel/generic/src/debug/symtab.c

@@ -43 +43 @@
 #include <typedefs.h>
 #include <errno.h>
+#include <console/prompt.h>
 
 /** Get name of a symbol that seems most likely to correspond to address.
@@ -232 +233 @@
         size_t input_len = str_length(input);
         char *sym_name;
-        char display = 'y';
         size_t hints_to_show = MAX_TAB_HINTS - 1;
         size_t total_hints_shown = 0;
-        char continue_showing_hints = 'y';
+        bool continue_showing_hints = true;
         
         output[0] = 0;
@@ -256 +256 @@
         if (found > MAX_TAB_HINTS) {
                 printf("\nDisplay all %zu possibilities? (y or n)", found);
+                wchar_t display;
                 do {
                         display = indev_pop_character(indev);
                 } while (display != 'y' && display != 'n' && display != 'Y' && display != 'N');
+                continue_showing_hints = (display == 'y') || (display == 'Y');
         }
         
@@ -268 +270 @@
                         pos++;
 
-                        if (display == 'y' || display == 'Y') { /* We are still showing hints */
+                        if (continue_showing_hints) { /* We are still showing hints */
                                 printf("%s\n", sym_name);
                                 --hints_to_show;
@@ -274 +276 @@
 
                                 if (hints_to_show == 0 && total_hints_shown != found) { /* Time to ask user to continue */
-                                        printf("--More--");
-                                        do {
-                                                continue_showing_hints = indev_pop_character(indev);
-                                                if (continue_showing_hints == 'y' || continue_showing_hints == 'Y'
-                                                                || continue_showing_hints == ' ') {
-                                                        hints_to_show = MAX_TAB_HINTS - 1; /* Display a full page again */
-                                                        break;
-                                                }
-
-                                                if (continue_showing_hints == 'n' || continue_showing_hints == 'N'
-                                                                || continue_showing_hints == 'q' || continue_showing_hints == 'Q') {
-                                                        display = 'n'; /* Stop displaying hints */
-                                                        break;
-                                                }
-
-                                                if (continue_showing_hints == '\n') {
-                                                        hints_to_show = 1; /* Show one more hint */
-                                                        break;
-                                                }
-                                        } while (1);
-
-                                        printf("\r         \r"); /* Delete the --More-- option */
+                                        continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show);
                                 }
                         }