fix warnings, shadowed declarations and style guide violations (all trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4179 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/boot/acpigen.c b/src/arch/i386/boot/acpigen.c
index 5c8bd5654884498f44eb388dfb1af9efcff22dd6..3dec6714944130048342faea75049e78e54c01b2 100644 (file)
--- a/src/arch/i386/boot/acpigen.c
+++ b/src/arch/i386/boot/acpigen.c
@@ -34,10 +34,10 @@ static char *gencurrent;
 char *len_stack[ACPIGEN_LENSTACK_SIZE];
 int ltop = 0;
 
-static int acpigen_write_len_f()
+static int acpigen_write_len_f(void)
 {
        ASSERT(ltop < (ACPIGEN_LENSTACK_SIZE - 1))
-       len_stack[ltop++] = gencurrent;
+           len_stack[ltop++] = gencurrent;
        acpigen_emit_byte(0);
        acpigen_emit_byte(0);
        return 2;
@@ -46,7 +46,7 @@ static int acpigen_write_len_f()
 void acpigen_patch_len(int len)
 {
        ASSERT(len <= ACPIGEN_MAXLEN)
-       ASSERT(ltop > 0)
+           ASSERT(ltop > 0)
        char *p = len_stack[--ltop];
        /* generate store length for 0xfff max */
        p[0] = (0x40 | (len & 0xf));
@@ -54,12 +54,14 @@ void acpigen_patch_len(int len)
 
 }
 
-void acpigen_set_current(char *curr) {
-    gencurrent = curr;
+void acpigen_set_current(char *curr)
+{
+       gencurrent = curr;
 }
 
-char *acpigen_get_current(void) {
-    return gencurrent;
+char *acpigen_get_current(void)
+{
+       return gencurrent;
 }
 
 int acpigen_emit_byte(unsigned char b)
@@ -112,28 +114,32 @@ int acpigen_write_qword(uint64_t data)
        return 9;
 }
 
-int acpigen_write_name_byte(char *name, uint8_t val) {
+int acpigen_write_name_byte(char *name, uint8_t val)
+{
        int len;
        len = acpigen_write_name(name);
        len += acpigen_write_byte(val);
        return len;
 }
 
-int acpigen_write_name_dword(char *name, uint32_t val) {
+int acpigen_write_name_dword(char *name, uint32_t val)
+{
        int len;
        len = acpigen_write_name(name);
        len += acpigen_write_dword(val);
        return len;
 }
 
-int acpigen_write_name_qword(char *name, uint64_t val) {
+int acpigen_write_name_qword(char *name, uint64_t val)
+{
        int len;
        len = acpigen_write_name(name);
        len += acpigen_write_qword(val);
        return len;
 }
 
-int acpigen_emit_stream(char *data, int size) {
+int acpigen_emit_stream(char *data, int size)
+{
        int i;
        for (i = 0; i < size; i++) {
                acpigen_emit_byte(data[i]);
@@ -166,7 +172,7 @@ int acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len)
         {
 */
        char pscope[16];
-       int  len;
+       int len;
        /* processor op */
        acpigen_emit_byte(0x5b);
        acpigen_emit_byte(0x83);
@@ -180,7 +186,7 @@ int acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len)
        acpigen_emit_byte((pblock_addr >> 16) & 0xff);
        acpigen_emit_byte((pblock_addr >> 24) & 0xff);
        acpigen_emit_byte(pblock_len);
-       return 6  + 2 + len;
+       return 6 + 2 + len;
 }
 
 int acpigen_write_empty_PCT(void)
@@ -245,8 +251,8 @@ int acpigen_write_PPC(u8 nr)
        return len;
 }
 
-int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat,
-                       u32 control, u32 status)
+int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat,
+                             u32 busmLat, u32 control, u32 status)
 {
        int len;
        len = acpigen_write_package(6);
@@ -267,14 +273,13 @@ int acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype)
        lenh = acpigen_write_name("_PSD");
        lenp = acpigen_write_package(1);
        len = acpigen_write_package(5);
-       len += acpigen_write_byte(5); // 5 values
-       len += acpigen_write_byte(0); // revision 0
+       len += acpigen_write_byte(5);   // 5 values
+       len += acpigen_write_byte(0);   // revision 0
        len += acpigen_write_dword(domain);
        len += acpigen_write_dword(coordtype);
        len += acpigen_write_dword(numprocs);
-       acpigen_patch_len(len-1);
+       acpigen_patch_len(len - 1);
        len += lenp;
-       acpigen_patch_len(len-1);
+       acpigen_patch_len(len - 1);
        return len + lenh;
 }
-

diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index b9c1f3f7ef5f48ca1ac61aaa4aff346be99b798a..470afe82c1ef19b6460c2f9b7735f446bf64480f 100644 (file)
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -75,7 +75,7 @@ struct lb_memory *write_tables(void)
         * low and the high area, so payloads and OSes don't need to know about
         * the high tables.
         */
-       unsigned long high_table_start, high_table_end=0;
+       unsigned long high_table_start=0, high_table_end=0;
 
        if (high_tables_base) {
                printk_debug("High Tables Base is %llx.\n", high_tables_base);

diff --git a/src/console/console.c b/src/console/console.c
index 86ec26d3129997f455f708843e517e2b7a69f215..aeccc14433208f70ce17c9b7cb7cf4cb7757b26c 100644 (file)
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -83,7 +83,7 @@ int console_tst_byte(void)
  */
 void post_code(uint8_t value)
 {
-#if NO_POST==0
+#if !defined(NO_POST) || NO_POST==0
 #if CONFIG_SERIAL_POST==1
        printk_emerg("POST: 0x%02x\n", value);
 #endif

diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 83e340c70bc40919cdcf8ddf2d9e025733546bcb..2e3d09c8c01c537e6cafc899b39fe93e8bbdc974 100644 (file)
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -69,8 +69,7 @@ static int do_normal_boot(void)
        unsigned char byte;
 
        if (cmos_error() || !cmos_chksum_valid()) {
-               unsigned char byte;
-               /* There are no impossible values, no cheksums so just
+               /* There are no impossible values, no checksums so just
                 * trust whatever value we have in the the cmos,
                 * but clear the fallback bit.
                 */

diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c
index adb412865eee2e868031bb228f7619fd0080cf2b..35e27ead8a21224aa929c171d13b050ac37c8d5a 100644 (file)
--- a/src/stream/rom_stream.c
+++ b/src/stream/rom_stream.c
@@ -21,7 +21,7 @@ extern unsigned char _heap, _eheap;
 #endif
 
 #if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
-#if HAVE_UNCOMPRESSER
+#ifdef HAVE_UNCOMPRESSER
 #error "You're defining more than one compression type, which is not allowed."
 #endif
 #define HAVE_UNCOMPRESSER 1
@@ -49,17 +49,18 @@ static const unsigned char *rom;
 
 #ifdef UNCOMPRESSER
 unsigned long 
-uncompress(uint8_t * rom_start, uint8_t *dest )
+uncompress(uint8_t * start_addr, uint8_t *dest_addr)
 {
 #if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) 
        unsigned long ilen; // used compressed stream length
-       return unrv2b(rom_start, dest, &ilen);
+       return unrv2b(start_addr, dest_addr, &ilen);
 #endif
 #if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
-       return ulzma(rom_start, dest);
+       return ulzma(start_addr, dest_addr);
 #endif
 }
 #endif
+
 int stream_init(void)
 {
 #ifdef UNCOMPRESSER