X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_timer.c;h=cd81b163bc37bf657971095de81f8f83a774d053;hb=90507d4f7ef77b0870a032b1d9809898c2924721;hp=1e374c75a4c99fac30e8a28ff229b8a6c449633b;hpb=8125acc030574afed6f23aa8aa302d9c768bb04e;p=fw%2Faltos diff --git a/src/avr/ao_timer.c b/src/avr/ao_timer.c index 1e374c75..cd81b163 100644 --- a/src/avr/ao_timer.c +++ b/src/avr/ao_timer.c @@ -17,7 +17,7 @@ #include "ao.h" -static volatile __data uint16_t ao_tick_count; +volatile __data uint16_t ao_tick_count; uint16_t ao_time(void) { @@ -87,61 +87,3 @@ ao_timer_init(void) TIMSK1 = (1 << OCIE1A); /* Interrupt on compare match */ } - -/* - * AltOS always cranks the clock to the max frequency - */ -void -ao_clock_init(void) -{ - /* disable RC clock */ - CLKSEL0 &= ~(1 << RCE); - - /* Disable PLL */ - PLLCSR &= ~(1 << PLLE); - - /* Enable external clock */ - CLKSEL0 |= (1 << EXTE); - - /* wait for external clock to be ready */ - while ((CLKSTA & (1 << EXTON)) == 0) - ; - - /* select external clock */ - CLKSEL0 |= (1 << CLKS); - - /* Disable the clock prescaler */ - cli(); - CLKPR = (1 << CLKPCE); - - /* Always run the system clock at 8MHz */ -#if AVR_CLOCK > 12000000UL - CLKPR = 1; -#else - CLKPR = 0; -#endif - sei(); - - /* Set up the PLL to use the crystal */ - - /* Use primary system clock as PLL source */ - PLLFRQ = ((0 << PINMUX) | /* Use primary clock */ - (0 << PLLUSB) | /* No divide by 2 for USB */ - (0 << PLLTM0) | /* Disable high speed timer */ - (0x4 << PDIV0)); /* 48MHz PLL clock */ - - /* Set the frequency of the crystal */ -#if AVR_CLOCK > 12000000UL - PLLCSR |= (1 << PINDIV); /* For 16MHz crystal on Teensy board */ -#else - PLLCSR &= ~(1 << PINDIV); /* For 8MHz crystal on TeleScience board */ -#endif - - /* Enable the PLL */ - PLLCSR |= (1 << PLLE); - while (!(PLLCSR & (1 << PLOCK))) - ; - - set_sleep_mode(SLEEP_MODE_IDLE); - sleep_enable(); -}