# HG changeset patch # User Paul Boddie # Date 1434065635 -7200 # Node ID 3b8486cade380bbefab1970d3c797381e562f624 # Parent 37c9ff4adf57433a1fd675a0707b98f4bd53361a Removed the buzzer test for now. Removed result from timer_init. diff -r 37c9ff4adf57 -r 3b8486cade38 stage2/board-nanonote.c --- a/stage2/board-nanonote.c Thu Jun 11 17:48:56 2015 +0200 +++ b/stage2/board-nanonote.c Fri Jun 12 01:33:55 2015 +0200 @@ -75,8 +75,6 @@ __gpio_as_input(GPIO_USB_DETECT); __gpio_enable_pull(GPIO_USB_DETECT); - - __gpio_as_pwm4(); } void cpm_init(void) @@ -117,7 +115,7 @@ * timer without interrupts */ -int timer_init(void) +void timer_init(void) { __tcu_select_extalclk(TIMER_CHAN); __tcu_select_clk_div256(TIMER_CHAN); @@ -132,24 +130,4 @@ lastdec = 0; timestamp = 0; - - return 0; } - -void buzzer_init(void) -{ - volatile int i; - - __tcu_select_extalclk(4); - __tcu_select_clk_div64(4); - __tcu_enable_pwm_output(4); - - __tcu_set_full_data(4, 576); - __tcu_set_half_data(4, 576 / 2); - __tcu_set_count(4, 0); - __tcu_start_counter(4); - - for (i = 0; i < 20000000; i++); - - __tcu_stop_counter(4); -} diff -r 37c9ff4adf57 -r 3b8486cade38 stage2/board-nanonote.h --- a/stage2/board-nanonote.h Thu Jun 11 17:48:56 2015 +0200 +++ b/stage2/board-nanonote.h Fri Jun 12 01:33:55 2015 +0200 @@ -6,7 +6,6 @@ void gpio_init2(void); void cpm_init(void); void rtc_init(void); -int timer_init(void); -void buzzer_init(void); +void timer_init(void); #endif /* __BOARD_NANONOTE_H__ */ diff -r 37c9ff4adf57 -r 3b8486cade38 stage2/stage2.c --- a/stage2/stage2.c Thu Jun 11 17:48:56 2015 +0200 +++ b/stage2/stage2.c Fri Jun 12 01:33:55 2015 +0200 @@ -61,8 +61,8 @@ gpio_init2(); cpm_init(); - buzzer_init(); rtc_init(); timer_init(); lcd_init(); + while (1); }