X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fattiny%2Fao_clock.c;h=2ac0500b217f307466fd8be143eae566969eac89;hp=a381b47f71ea233e20f651cb865dc9cea0bb5f44;hb=0448b9b638f8599633227a639ef9d8572780bbd9;hpb=5a55501660ebab3b858a48483c5df1cfb4e858e4

diff --git a/src/attiny/ao_clock.c b/src/attiny/ao_clock.c
index a381b47f..2ac0500b 100644
--- a/src/attiny/ao_clock.c
+++ b/src/attiny/ao_clock.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,13 +23,12 @@ static volatile AO_TICK_TYPE	ao_wakeup_count;
 
 ISR(TIMER1_COMPA_vect)
 {
-	PORTB ^= 2;
 	++ao_tick_count;
 	if ((int16_t) (ao_tick_count - ao_wakeup_count) >= 0)
 		ao_wakeup((void *) &ao_tick_count);
 }
 
-uint16_t
+AO_TICK_TYPE
 ao_time(void)
 {
 	uint16_t	r;
@@ -39,12 +39,45 @@ ao_time(void)
 	return r;
 }
 
+#if AVR_CLOCK == 8000000UL
+#define AO_CLKPS	0	/* divide by 1 */
+#define AO_CS		10	/* prescale by 512 */
+#endif
+#if AVR_CLOCK == 4000000UL
+#define AO_CLKPS	1	/* divide by 2 */
+#define AO_CS		9	/* prescale by 256 */
+#endif
+#if AVR_CLOCK == 2000000UL
+#define AO_CLKPS	2	/* divide by 4 */
+#define AO_CS		8	/* prescale by 128 */
+#endif
+#if AVR_CLOCK == 1000000UL
+#define AO_CLKPS	3	/* divide by 8 */
+#define AO_CS		7	/* prescale by 64 */
+#endif
+#if AVR_CLOCK == 500000UL
+#define AO_CLKPS	4	/* divide by 16 */
+#define AO_CS		6	/* prescale by 32 */
+#endif
+#if AVR_CLOCK == 250000UL
+#define AO_CLKPS	5	/* divide by 32 */
+#define AO_CS		5	/* prescale by 16 */
+#endif
+#if AVR_CLOCK == 125000UL
+#define AO_CLKPS	6	/* divide by 64 */
+#define AO_CS		4	/* prescale by 32 */
+#endif
+#if AVR_CLOCK == 62500UL
+#define AO_CLKPS	7	/* divide by 128 */
+#define AO_CS		4	/* prescale by 32 */
+#endif
+
 void
 ao_timer_init(void)
 {
 	cli();
 	CLKPR = (1 << CLKPCE);
-	CLKPR = 0;
+	CLKPR = (AO_CLKPS << CLKPS0);
 	sei();
 
 	/* Overall division ratio is 512 * 125,
@@ -55,10 +88,7 @@ ao_timer_init(void)
 		 (0 << PWM1A) |		/* Not PWM mode */
 		 (0 << COM1A0) |	/* Don't change output pins */
 		 (0 << COM1A1) |	/*  ... */
-		 (1 << CS13) |		/* Prescale by 512 */
-		 (0 << CS12) |		/*  ... */
-		 (1 << CS11) |		/*  ... */
-		 (0 << CS10));		/*  ... */
+		 (AO_CS << CS10));	/* Prescale */
 	GTCCR = ((0 << PWM1B) |		/* Not PWM mode */
 		 (0 << COM1B1) |	/* Don't change output pins */
 		 (0 << COM1B0) |	/*  ... */