more control

[my-code/atmel.git] / monolyzer / timer.asm

diff --git a/monolyzer/timer.asm b/monolyzer/timer.asm
index 861e9b9..3327547 100644 (file)
--- a/monolyzer/timer.asm
+++ b/monolyzer/timer.asm
@@ -1,25 +1,30 @@
 ; timer functions
 
-TIMER0_INIT:
+TIMER1_INIT:
 
-       ; clock select, no prescaling
-       ldi tmp1,0x01
-       out TCCR0B,tmp1
+       ; clock select, prescaler 8
+       in tmp1,TCCR1B
+       cbr tmp1,(1<<CS12)
+       sbr tmp1,(1<<CS11)
+       cbr tmp1,(1<<CS10)
+       out TCCR1B,tmp1
 
        ret
 
-TIMER0_INT_INIT:
+TIMER1_INT_ENABLE:
 
-       ; overflow interrupt
-       ldi tmp1,0x02
+       ; overflow interrupt enable
+       in tmp1,TIMSK
+       sbr tmp1,(1<<TOIE1)
        out TIMSK,tmp1
 
        ret
 
-TIMER0_INT_END:
+TIMER1_INT_DISABLE:
 
-       ; overflow interrupt
-       ldi tmp1,0x00
+       ; overflow interrupt disable
+       in tmp1,TIMSK
+       cbr tmp1,(1<<TOIE1)
        out TIMSK,tmp1
 
        ret