1.1 --- a/stage1/board.c Sat May 14 21:36:55 2016 +0200
1.2 +++ b/stage1/board.c Sat May 14 21:40:59 2016 +0200
1.3 @@ -44,7 +44,7 @@
1.4 volatile u8 FW_CONFIG_MOBILE_SDRAM;
1.5 volatile u8 FW_IS_SHARE;
1.6
1.7 -void load_args(void)
1.8 +void load_args()
1.9 {
1.10 /* Get the fw args from memory. See head1.S for the memory layout. */
1.11
1.12 @@ -63,7 +63,7 @@
1.13
1.14 /* Initialisation functions. */
1.15
1.16 -void gpio_init(void)
1.17 +void gpio_init()
1.18 {
1.19 #ifdef CONFIG_CPU_JZ4730
1.20 /*
1.21 @@ -83,7 +83,7 @@
1.22 #endif
1.23 }
1.24
1.25 -void pll_init(void)
1.26 +void pll_init()
1.27 {
1.28 register unsigned int cfcr, plcr1;
1.29 int nf, pllout2;
1.30 @@ -127,7 +127,7 @@
1.31 while (!__cpm_pll_is_on());
1.32 }
1.33
1.34 -void sdram_init(void)
1.35 +void sdram_init()
1.36 {
1.37 register unsigned int dmcr0, dmcr, sdmode, tmp, cpu_clk, mem_clk, ns;
1.38 unsigned int pllout = __cpm_get_pllout();
2.1 --- a/stage1/stage1.c Sat May 14 21:36:55 2016 +0200
2.2 +++ b/stage1/stage1.c Sat May 14 21:40:59 2016 +0200
2.3 @@ -20,7 +20,7 @@
2.4
2.5 #include "board.h"
2.6
2.7 -void c_main(void)
2.8 +void c_main()
2.9 {
2.10 load_args();
2.11 gpio_init();
3.1 --- a/stage2/board-minipc.c Sat May 14 21:36:55 2016 +0200
3.2 +++ b/stage2/board-minipc.c Sat May 14 21:40:59 2016 +0200
3.3 @@ -25,7 +25,7 @@
3.4
3.5 /* Later initialisation functions. */
3.6
3.7 -void gpio_init2(void)
3.8 +void gpio_init2()
3.9 {
3.10 /* LED enable */
3.11 __gpio_as_output(GPIO_LED_EN);
3.12 @@ -46,12 +46,12 @@
3.13 __gpio_as_msc();
3.14 }
3.15
3.16 -void cpm_init(void)
3.17 +void cpm_init()
3.18 {
3.19 __cpm_stop_all();
3.20 }
3.21
3.22 -void rtc_init(void)
3.23 +void rtc_init()
3.24 {
3.25 /* NOTE: May only be accessible via I2C. */
3.26 }
3.27 @@ -65,7 +65,7 @@
3.28 * Timer without interrupts.
3.29 */
3.30
3.31 -int timer_init(void)
3.32 +int timer_init()
3.33 {
3.34 __ost_set_clock(TIMER_CHAN, OST_TCSR_CKS_PCLK_256);
3.35 __ost_set_reload(TIMER_CHAN, TIMER_FDATA);
3.36 @@ -82,14 +82,14 @@
3.37
3.38 /* Timer interrupt activation. */
3.39
3.40 -void timer_init_irq(void)
3.41 +void timer_init_irq()
3.42 {
3.43 __ost_enable_interrupt(TIMER_CHAN);
3.44 /* NOTE: Need flag clearing? */
3.45 __intc_unmask_irq(TIMER_CHAN_IRQ);
3.46 }
3.47
3.48 -void timer_clear(void)
3.49 +void timer_clear()
3.50 {
3.51 __intc_ack_irq(TIMER_CHAN_IRQ);
3.52 __ost_clear_uf(TIMER_CHAN);
3.53 @@ -97,7 +97,7 @@
3.54
3.55 /* Board startup detection. */
3.56
3.57 -int is_started(void)
3.58 +int is_started()
3.59 {
3.60 return REG_CPM_MSCR != 0;
3.61 }
4.1 --- a/stage2/board-nanonote.c Sat May 14 21:36:55 2016 +0200
4.2 +++ b/stage2/board-nanonote.c Sat May 14 21:40:59 2016 +0200
4.3 @@ -25,7 +25,7 @@
4.4
4.5 /* Later initialisation functions. */
4.6
4.7 -void gpio_init2(void)
4.8 +void gpio_init2()
4.9 {
4.10 /*
4.11 * Initialize LCD pins
4.12 @@ -80,7 +80,7 @@
4.13 __gpio_enable_pull(GPIO_USB_DETECT);
4.14 }
4.15
4.16 -void cpm_init(void)
4.17 +void cpm_init()
4.18 {
4.19 __cpm_stop_ipu();
4.20 __cpm_stop_cim();
4.21 @@ -94,7 +94,7 @@
4.22 /* __cpm_stop_aic2();*/
4.23 }
4.24
4.25 -void rtc_init(void)
4.26 +void rtc_init()
4.27 {
4.28 while ( !__rtc_write_ready());
4.29 __rtc_enable_alarm(); /* enable alarm */
4.30 @@ -118,7 +118,7 @@
4.31 * Timer without interrupts.
4.32 */
4.33
4.34 -void timer_init(void)
4.35 +void timer_init()
4.36 {
4.37 __tcu_disable_pwm_output(TIMER_CHAN);
4.38 __tcu_select_extalclk(TIMER_CHAN);
4.39 @@ -140,14 +140,14 @@
4.40
4.41 /* Timer interrupt activation. */
4.42
4.43 -void timer_init_irq(void)
4.44 +void timer_init_irq()
4.45 {
4.46 __tcu_unmask_full_match_irq(TIMER_CHAN);
4.47 __tcu_clear_full_match_flag(TIMER_CHAN);
4.48 __intc_unmask_irq(TIMER_CHAN_IRQ);
4.49 }
4.50
4.51 -void timer_clear(void)
4.52 +void timer_clear()
4.53 {
4.54 __intc_ack_irq(TIMER_CHAN_IRQ);
4.55 __tcu_clear_full_match_flag(TIMER_CHAN);
4.56 @@ -155,7 +155,7 @@
4.57
4.58 /* Board startup detection. */
4.59
4.60 -int is_started(void)
4.61 +int is_started()
4.62 {
4.63 return REG_CPM_CLKGR != 0;
4.64 }
5.1 --- a/stage2/board.c Sat May 14 21:36:55 2016 +0200
5.2 +++ b/stage2/board.c Sat May 14 21:40:59 2016 +0200
5.3 @@ -22,7 +22,7 @@
5.4 #include "sdram.h"
5.5 #include "board.h"
5.6
5.7 -unsigned long get_memory_size(void)
5.8 +unsigned long get_memory_size()
5.9 {
5.10 unsigned int dmcr;
5.11 unsigned int rows, cols, dw, banks;
5.12 @@ -44,7 +44,7 @@
5.13 extern unsigned long timestamp;
5.14 extern unsigned long lastdec;
5.15
5.16 -unsigned long get_timer_masked (void)
5.17 +unsigned long get_timer_masked()
5.18 {
5.19 unsigned long now = READ_TIMER;
5.20
5.21 @@ -60,14 +60,14 @@
5.22 return timestamp;
5.23 }
5.24
5.25 -void reset_timer_masked (void)
5.26 +void reset_timer_masked()
5.27 {
5.28 /* reset time */
5.29 lastdec = READ_TIMER;
5.30 timestamp = 0;
5.31 }
5.32
5.33 -void reset_timer(void)
5.34 +void reset_timer()
5.35 {
5.36 reset_timer_masked ();
5.37 }
5.38 @@ -143,7 +143,7 @@
5.39 * This function is derived from PowerPC code (read timebase as long long).
5.40 * On MIPS it just returns the timer value.
5.41 */
5.42 -unsigned long long get_ticks(void)
5.43 +unsigned long long get_ticks()
5.44 {
5.45 return get_timer(0);
5.46 }
5.47 @@ -152,7 +152,7 @@
5.48 * This function is derived from PowerPC code (timebase clock frequency).
5.49 * On MIPS it returns the number of timer ticks per second.
5.50 */
5.51 -unsigned long get_tbclk (void)
5.52 +unsigned long get_tbclk()
5.53 {
5.54 return TIMER_HZ;
5.55 }
6.1 --- a/stage2/board.h Sat May 14 21:36:55 2016 +0200
6.2 +++ b/stage2/board.h Sat May 14 21:40:59 2016 +0200
6.3 @@ -3,8 +3,8 @@
6.4
6.5 /* Utility functions. */
6.6
6.7 -void udelay(unsigned long usec);
6.8 -unsigned long get_memory_size(void);
6.9 +void udelay(unsigned long);
6.10 +unsigned long get_memory_size();
6.11
6.12 #define TIMER_HZ CONFIG_SYS_HZ
6.13 #define TIMER_CHAN 0
7.1 --- a/stage2/cpu.c Sat May 14 21:36:55 2016 +0200
7.2 +++ b/stage2/cpu.c Sat May 14 21:40:59 2016 +0200
7.3 @@ -28,7 +28,7 @@
7.4 #include "paging.h"
7.5 #include "sdram.h"
7.6
7.7 -void flush_icache_all(void)
7.8 +void flush_icache_all()
7.9 {
7.10 u32 addr;
7.11
7.12 @@ -40,7 +40,7 @@
7.13 flush_icache_config();
7.14 }
7.15
7.16 -void flush_dcache_all(void)
7.17 +void flush_dcache_all()
7.18 {
7.19 u32 addr;
7.20
7.21 @@ -50,7 +50,7 @@
7.22 asm volatile ("sync");
7.23 }
7.24
7.25 -void flush_cache_all(void)
7.26 +void flush_cache_all()
7.27 {
7.28 flush_dcache_all();
7.29 flush_icache_all();
8.1 --- a/stage2/init.h Sat May 14 21:36:55 2016 +0200
8.2 +++ b/stage2/init.h Sat May 14 21:40:59 2016 +0200
8.3 @@ -3,12 +3,12 @@
8.4
8.5 /* Initialisation functions. */
8.6
8.7 -void gpio_init2(void);
8.8 -void cpm_init(void);
8.9 -void rtc_init(void);
8.10 -void timer_init(void);
8.11 -void timer_init_irq(void);
8.12 -void timer_clear(void);
8.13 -int is_started(void);
8.14 +void gpio_init2();
8.15 +void cpm_init();
8.16 +void rtc_init();
8.17 +void timer_init();
8.18 +void timer_init_irq();
8.19 +void timer_clear();
8.20 +int is_started();
8.21
8.22 #endif /* __INIT_H__ */
9.1 --- a/stage2/irq.h Sat May 14 21:36:55 2016 +0200
9.2 +++ b/stage2/irq.h Sat May 14 21:40:59 2016 +0200
9.3 @@ -3,6 +3,6 @@
9.4
9.5 /* Initialisation functions. */
9.6
9.7 -void irq_init(void);
9.8 +void irq_init();
9.9
9.10 #endif /* __IRQ_H__ */
10.1 --- a/stage2/jzlcd.c Sat May 14 21:36:55 2016 +0200
10.2 +++ b/stage2/jzlcd.c Sat May 14 21:40:59 2016 +0200
10.3 @@ -470,7 +470,7 @@
10.4 panel_info.vl_bpix = LCD_CODE(bpp);
10.5 }
10.6
10.7 -void lcd_enable(void)
10.8 +void lcd_enable()
10.9 {
10.10 /* Clear the disable bit and set the enable bit. */
10.11
10.12 @@ -478,12 +478,12 @@
10.13 REG_LCD_CTRL |= 1<<3; /* LCDCTRL.ENA*/
10.14 }
10.15
10.16 -void lcd_disable(void)
10.17 +void lcd_disable()
10.18 {
10.19 REG_LCD_CTRL |= (1<<4); /* LCDCTRL.DIS, regular disable */
10.20 }
10.21
10.22 -void lcd_quick_disable(void)
10.23 +void lcd_quick_disable()
10.24 {
10.25 REG_LCD_CTRL &= ~(1<<4); /* LCDCTRL.ENA, quick disable */
10.26 }
11.1 --- a/stage2/jzlcd.h Sat May 14 21:36:55 2016 +0200
11.2 +++ b/stage2/jzlcd.h Sat May 14 21:40:59 2016 +0200
11.3 @@ -29,8 +29,8 @@
11.4
11.5 void lcd_set_bpp(u8 bpp);
11.6 unsigned long lcd_ctrl_init();
11.7 -void lcd_enable(void);
11.8 -void lcd_disable(void);
11.9 +void lcd_enable();
11.10 +void lcd_disable();
11.11
11.12 /*
11.13 * Framebuffer characteristics
12.1 --- a/stage2/lcd.c Sat May 14 21:36:55 2016 +0200
12.2 +++ b/stage2/lcd.c Sat May 14 21:40:59 2016 +0200
12.3 @@ -257,7 +257,7 @@
12.4
12.5 /* LCD initialisation. */
12.6
12.7 -void lcd_init(void)
12.8 +void lcd_init()
12.9 {
12.10 __lcd_display_pin_init();
12.11 __lcd_display_on();
13.1 --- a/stage2/lcd.h Sat May 14 21:36:55 2016 +0200
13.2 +++ b/stage2/lcd.h Sat May 14 21:40:59 2016 +0200
13.3 @@ -5,7 +5,7 @@
13.4
13.5 /* Initialisation functions. */
13.6
13.7 -void lcd_init(void);
13.8 +void lcd_init();
13.9
13.10 /* Output functions. */
13.11
14.1 --- a/stage2/stage2.c Sat May 14 21:36:55 2016 +0200
14.2 +++ b/stage2/stage2.c Sat May 14 21:40:59 2016 +0200
14.3 @@ -26,7 +26,7 @@
14.4 #include "tasks.h"
14.5 #include "example.h"
14.6
14.7 -void c_main(void)
14.8 +void c_main()
14.9 {
14.10 volatile int started;
14.11