X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=monolyzer%2Ftimer.asm;h=f5297fe0ca4c3fe8200c3c521e30a11c286f7cf7;hb=HEAD;hp=c9ef07462b06cdf30a88e30882a080b099fb088b;hpb=41d981471644f11151e4f1691c4a29c44fb12410;p=my-code%2Fatmel.git

diff --git a/monolyzer/timer.asm b/monolyzer/timer.asm
index c9ef074..f5297fe 100644
--- a/monolyzer/timer.asm
+++ b/monolyzer/timer.asm
@@ -1,17 +1,74 @@
 ; timer functions
 
-TIMER0_INIT:
+TIMER1_INIT_NP:
 
-	; clock select, no prescaling
-	ldi tmp1,0x01
-	out TCCR0B,tmp1
+	; clock select, no prescaler
+	in tmp1,TCCR1B
+	cbr tmp1,(1<<CS12)
+	cbr tmp1,(1<<CS11)
+	sbr tmp1,(1<<CS10)
+	out TCCR1B,tmp1
 
 	ret
 
-TIMER0_INT_INIT:
+TIMER1_INIT_8:
 
-	; overflow interrupt
-	ldi tmp1,0x02
+	; clock select, prescaler 64
+	in tmp1,TCCR1B
+	cbr tmp1,(1<<CS12)
+	sbr tmp1,(1<<CS11)
+	cbr tmp1,(1<<CS10)
+	out TCCR1B,tmp1
+
+	ret
+
+TIMER1_INIT_64:
+
+	; clock select, prescaler 64
+	in tmp1,TCCR1B
+	cbr tmp1,(1<<CS12)
+	sbr tmp1,(1<<CS11)
+	sbr tmp1,(1<<CS10)
+	out TCCR1B,tmp1
+
+	ret
+
+TIMER1_INIT_256:
+
+	; clock select, prescaler 256
+	in tmp1,TCCR1B
+	sbr tmp1,(1<<CS12)
+	cbr tmp1,(1<<CS11)
+	cbr tmp1,(1<<CS10)
+	out TCCR1B,tmp1
+
+	ret
+
+TIMER1_INIT_1024:
+
+	; clock select, prescaler 1024
+	in tmp1,TCCR1B
+	sbr tmp1,(1<<CS12)
+	cbr tmp1,(1<<CS11)
+	sbr tmp1,(1<<CS10)
+	out TCCR1B,tmp1
+
+	ret
+
+TIMER1_INT_ENABLE:
+
+	; overflow interrupt enable
+	in tmp1,TIMSK
+	sbr tmp1,(1<<TOIE1)
+	out TIMSK,tmp1
+
+	ret
+
+TIMER1_INT_DISABLE:
+
+	; overflow interrupt disable
+	in tmp1,TIMSK
+	cbr tmp1,(1<<TOIE1)
 	out TIMSK,tmp1
 
 	ret