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
This commit is contained in:
parent
7faa7d6bde
commit
f96c2d96a8
|
@ -34,7 +34,7 @@ static char *gencurrent;
|
||||||
char *len_stack[ACPIGEN_LENSTACK_SIZE];
|
char *len_stack[ACPIGEN_LENSTACK_SIZE];
|
||||||
int ltop = 0;
|
int ltop = 0;
|
||||||
|
|
||||||
static int acpigen_write_len_f()
|
static int acpigen_write_len_f(void)
|
||||||
{
|
{
|
||||||
ASSERT(ltop < (ACPIGEN_LENSTACK_SIZE - 1))
|
ASSERT(ltop < (ACPIGEN_LENSTACK_SIZE - 1))
|
||||||
len_stack[ltop++] = gencurrent;
|
len_stack[ltop++] = gencurrent;
|
||||||
|
@ -54,11 +54,13 @@ void acpigen_patch_len(int len)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpigen_set_current(char *curr) {
|
void acpigen_set_current(char *curr)
|
||||||
|
{
|
||||||
gencurrent = curr;
|
gencurrent = curr;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *acpigen_get_current(void) {
|
char *acpigen_get_current(void)
|
||||||
|
{
|
||||||
return gencurrent;
|
return gencurrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,28 +114,32 @@ int acpigen_write_qword(uint64_t data)
|
||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpigen_write_name_byte(char *name, uint8_t val) {
|
int acpigen_write_name_byte(char *name, uint8_t val)
|
||||||
|
{
|
||||||
int len;
|
int len;
|
||||||
len = acpigen_write_name(name);
|
len = acpigen_write_name(name);
|
||||||
len += acpigen_write_byte(val);
|
len += acpigen_write_byte(val);
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpigen_write_name_dword(char *name, uint32_t val) {
|
int acpigen_write_name_dword(char *name, uint32_t val)
|
||||||
|
{
|
||||||
int len;
|
int len;
|
||||||
len = acpigen_write_name(name);
|
len = acpigen_write_name(name);
|
||||||
len += acpigen_write_dword(val);
|
len += acpigen_write_dword(val);
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpigen_write_name_qword(char *name, uint64_t val) {
|
int acpigen_write_name_qword(char *name, uint64_t val)
|
||||||
|
{
|
||||||
int len;
|
int len;
|
||||||
len = acpigen_write_name(name);
|
len = acpigen_write_name(name);
|
||||||
len += acpigen_write_qword(val);
|
len += acpigen_write_qword(val);
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpigen_emit_stream(char *data, int size) {
|
int acpigen_emit_stream(char *data, int size)
|
||||||
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
acpigen_emit_byte(data[i]);
|
acpigen_emit_byte(data[i]);
|
||||||
|
@ -245,8 +251,8 @@ int acpigen_write_PPC(u8 nr)
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat,
|
int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat,
|
||||||
u32 control, u32 status)
|
u32 busmLat, u32 control, u32 status)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
len = acpigen_write_package(6);
|
len = acpigen_write_package(6);
|
||||||
|
@ -277,4 +283,3 @@ int acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype)
|
||||||
acpigen_patch_len(len - 1);
|
acpigen_patch_len(len - 1);
|
||||||
return len + lenh;
|
return len + lenh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
* low and the high area, so payloads and OSes don't need to know about
|
||||||
* the high tables.
|
* 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) {
|
if (high_tables_base) {
|
||||||
printk_debug("High Tables Base is %llx.\n", high_tables_base);
|
printk_debug("High Tables Base is %llx.\n", high_tables_base);
|
||||||
|
|
|
@ -83,7 +83,7 @@ int console_tst_byte(void)
|
||||||
*/
|
*/
|
||||||
void post_code(uint8_t value)
|
void post_code(uint8_t value)
|
||||||
{
|
{
|
||||||
#if NO_POST==0
|
#if !defined(NO_POST) || NO_POST==0
|
||||||
#if CONFIG_SERIAL_POST==1
|
#if CONFIG_SERIAL_POST==1
|
||||||
printk_emerg("POST: 0x%02x\n", value);
|
printk_emerg("POST: 0x%02x\n", value);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -69,8 +69,7 @@ static int do_normal_boot(void)
|
||||||
unsigned char byte;
|
unsigned char byte;
|
||||||
|
|
||||||
if (cmos_error() || !cmos_chksum_valid()) {
|
if (cmos_error() || !cmos_chksum_valid()) {
|
||||||
unsigned char byte;
|
/* There are no impossible values, no checksums so just
|
||||||
/* There are no impossible values, no cheksums so just
|
|
||||||
* trust whatever value we have in the the cmos,
|
* trust whatever value we have in the the cmos,
|
||||||
* but clear the fallback bit.
|
* but clear the fallback bit.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -21,7 +21,7 @@ extern unsigned char _heap, _eheap;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
|
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
|
||||||
#if HAVE_UNCOMPRESSER
|
#ifdef HAVE_UNCOMPRESSER
|
||||||
#error "You're defining more than one compression type, which is not allowed."
|
#error "You're defining more than one compression type, which is not allowed."
|
||||||
#endif
|
#endif
|
||||||
#define HAVE_UNCOMPRESSER 1
|
#define HAVE_UNCOMPRESSER 1
|
||||||
|
@ -49,17 +49,18 @@ static const unsigned char *rom;
|
||||||
|
|
||||||
#ifdef UNCOMPRESSER
|
#ifdef UNCOMPRESSER
|
||||||
unsigned long
|
unsigned long
|
||||||
uncompress(uint8_t * rom_start, uint8_t *dest )
|
uncompress(uint8_t * start_addr, uint8_t *dest_addr)
|
||||||
{
|
{
|
||||||
#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
|
#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
|
||||||
unsigned long ilen; // used compressed stream length
|
unsigned long ilen; // used compressed stream length
|
||||||
return unrv2b(rom_start, dest, &ilen);
|
return unrv2b(start_addr, dest_addr, &ilen);
|
||||||
#endif
|
#endif
|
||||||
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
|
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
|
||||||
return ulzma(rom_start, dest);
|
return ulzma(start_addr, dest_addr);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int stream_init(void)
|
int stream_init(void)
|
||||||
{
|
{
|
||||||
#ifdef UNCOMPRESSER
|
#ifdef UNCOMPRESSER
|
||||||
|
|
Loading…
Reference in New Issue