This patch creates lib.h for homeless prototypes.
Signed-off-by: Myles Watson <myle...@gmail.com>
It also looks like xmodem.c could be dropped.
Thanks,
Myles
Index: svn/src/include/lib.h
===================================================================
--- /dev/null
+++ svn/src/include/lib.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009, Myles Watson <myle...@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ */
+
+/* This file is for "nuisance prototypes" that have no other home. */
+
+/* Defined in src/lib/clog2.c */
+unsigned long log2(unsigned long x);
+
+/* Defined in src/lib/lzma.c */
+unsigned long ulzma(unsigned char *src, unsigned char *dst);
+
+/* Defined in src/arch/i386/boot/gdt.c */
+void move_gdt(void);
+
Index: svn/src/lib/clog2.c
===================================================================
--- svn.orig/src/lib/clog2.c
+++ svn/src/lib/clog2.c
@@ -4,11 +4,11 @@
#include <console/console.h>
#endif
+#include <lib.h>
+
/* 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.
Index: svn/src/lib/cbfs.c
===================================================================
--- svn.orig/src/lib/cbfs.c
+++ svn/src/lib/cbfs.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <console/console.h>
#include <cbfs.h>
+#include <lib.h>
#ifndef CONFIG_BIG_ENDIAN
#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
@@ -29,8 +30,6 @@
#define ntohl(x) (x)
#endif
-unsigned long ulzma(unsigned char *src, unsigned char *dst);
-
int cbfs_decompress(int algo, void *src, void *dst, int len)
{
switch(algo) {
Index: svn/src/arch/i386/boot/gdt.c
===================================================================
--- svn.orig/src/arch/i386/boot/gdt.c
+++ svn/src/arch/i386/boot/gdt.c
@@ -20,6 +20,7 @@
#include <types.h>
#include <string.h>
#include <cbmem.h>
+#include <lib.h>
#include <console/console.h>
// Global Descriptor Table, defined in c_start.S
@@ -33,7 +34,6 @@ struct gdtarg {
} __attribute__((packed));
// Copy GDT to new location and reload it
-void move_gdt(void);
void move_gdt(void)
{
void *newgdt;
Index: svn/src/arch/i386/boot/tables.c
===================================================================
--- svn.orig/src/arch/i386/boot/tables.c
+++ svn/src/arch/i386/boot/tables.c
@@ -30,11 +30,11 @@
#include <cpu/x86/multiboot.h>
#include "coreboot_table.h"
#include <cbmem.h>
+#include <lib.h>
uint64_t high_tables_base = 0;
uint64_t high_tables_size;
-void move_gdt(void);
void cbmem_arch_init(void)
{
/* defined in gdt.c */
Index: svn/src/boot/selfboot.c
===================================================================
--- svn.orig/src/boot/selfboot.c
+++ svn/src/boot/selfboot.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <cbfs.h>
+#include <lib.h>
#ifndef CONFIG_BIG_ENDIAN
#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
@@ -462,7 +463,6 @@ static int load_self_segments(
switch(ptr->compression) {
case CBFS_COMPRESS_LZMA: {
printk_debug("using LZMA\n");
- unsigned long ulzma(unsigned char *src, unsigned char *dst);
len = ulzma(src, dest);
break;
}
Index: svn/src/lib/lzma.c
===================================================================
--- svn.orig/src/lib/lzma.c
+++ svn/src/lib/lzma.c
@@ -13,8 +13,7 @@ SDK 4.42, which is written and distribut
#include "lzmadecode.c"
#include <console/console.h>
#include <string.h>
-
-unsigned long ulzma(unsigned char * src, unsigned char * dst);
+#include <lib.h>
unsigned long ulzma(unsigned char * src, unsigned char * dst)
{
Index: svn/src/lib/xmodem.c
===================================================================
--- svn.orig/src/lib/xmodem.c
+++ svn/src/lib/xmodem.c
@@ -19,10 +19,7 @@
#include <string.h>
#include <delay.h>
-
-extern void uart8250_tx_byte(unsigned, unsigned char);
-extern int uart8250_can_rx_byte(unsigned);
-extern unsigned char uart8250_rx_byte(unsigned);
+#include <uart8250.h>
static int _inbyte(int msec)
{
Index: svn/src/console/vsprintf.c
===================================================================
--- svn.orig/src/console/vsprintf.c
+++ svn/src/console/vsprintf.c
@@ -20,6 +20,7 @@
*/
#include <stdarg.h>
+#include <string.h>
#include <smp/spinlock.h>
#include <console/vtxprintf.h>
@@ -48,8 +49,6 @@ static int vsprintf(char *buf, const cha
return i;
}
-int sprintf(char *buf, const char *fmt, ...);
-
int sprintf(char *buf, const char *fmt, ...)
{
va_list args;
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
