diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/boot/acpigen.c | 45 | ||||
| -rw-r--r-- | src/arch/i386/boot/tables.c | 2 | ||||
| -rw-r--r-- | src/console/console.c | 2 | ||||
| -rw-r--r-- | src/pc80/mc146818rtc_early.c | 3 | ||||
| -rw-r--r-- | src/stream/rom_stream.c | 9 |
5 files changed, 33 insertions, 28 deletions
diff --git a/src/arch/i386/boot/acpigen.c b/src/arch/i386/boot/acpigen.c index 5c8bd56548..3dec671494 100644 --- 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 b9c1f3f7ef..470afe82c1 100644 --- 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 86ec26d312..aeccc14433 100644 --- 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 83e340c70b..2e3d09c8c0 100644 --- 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 adb412865e..35e27ead8a 100644 --- 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 |