# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1463254859 -7200
# Node ID aa19895c149a10fc174d565e3cabffd1d1260fe3
# Parent  aac340efb570ed225c59a2e0a9695d7e25a405ea
Removed superfluous void argument type declarations.

diff -r aac340efb570 -r aa19895c149a stage1/board.c
--- a/stage1/board.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage1/board.c	Sat May 14 21:40:59 2016 +0200
@@ -44,7 +44,7 @@
 volatile u8 FW_CONFIG_MOBILE_SDRAM;
 volatile u8 FW_IS_SHARE;
 
-void load_args(void)
+void load_args()
 {
 	/* Get the fw args from memory. See head1.S for the memory layout. */
 
@@ -63,7 +63,7 @@
 
 /* Initialisation functions. */
 
-void gpio_init(void)
+void gpio_init()
 {
 #ifdef CONFIG_CPU_JZ4730
 	/*
@@ -83,7 +83,7 @@
 #endif
 }
 
-void pll_init(void)
+void pll_init()
 {
 	register unsigned int cfcr, plcr1;
 	int nf, pllout2;
@@ -127,7 +127,7 @@
 	while (!__cpm_pll_is_on());
 }
 
-void sdram_init(void)
+void sdram_init()
 {
 	register unsigned int dmcr0, dmcr, sdmode, tmp, cpu_clk, mem_clk, ns;
 	unsigned int pllout = __cpm_get_pllout();
diff -r aac340efb570 -r aa19895c149a stage1/stage1.c
--- a/stage1/stage1.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage1/stage1.c	Sat May 14 21:40:59 2016 +0200
@@ -20,7 +20,7 @@
 
 #include "board.h"
 
-void c_main(void)
+void c_main()
 {
 	load_args();
 	gpio_init();
diff -r aac340efb570 -r aa19895c149a stage2/board-minipc.c
--- a/stage2/board-minipc.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/board-minipc.c	Sat May 14 21:40:59 2016 +0200
@@ -25,7 +25,7 @@
 
 /* Later initialisation functions. */
 
-void gpio_init2(void)
+void gpio_init2()
 {
 	/* LED enable */
         __gpio_as_output(GPIO_LED_EN);
@@ -46,12 +46,12 @@
 	__gpio_as_msc();
 }
 
-void cpm_init(void)
+void cpm_init()
 {
 	__cpm_stop_all();
 }
 
-void rtc_init(void)
+void rtc_init()
 {
 	/* NOTE: May only be accessible via I2C. */
 }
@@ -65,7 +65,7 @@
  * Timer without interrupts.
  */
 
-int timer_init(void)
+int timer_init()
 {
         __ost_set_clock(TIMER_CHAN, OST_TCSR_CKS_PCLK_256);
         __ost_set_reload(TIMER_CHAN, TIMER_FDATA);
@@ -82,14 +82,14 @@
 
 /* Timer interrupt activation. */
 
-void timer_init_irq(void)
+void timer_init_irq()
 {
 	__ost_enable_interrupt(TIMER_CHAN);
 	/* NOTE: Need flag clearing? */
 	__intc_unmask_irq(TIMER_CHAN_IRQ);
 }
 
-void timer_clear(void)
+void timer_clear()
 {
 	__intc_ack_irq(TIMER_CHAN_IRQ);
 	__ost_clear_uf(TIMER_CHAN);
@@ -97,7 +97,7 @@
 
 /* Board startup detection. */
 
-int is_started(void)
+int is_started()
 {
 	return REG_CPM_MSCR != 0;
 }
diff -r aac340efb570 -r aa19895c149a stage2/board-nanonote.c
--- a/stage2/board-nanonote.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/board-nanonote.c	Sat May 14 21:40:59 2016 +0200
@@ -25,7 +25,7 @@
 
 /* Later initialisation functions. */
 
-void gpio_init2(void)
+void gpio_init2()
 {
 	/*
 	 * Initialize LCD pins
@@ -80,7 +80,7 @@
 	__gpio_enable_pull(GPIO_USB_DETECT);
 }
 
-void cpm_init(void)
+void cpm_init()
 {
 	__cpm_stop_ipu();
 	__cpm_stop_cim();
@@ -94,7 +94,7 @@
 /*	__cpm_stop_aic2();*/
 }
 
-void rtc_init(void)
+void rtc_init()
 {
 	while ( !__rtc_write_ready());
 	__rtc_enable_alarm();	/* enable alarm */
@@ -118,7 +118,7 @@
  * Timer without interrupts.
  */
 
-void timer_init(void)
+void timer_init()
 {
 	__tcu_disable_pwm_output(TIMER_CHAN);
 	__tcu_select_extalclk(TIMER_CHAN);
@@ -140,14 +140,14 @@
 
 /* Timer interrupt activation. */
 
-void timer_init_irq(void)
+void timer_init_irq()
 {
 	__tcu_unmask_full_match_irq(TIMER_CHAN);
 	__tcu_clear_full_match_flag(TIMER_CHAN);
 	__intc_unmask_irq(TIMER_CHAN_IRQ);
 }
 
-void timer_clear(void)
+void timer_clear()
 {
 	__intc_ack_irq(TIMER_CHAN_IRQ);
 	__tcu_clear_full_match_flag(TIMER_CHAN);
@@ -155,7 +155,7 @@
 
 /* Board startup detection. */
 
-int is_started(void)
+int is_started()
 {
 	return REG_CPM_CLKGR != 0;
 }
diff -r aac340efb570 -r aa19895c149a stage2/board.c
--- a/stage2/board.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/board.c	Sat May 14 21:40:59 2016 +0200
@@ -22,7 +22,7 @@
 #include "sdram.h"
 #include "board.h"
 
-unsigned long get_memory_size(void)
+unsigned long get_memory_size()
 {
 	unsigned int dmcr;
 	unsigned int rows, cols, dw, banks;
@@ -44,7 +44,7 @@
 extern unsigned long timestamp;
 extern unsigned long lastdec;
 
-unsigned long get_timer_masked (void)
+unsigned long get_timer_masked()
 {
 	unsigned long now = READ_TIMER;
 
@@ -60,14 +60,14 @@
 	return timestamp;
 }
 
-void reset_timer_masked (void)
+void reset_timer_masked()
 {
 	/* reset time */
 	lastdec = READ_TIMER;
 	timestamp = 0;
 }
 
-void reset_timer(void)
+void reset_timer()
 {
 	reset_timer_masked ();
 }
@@ -143,7 +143,7 @@
  * This function is derived from PowerPC code (read timebase as long long).
  * On MIPS it just returns the timer value.
  */
-unsigned long long get_ticks(void)
+unsigned long long get_ticks()
 {
 	return get_timer(0);
 }
@@ -152,7 +152,7 @@
  * This function is derived from PowerPC code (timebase clock frequency).
  * On MIPS it returns the number of timer ticks per second.
  */
-unsigned long get_tbclk (void)
+unsigned long get_tbclk()
 {
 	return TIMER_HZ;
 }
diff -r aac340efb570 -r aa19895c149a stage2/board.h
--- a/stage2/board.h	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/board.h	Sat May 14 21:40:59 2016 +0200
@@ -3,8 +3,8 @@
 
 /* Utility functions. */
 
-void udelay(unsigned long usec);
-unsigned long get_memory_size(void);
+void udelay(unsigned long);
+unsigned long get_memory_size();
 
 #define TIMER_HZ		CONFIG_SYS_HZ
 #define TIMER_CHAN		0
diff -r aac340efb570 -r aa19895c149a stage2/cpu.c
--- a/stage2/cpu.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/cpu.c	Sat May 14 21:40:59 2016 +0200
@@ -28,7 +28,7 @@
 #include "paging.h"
 #include "sdram.h"
 
-void flush_icache_all(void)
+void flush_icache_all()
 {
 	u32 addr;
 
@@ -40,7 +40,7 @@
 	flush_icache_config();
 }
 
-void flush_dcache_all(void)
+void flush_dcache_all()
 {
 	u32 addr;
 
@@ -50,7 +50,7 @@
 	asm volatile ("sync");
 }
 
-void flush_cache_all(void)
+void flush_cache_all()
 {
 	flush_dcache_all();
 	flush_icache_all();
diff -r aac340efb570 -r aa19895c149a stage2/init.h
--- a/stage2/init.h	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/init.h	Sat May 14 21:40:59 2016 +0200
@@ -3,12 +3,12 @@
 
 /* Initialisation functions. */
 
-void gpio_init2(void);
-void cpm_init(void);
-void rtc_init(void);
-void timer_init(void);
-void timer_init_irq(void);
-void timer_clear(void);
-int is_started(void);
+void gpio_init2();
+void cpm_init();
+void rtc_init();
+void timer_init();
+void timer_init_irq();
+void timer_clear();
+int is_started();
 
 #endif /* __INIT_H__ */
diff -r aac340efb570 -r aa19895c149a stage2/irq.h
--- a/stage2/irq.h	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/irq.h	Sat May 14 21:40:59 2016 +0200
@@ -3,6 +3,6 @@
 
 /* Initialisation functions. */
 
-void irq_init(void);
+void irq_init();
 
 #endif /* __IRQ_H__ */
diff -r aac340efb570 -r aa19895c149a stage2/jzlcd.c
--- a/stage2/jzlcd.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/jzlcd.c	Sat May 14 21:40:59 2016 +0200
@@ -470,7 +470,7 @@
 	panel_info.vl_bpix = LCD_CODE(bpp);
 }
 
-void lcd_enable(void)
+void lcd_enable()
 {
 	/* Clear the disable bit and set the enable bit. */
 
@@ -478,12 +478,12 @@
 	REG_LCD_CTRL |= 1<<3;		/* LCDCTRL.ENA*/
 }
 
-void lcd_disable(void)
+void lcd_disable()
 {
 	REG_LCD_CTRL |= (1<<4);		/* LCDCTRL.DIS, regular disable */
 }
 
-void lcd_quick_disable(void)
+void lcd_quick_disable()
 {
 	REG_LCD_CTRL &= ~(1<<4);	/* LCDCTRL.ENA, quick disable */
 }
diff -r aac340efb570 -r aa19895c149a stage2/jzlcd.h
--- a/stage2/jzlcd.h	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/jzlcd.h	Sat May 14 21:40:59 2016 +0200
@@ -29,8 +29,8 @@
 
 void lcd_set_bpp(u8 bpp);
 unsigned long lcd_ctrl_init();
-void lcd_enable(void);
-void lcd_disable(void);
+void lcd_enable();
+void lcd_disable();
 
 /*
  * Framebuffer characteristics
diff -r aac340efb570 -r aa19895c149a stage2/lcd.c
--- a/stage2/lcd.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/lcd.c	Sat May 14 21:40:59 2016 +0200
@@ -257,7 +257,7 @@
 
 /* LCD initialisation. */
 
-void lcd_init(void)
+void lcd_init()
 {
 	__lcd_display_pin_init();
 	__lcd_display_on();
diff -r aac340efb570 -r aa19895c149a stage2/lcd.h
--- a/stage2/lcd.h	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/lcd.h	Sat May 14 21:40:59 2016 +0200
@@ -5,7 +5,7 @@
 
 /* Initialisation functions. */
 
-void lcd_init(void);
+void lcd_init();
 
 /* Output functions. */
 
diff -r aac340efb570 -r aa19895c149a stage2/stage2.c
--- a/stage2/stage2.c	Sat May 14 21:36:55 2016 +0200
+++ b/stage2/stage2.c	Sat May 14 21:40:59 2016 +0200
@@ -26,7 +26,7 @@
 #include "tasks.h"
 #include "example.h"
 
-void c_main(void)
+void c_main()
 {
 	volatile int started;