Random coding style fixes and simplifications (trivial).

This will even reduce the final payload size a bit.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3427 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index 3f49f53ef2418f1407809d58d67b3cfbac9a22f1..0c5136c80ecbc96243306b49085b8eb4aa94bd24 100644 (file)
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -77,7 +77,6 @@ struct coreinfo_cat {
        }
 };
 
-
 static WINDOW *modwin;
 static WINDOW *menuwin;
 
@@ -121,14 +120,14 @@ static void print_time_and_date(void)
 {
        struct tm tm;
 
-       while(nvram_updating())
+       while (nvram_updating())
                mdelay(10);
 
        rtc_read_clock(&tm);
 
        mvwprintw(menuwin, 0, 57, "%02d/%02d/%04d - %02d:%02d:%02d",
-               tm.tm_mon, tm.tm_mday, 1900+tm.tm_year, tm.tm_hour,
-               tm.tm_min, tm.tm_sec);
+                 tm.tm_mon, tm.tm_mday, 1900+tm.tm_year, tm.tm_hour,
+                 tm.tm_min, tm.tm_sec);
 }
 #endif
 
@@ -184,8 +183,6 @@ static void header(int row, const char *str)
 
        ptr += sprintf(ptr, "[ %s ]", str);
 
-
-
        for (i = ((SCREEN_X - len) / 2) + len; i < SCREEN_X; i++)
                ptr += sprintf(ptr, "=");
 
@@ -207,10 +204,8 @@ static void handle_category_key(struct coreinfo_cat *cat, int key)
 {
        if (key >= 'a' && key <= 'z') {
                int index = key - 'a';
-
                if (index < cat->count) {
-
-               cat->cur = index;
+                       cat->cur = index;
                        redraw_module(cat);
                        return;
                }
@@ -296,7 +291,7 @@ int main(void)
        wrefresh(modwin);
 
        for (i = 0; i < ARRAY_SIZE(categories); i++) {
-               for(j = 0; j < categories[i].count; j++)
+               for (j = 0; j < categories[i].count; j++)
                        categories[i].modules[j]->init();
 
        }
@@ -306,6 +301,6 @@ int main(void)
        return 0;
 }
 
-PAYLOAD_INFO(name,"coreinfo");
-PAYLOAD_INFO(listname,"System Information");
-PAYLOAD_INFO(desc,"Display information about the system");
+PAYLOAD_INFO(name, "coreinfo");
+PAYLOAD_INFO(listname, "System Information");
+PAYLOAD_INFO(desc, "Display information about the system");

diff --git a/payloads/coreinfo/lar_module.c b/payloads/coreinfo/lar_module.c
index d8ef3cbf4acefd27522208f30aa5776e373b7482..0c8352a478cc6eafb21b8df389653a897882a19f 100644 (file)
--- a/payloads/coreinfo/lar_module.c
+++ b/payloads/coreinfo/lar_module.c
@@ -22,8 +22,9 @@
 #ifdef CONFIG_MODULE_LAR
 
 static struct LAR *lar;
-static int lcount;
+static int lcount, selected;
 static char **lnames;
+static const char *compression_table[4] = {"none", "LZMA", "NRV2B", "zeroes"};
 
 static int lar_module_init(void)
 {
@@ -35,7 +36,7 @@ static int lar_module_init(void)
        if (lar == NULL)
                return 0;
 
-       while((larent = readlar(lar)))
+       while ((larent = readlar(lar)))
                lcount++;
 
        lnames = malloc(lcount * sizeof(char *));
@@ -45,37 +46,30 @@ static int lar_module_init(void)
 
        rewindlar(lar);
 
-       while((larent = readlar(lar)))
+       while ((larent = readlar(lar)))
                lnames[index++] = strdup((const char *) larent->name);
 
        return 0;
 }
 
-static int selected;
-
 static int lar_module_redraw(WINDOW *win)
 {
-       int i;
-       int row = 2;
+       int i, row = 2;
        struct larstat stat;
 
        print_module_title(win, "LAR Listing");
 
        if (lar == 0) {
-               mvwprintw(win, 11, 61/2,  "Bad or missing LAR");
+               mvwprintw(win, 11, 61 / 2,  "Bad or missing LAR");
                return 0;
        }
 
-       /* Draw a line down the middle */
-
-       for(i = 2; i < 20; i++) {
-               wmove(win, i, 30);
-               waddch(win, '\263');
-       }
-
-       /* Draw the names down the left side */
+       /* Draw a line down the middle. */
+       for (i = 2; i < 21; i++)
+               mvwaddch(win, i, 30, '\263');
 
-       for(i = 0; i < lcount; i++) {
+       /* Draw the names down the left side. */
+       for (i = 0; i < lcount; i++) {
                if (i == selected)
                        wattrset(win, COLOR_PAIR(3) | A_BOLD);
                else
@@ -84,8 +78,7 @@ static int lar_module_redraw(WINDOW *win)
                mvwprintw(win, 2 + i, 1, "%.25s", lnames[i]);
        }
 
-       /* Get the information for the LAR */
-
+       /* Get the information for the LAR. */
        if (larstat(lar, lnames[selected], &stat)) {
                printf("larstat failed\n");
                return 0;
@@ -96,26 +89,17 @@ static int lar_module_redraw(WINDOW *win)
        mvwprintw(win, row++, 32, "Offset: 0x%x", stat.offset);
 
        if (stat.compression) {
-               switch(stat.compression) {
-               case ALGO_LZMA:
-                       mvwprintw(win, row++, 32, "Compression: LZMA");
-                       break;
-               case ALGO_NRV2B:
-                       mvwprintw(win, row++, 32, "Compression: NRV2B");
-                       break;
-               case ALGO_ZEROES:
-                       mvwprintw(win, row++, 32, "Compression: zeroes");
-                       break;
-               }
-
+               mvwprintw(win, row++, 32, "Compression: %s",
+                         compression_table[stat.compression]);
                mvwprintw(win, row++, 32, "Compressed length: %d", stat.len);
-               mvwprintw(win, row++, 32, "Compressed checksum: 0x%x", stat.compchecksum);
+               mvwprintw(win, row++, 32, "Compressed checksum: 0x%x",
+                         stat.compchecksum);
        }
 
        mvwprintw(win, row++, 32, "Length: %d", stat.reallen);
        mvwprintw(win, row++, 32, "Checksum: 0x%x", stat.checksum);
-       mvwprintw(win, row++, 32, "Load Address: 0x%llx", stat.loadaddress);
-       mvwprintw(win, row++, 32, "Entry Point: 0x%llx", stat.entry);
+       mvwprintw(win, row++, 32, "Load address: 0x%llx", stat.loadaddress);
+       mvwprintw(win, row++, 32, "Entry point: 0x%llx", stat.entry);
 
        return 0;
 }
@@ -151,13 +135,10 @@ struct coreinfo_module lar_module = {
        .redraw = lar_module_redraw,
        .handle = lar_module_handle
 };
+
 #else
 
 struct coreinfo_module lar_module = {
 };
 
 #endif
-
-
-
-