Author: uwe Date: 2008-04-22 18:56:21 +0200 (Tue, 22 Apr 2008) New Revision: 3246
Modified: trunk/payloads/coreinfo/Kconfig trunk/payloads/coreinfo/nvram_module.c Log: Show index numbers in the NVRAM dump, similar to the PCI config space dump.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/coreinfo/Kconfig =================================================================== --- trunk/payloads/coreinfo/Kconfig 2008-04-21 22:33:58 UTC (rev 3245) +++ trunk/payloads/coreinfo/Kconfig 2008-04-22 16:56:21 UTC (rev 3246) @@ -62,7 +62,7 @@ bool "Enable the NVRAM dump module" default y help - This option will increase the ELF file size by ca. 150 bytes. + This option will increase the ELF file size by ca. 350 bytes.
endmenu
Modified: trunk/payloads/coreinfo/nvram_module.c =================================================================== --- trunk/payloads/coreinfo/nvram_module.c 2008-04-21 22:33:58 UTC (rev 3245) +++ trunk/payloads/coreinfo/nvram_module.c 2008-04-22 16:56:21 UTC (rev 3246) @@ -28,6 +28,19 @@ { int i, x = 0, y = 0;
+ /* Print vertical and horizontal index numbers. */ + for (i = 0; i < 16; i++) { + mvwprintw(win, ((i < 8) ? 4 : 5) + i, 1, "%2.2X ", i); + mvwprintw(win, 2, 4 + (i * 3), "%2.2X ", i); + } + + /* Print vertical and horizontal line. */ + for (i = 0; i < 18; i++) + mvwaddch(win, 3 + i, 3, '\263'); + for (i = 0; i < 48; i++) + mvwaddch(win, 3, 3 + i, (i == 0) ? '\332' : '\304'); + + /* Dump NVRAM contents. */ for (i = 1; i < 257; i++) { mvwprintw(win, row + y, col + x, "%02x ", nvram_read(i - 1)); x += 3; @@ -35,8 +48,8 @@ y++; /* Start a newline after 16 bytes. */ x = 0; } - if (i % 64 == 0) { - y++; /* Add an empty line after 64 bytes. */ + if (i % 128 == 0) { + y++; /* Add an empty line after 128 bytes. */ x = 0; } } @@ -45,7 +58,7 @@ static int nvram_module_redraw(WINDOW *win) { print_module_title(win, "NVRAM Dump"); - dump_nvram(win, 2, 1); + dump_nvram(win, 4, 4); return 0; }