Run dos2unix on bayou and remove white space at the end of lines.

[coreboot.git] / payloads / coreinfo / ramdump_module.c

diff --git a/payloads/coreinfo/ramdump_module.c b/payloads/coreinfo/ramdump_module.c
index 16d7e96771df96788dd63243f70b6bc9b3cc589f..a0479eb135b1234b4b326847ae391bb64a148912 100644 (file)
--- a/payloads/coreinfo/ramdump_module.c
+++ b/payloads/coreinfo/ramdump_module.c
@@ -34,17 +34,18 @@ static void dump_ram(WINDOW *win, uint32_t addr, int row, int col)
        int i, x = 0, y = 0, count = 0;
        volatile uint8_t *ptr = (void *)(addr);
 
-       mvwprintw(win, 0, col + 54, "RAM address: %10d", addr);
+       mvwprintw(win, 0, col + 54, "RAM address: %10x", addr);
 
        /* Dump 256 bytes of RAM. */
        for (i = 1; i < 257; i++) {
                if (x == 0) {
                        mvwprintw(win, row + y, col - 1, "%08x", addr + 16 * y);
-                       mvwaddch(win, row + y, col + 59, (const chtype)"|");
-                       mvwaddch(win, row + y, col + 76, (const chtype)"|");
+                       mvwaddch(win, row + y, col + 59, '|');
+                       mvwaddch(win, row + y, col + 76, '|');
                }
                mvwprintw(win, row + y, col + x + 9, "%02x", ptr[i - 1]);
-               mvwprintw(win, row + y, 62 + count++, "%c", ptr[i - 1]);
+               mvwprintw(win, row + y, 62 + count++, "%c",
+                         isprint(ptr[i - 1]) ? ptr[i - 1] : ' ');
                x += 3;
                if (x == 24)    /* One more space after column/byte 8. */
                        x++;
@@ -67,23 +68,21 @@ static int ramdump_module_handle(int key)
 {
        switch (key) {
        case KEY_DOWN:
-               if (cursor == cursor_max)
-                       return 0;
                cursor++;
                break;
        case KEY_UP:
-               if (cursor == 0)
-                       return 0;
                cursor--;
                break;
-       case KEY_NPAGE:
-               if (cursor == cursor_max)
-                       return 0;
-               cursor += 4096; /* Jump in 1MB steps. */
+       case KEY_RIGHT:
+               cursor += 256;
+               break;
+       case KEY_LEFT:
+               cursor -= 256;
                break;
        case KEY_PPAGE:
-               if (cursor == 0)
-                       return 0;
+               cursor += 4096; /* Jump in 1MB steps. */
+               break;
+       case KEY_NPAGE:
                cursor -= 4096; /* Jump in 1MB steps. */
                break;
        }