From ea92185755a578d9a1b5df5cbf7b05ee2cea2390 Mon Sep 17 00:00:00 2001 From: Maciej Pijanka Date: Tue, 27 Oct 2009 14:29:29 +0000 Subject: [PATCH] Add few missing prototypes, and remove few unused (thus lonelly) variables. TODO - x86emu need (imo) some common header with prototypes at least - clog2, ulzma, hardwaremain prototypes added by this patch probably should be moved to some header too. - in src/devices/device_util.c prototype is before function because seems, it is used only within same file, if not it should be moved to debug section of prototypes in include/device/device.h Signed-off-by: Maciej Pijanka Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4871 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/gdt.c | 1 + src/arch/i386/boot/tables.c | 2 -- src/arch/i386/include/div64.h | 3 +++ src/arch/i386/lib/exception.c | 2 ++ src/arch/i386/lib/printk_init.c | 3 +++ src/boot/hardwaremain.c | 2 ++ src/devices/device_util.c | 2 +- src/include/cbmem.h | 2 ++ src/include/cpu/x86/mtrr.h | 4 ++++ src/include/cpu/x86/tsc.h | 2 ++ src/include/device/device.h | 2 ++ src/lib/cbmem.c | 4 ++-- src/lib/clog2.c | 2 ++ src/lib/lzma.c | 1 + src/pc80/mc146818rtc.c | 2 ++ src/pc80/udelay_io.c | 1 + src/southbridge/intel/i82371eb/i82371eb.h | 1 + src/southbridge/intel/i82371eb/i82371eb_isa.c | 1 - util/x86emu/x86.c | 3 +-- util/x86emu/x86_interrupts.c | 4 ++++ 20 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/arch/i386/boot/gdt.c b/src/arch/i386/boot/gdt.c index 232502753..c4ed37486 100644 --- a/src/arch/i386/boot/gdt.c +++ b/src/arch/i386/boot/gdt.c @@ -33,6 +33,7 @@ struct gdtarg { } __attribute__((packed)); // Copy GDT to new location and reload it +void move_gdt(void); void move_gdt(void) { void *newgdt; diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c index a6c44eb49..b47826dd0 100644 --- a/src/arch/i386/boot/tables.c +++ b/src/arch/i386/boot/tables.c @@ -34,8 +34,6 @@ uint64_t high_tables_base = 0; uint64_t high_tables_size; -void cbmem_list(void); - void move_gdt(void); void cbmem_arch_init(void) { diff --git a/src/arch/i386/include/div64.h b/src/arch/i386/include/div64.h index 28ed8b296..3634f6dd1 100644 --- a/src/arch/i386/include/div64.h +++ b/src/arch/i386/include/div64.h @@ -35,6 +35,9 @@ */ #define div_long_long_rem(a,b,c) div_ll_X_l_rem(a,b,c) +extern inline long +div_ll_X_l_rem(long long divs, long div, long *rem); + extern inline long div_ll_X_l_rem(long long divs, long div, long *rem) { diff --git a/src/arch/i386/lib/exception.c b/src/arch/i386/lib/exception.c index cc923a8f3..f720ba856 100644 --- a/src/arch/i386/lib/exception.c +++ b/src/arch/i386/lib/exception.c @@ -361,6 +361,8 @@ static void put_packet(char *buffer) #include +void x86_exception(struct eregs *info); + void x86_exception(struct eregs *info) { #if CONFIG_GDB_STUB == 1 diff --git a/src/arch/i386/lib/printk_init.c b/src/arch/i386/lib/printk_init.c index 7e5dfa03d..f0ad2551b 100644 --- a/src/arch/i386/lib/printk_init.c +++ b/src/arch/i386/lib/printk_init.c @@ -32,6 +32,9 @@ int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; #define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL #endif +void console_tx_byte(unsigned char byte); +int do_printk(int msg_level, const char *fmt, ...); + void console_tx_byte(unsigned char byte) { if (byte == '\n') diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index 5f5b0efb0..f56069eff 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -52,6 +52,8 @@ it with the version available from LANL. * In the dev_enumerate() phase, */ +void hardwaremain(int boot_complete); + void hardwaremain(int boot_complete) { struct lb_memory *lb_mem; diff --git a/src/devices/device_util.c b/src/devices/device_util.c index eef4c6fd1..71cd436f0 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -556,7 +556,7 @@ void disable_children(struct bus *bus) } } -void resource_tree(struct device *root, int debug_level, int depth) +static void resource_tree(struct device *root, int debug_level, int depth) { int i = 0, link = 0; struct device *child; diff --git a/src/include/cbmem.h b/src/include/cbmem.h index 5048a5d1f..d814a7285 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -45,5 +45,7 @@ void cbmem_init(u64 baseaddr, u64 size); int cbmem_reinit(u64 baseaddr); void *cbmem_add(u32 id, u64 size); void *cbmem_find(u32 id); +void cbmem_list(void); +void cbmem_arch_init(void); #endif diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index 51c0b511c..704a9d4bb 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -34,10 +34,14 @@ #if !defined(__ROMCC__) && !defined (ASSEMBLY) +#include +void enable_fixed_mtrr(void); void x86_setup_var_mtrrs(unsigned address_bits); void x86_setup_mtrrs(unsigned address_bits); int x86_mtrr_check(void); +void set_var_mtrr_resource(void *gp, struct device *dev, struct resource *res); +void x86_setup_fixed_mtrrs(void); #endif /* __ROMCC__ */ diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 96afaa6e7..455cd239f 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -24,6 +24,8 @@ static inline unsigned long long rdtscll(void) asm volatile ("rdtsc" : "=A" (val)); return val; } + +void init_timer(void); #endif diff --git a/src/include/device/device.h b/src/include/device/device.h index 5e0e19a2e..eba6eb50c 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -132,6 +132,7 @@ void print_resource_tree(struct device * root, int debug_level, void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum); void show_devs_subtree(struct device *root, int debug_level, const char *msg); void show_all_devs(int debug_level, const char *msg); +void show_all_devs_tree(int debug_level, const char *msg); void show_one_resource(int debug_level, struct device *dev, struct resource *resource, const char *comment); void show_all_devs_resources(int debug_level, const char* msg); @@ -152,4 +153,5 @@ void enable_childrens_resources(device_t dev); void root_dev_enable_resources(device_t dev); unsigned int root_dev_scan_bus(device_t root, unsigned int max); void root_dev_init(device_t dev); +void root_dev_reset(struct bus *bus); #endif /* DEVICE_H */ diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 0ed4bc43e..450ab5f58 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -90,7 +90,7 @@ int cbmem_reinit(u64 baseaddr) struct cbmem_entry *cbmem_toc; cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr; - debug("Re-Initializing CBMEM area to 0x%lx\n", baseaddr); + debug("Re-Initializing CBMEM area to 0x%lx\n", (unsigned long)baseaddr); #ifndef __ROMCC__ bss_cbmem_toc = cbmem_toc; #endif @@ -212,7 +212,7 @@ void cbmem_list(void) #endif if (cbmem_toc == NULL) - return NULL; + return; for (i = 0; i < MAX_CBMEM_ENTRIES; i++) { diff --git a/src/lib/clog2.c b/src/lib/clog2.c index b9b173177..f7c6e5928 100644 --- a/src/lib/clog2.c +++ b/src/lib/clog2.c @@ -7,6 +7,8 @@ /* Assume 8 bits per byte */ #define CHAR_BIT 8 +unsigned long log2(unsigned long x); + unsigned long log2(unsigned long x) { // assume 8 bits per byte. diff --git a/src/lib/lzma.c b/src/lib/lzma.c index 25597fba4..03ca16399 100644 --- a/src/lib/lzma.c +++ b/src/lib/lzma.c @@ -14,6 +14,7 @@ SDK 4.42, which is written and distributed to public domain by Igor Pavlov. #include #include +unsigned long ulzma(unsigned char * src, unsigned char * dst); unsigned long ulzma(unsigned char * src, unsigned char * dst) { diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c index e851bdceb..fe3c13cd1 100644 --- a/src/pc80/mc146818rtc.c +++ b/src/pc80/mc146818rtc.c @@ -133,8 +133,10 @@ static void rtc_set_checksum(int range_start, int range_end, int cks_loc) void rtc_init(int invalid) { +#if CONFIG_HAVE_OPTION_TABLE unsigned char x; int cmos_invalid, checksum_invalid; +#endif printk_debug("RTC Init\n"); diff --git a/src/pc80/udelay_io.c b/src/pc80/udelay_io.c index 7a5320e37..37f3f7318 100644 --- a/src/pc80/udelay_io.c +++ b/src/pc80/udelay_io.c @@ -1,4 +1,5 @@ #include +#include void udelay(unsigned usecs) { diff --git a/src/southbridge/intel/i82371eb/i82371eb.h b/src/southbridge/intel/i82371eb/i82371eb.h index 5797fce49..00c19e04e 100644 --- a/src/southbridge/intel/i82371eb/i82371eb.h +++ b/src/southbridge/intel/i82371eb/i82371eb.h @@ -24,6 +24,7 @@ #ifndef __ROMCC__ #include "chip.h" void i82371eb_enable(device_t dev); +void i82371eb_hard_reset(void); #endif /* If 'cond' is true this macro sets the bit(s) specified by 'bits' in the diff --git a/src/southbridge/intel/i82371eb/i82371eb_isa.c b/src/southbridge/intel/i82371eb/i82371eb_isa.c index 6a8de8d80..bc6465b28 100644 --- a/src/southbridge/intel/i82371eb/i82371eb_isa.c +++ b/src/southbridge/intel/i82371eb/i82371eb_isa.c @@ -29,7 +29,6 @@ static void isa_init(struct device *dev) { - u16 reg16; u32 reg32; /* Initialize the real time clock (RTC). */ diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c index af8bb1c8b..9f373e79d 100644 --- a/util/x86emu/x86.c +++ b/util/x86emu/x86.c @@ -36,6 +36,7 @@ struct realmode_idt { }; void x86_exception(struct eregs *info); +void run_bios(struct device *dev, unsigned long addr); extern unsigned char __idt_handler, __idt_handler_size; extern unsigned char __realmode_code, __realmode_code_size; @@ -124,8 +125,6 @@ static void setup_realmode_idt(void) void run_bios(struct device *dev, unsigned long addr) { - int i; - /* clear vga bios data area */ memset(0x400, 0, 0x200); diff --git a/util/x86emu/x86_interrupts.c b/util/x86emu/x86_interrupts.c index 556e81043..73bfe5109 100644 --- a/util/x86emu/x86_interrupts.c +++ b/util/x86emu/x86_interrupts.c @@ -51,6 +51,10 @@ enum { PCIBIOS_BADREG = 0x8700 }; +int int12_handler(struct eregs *regs); +int int1a_handler(struct eregs *regs); +int int15_handler(struct eregs *regs); + int int12_handler(struct eregs *regs) { regs->eax = 64 * 1024; -- 2.25.1