fix compiler warnings

Signed-off-by: Michael Walle <michael@walle.cc>
fallen · Apr 8, 2012 · 3aa9e9e · 3aa9e9e
1 parent 0cf6156
commit 3aa9e9e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/software/bios/boot.c b/software/bios/boot.c
@@ -57,7 +57,7 @@ static void __attribute__((noreturn)) boot(unsigned int r1, unsigned int r2, uns
 /* Note that we do not use the hw timer so that this function works
  * even if the system controller does not.
  */
-static int check_ack()
+static int check_ack(void)
 {
 	int timeout;
 	int recognized;
@@ -87,7 +87,7 @@ static int check_ack()
 
 #define MAX_FAILED 5
 
-void serialboot()
+void serialboot(void)
 {
 	struct sfl_frame frame;
 	int failed;
@@ -230,7 +230,7 @@ static int tftp_get_v(unsigned int ip, const char *filename, char *buffer)
 	return r;
 }
 
-void netboot()
+void netboot(void)
 {
 	int size;
 	unsigned int cmdline_adr, initrdstart_adr, initrdend_adr;
@@ -332,7 +332,7 @@ static void lzma_error(char *x)
 	printf("LZMA error: %s\n", x);
 }
 
-void flashboot()
+void flashboot(void)
 {
 	unsigned int *flashbase;
 	unsigned int length;

diff --git a/software/bios/boot.h b/software/bios/boot.h
@@ -18,9 +18,9 @@
 #ifndef __BOOT_H
 #define __BOOT_H
 
-void serialboot();
-void netboot();
+void serialboot(void);
+void netboot(void);
 void fsboot(int devnr);
-void flashboot();
+void flashboot(void);
 
 #endif /* __BOOT_H */
diff --git a/software/bios/isr.c b/software/bios/isr.c
@@ -22,7 +22,7 @@
 #include <hal/usb.h>
 #include <hal/tmu.h>
 
-void isr()
+void isr(void)
 {
 	unsigned int irqs;
 

diff --git a/software/bios/main.c b/software/bios/main.c
@@ -391,7 +391,7 @@ static void mdiow(char *reg, char *value)
 
 /* Init + command line */
 
-static void help()
+static void help(void)
 {
 	puts("Milkymist(tm) BIOS (bootloader)");
 	puts("Don't know what to do? Try 'flashboot'.\n");
@@ -470,7 +470,7 @@ static void do_command(char *c)
 		printf("Command not found\n");
 }
 
-static int test_user_abort()
+static int test_user_abort(void)
 {
 	char c;
 
@@ -500,7 +500,7 @@ int rescue;
 
 extern unsigned int _edata;
 
-static void crcbios()
+static void crcbios(void)
 {
 	unsigned int offset_bios;
 	unsigned int length;
@@ -525,7 +525,7 @@ static void crcbios()
 	}
 }
 
-static void print_mac()
+static void print_mac(void)
 {
 	unsigned char *macadr = (unsigned char *)FLASH_OFFSET_MAC_ADDRESS;
 
@@ -539,7 +539,7 @@ static const char banner[] =
 	"it under the terms of the GNU General Public License as published by\n"
 	"the Free Software Foundation, version 3 of the License.\n\n";
 
-static void boot_sequence()
+static void boot_sequence(void)
 {
 	if(test_user_abort()) {
 		if(rescue) {
@@ -593,15 +593,15 @@ static void readstr(char *s, int size)
 	}
 }
 
-static void ethreset_delay()
+static void ethreset_delay(void)
 {
 	CSR_TIMER0_COUNTER = 0;
 	CSR_TIMER0_COMPARE = CSR_FREQUENCY >> 2;
 	CSR_TIMER0_CONTROL = TIMER_ENABLE;
 	while(CSR_TIMER0_CONTROL & TIMER_ENABLE);
 }
 
-static void ethreset()
+static void ethreset(void)
 {
 	CSR_MINIMAC_SETUP = MINIMAC_SETUP_PHYRST;
 	ethreset_delay();

diff --git a/software/bios/splash.c b/software/bios/splash.c
@@ -23,7 +23,7 @@
 
 extern int rescue;
 
-void splash_display()
+void splash_display(void)
 {
 	int i;
 	unsigned short *splash_src = rescue ? (unsigned short *)FLASH_OFFSET_RESCUE_SPLASH : (unsigned short *)FLASH_OFFSET_REGULAR_SPLASH;

diff --git a/software/bios/splash.h b/software/bios/splash.h
@@ -18,6 +18,6 @@
 #ifndef __SPLASH_H
 #define __SPLASH_H
 
-void splash_display();
+void splash_display(void);
 
 #endif /* __SPLASH_H */