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 <maciej.pijanka@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4871 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/boot/gdt.c b/src/arch/i386/boot/gdt.c
index 232502753ff8b515045becba7a2f4390ee071a64..c4ed37486d7c21d9af2b5daff7a4d2dceb56ac04 100644 (file)
--- 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 a6c44eb49f9098b2cf28660e6facc59c8e36b85d..b47826dd06f6d8769d755fd312f73373aee7d45a 100644 (file)
--- 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 28ed8b296afc137af6b3043179fc97eb230a2f54..3634f6dd1485d4c7a877511935af0b5e5c46abfb 100644 (file)
--- 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 cc923a8f359019880be4a51ba26ba298556c57e6..f720ba85671a4ad95423d941119c5551a3ad2cb6 100644 (file)
--- 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 <arch/registers.h>
 
+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 7e5dfa03dc3df27b1f998a57dc8c0b3e4e298d81..f0ad2551bb68046ec636510ea72e5f027e76a18d 100644 (file)
--- 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 5f5b0efb02b9185cfef764e2405eeb1017d3c527..f56069effd17d5bc56383c0c5f89bacbb63423ab 100644 (file)
--- 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 eef4c6fd16b6f6b46762f2dc0cbda5c371e098ae..71cd436f0cb20a36926ae9df1ef99b3398406341 100644 (file)
--- 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 5048a5d1ff78de8795b8e72c2d567b52dd7ccfa6..d814a7285ac2b55573d2bf892a47d1ad3f346b8a 100644 (file)
--- 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 51c0b511c7670005a567b7c4465a2cb1bd0d83e0..704a9d4bb1042e2566677531c250ab1369cc67eb 100644 (file)
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -34,10 +34,14 @@
 
 #if !defined(__ROMCC__) && !defined (ASSEMBLY)
 
+#include <device/device.h>
 
+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 96afaa6e7d02a7450343efb658956d38a7215b2d..455cd239fe9c556807af89656db14c8c9284f129 100644 (file)
--- 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 5e0e19a2e5ffc185bbde1928ee385b7199a66fad..eba6eb50c6415a8371336d8308fdf2057343c20e 100644 (file)
--- 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 0ed4bc43ea5e24ea7e74ce7aea9023d64ffa3bba..450ab5f5858ec651f17dd9baf38ff47872761ef7 100644 (file)
--- 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 b9b173177cf2a781dde39c32084bdbb81a992688..f7c6e592845fd672bbaae7c45e35b57762ad914c 100644 (file)
--- 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 25597fba49ecddf5ca81637a03150c1858d8137d..03ca16399a0014e0eae66c83c34e92ff6c297cfa 100644 (file)
--- 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 <console/console.h>
 #include <string.h>
 
+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 e851bdceb85589c32c1d88a99851d897f81217fb..fe3c13cd1d778e1a5b4ff79f0c070d621e2f05b0 100644 (file)
--- 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 7a5320e3702c5e544a190a5c2f0346127bcaba03..37f3f731865ac473ee75d0b47fb896d108d61a87 100644 (file)
--- a/src/pc80/udelay_io.c
+++ b/src/pc80/udelay_io.c
@@ -1,4 +1,5 @@
 #include <arch/io.h>
+#include <delay.h>
 
 void udelay(unsigned usecs)
 {

diff --git a/src/southbridge/intel/i82371eb/i82371eb.h b/src/southbridge/intel/i82371eb/i82371eb.h
index 5797fce498eed671ba35f3ddbbe45d8affd37a48..00c19e04e3ff3c362a181ced5f21623baf1c3a60 100644 (file)
--- 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 6a8de8d80e286875a000ca0ba54dbd04269e0624..bc6465b280f5fc5e5110e00643adf9c3d81ad7c3 100644 (file)
--- 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 af8bb1c8b23caafd3e21df33b3a503b33b8d6f33..9f373e79dd0d95437e17382ea46aa6d0524d69b7 100644 (file)
--- 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 556e81043aac4944fb026499b3617e7ea61527d9..73bfe51099c220c592d4dd32ec2cba8ebbd4ab84 100644 (file)
--- 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;