X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=beginners%2Fseason_junior.asm;h=78c79627da6b99d76037ea8687a0ccb8bc8cbb0d;hb=065354af55b9bb4593071eb3717ef508bd80f516;hp=540c152daf51bdfb438f2b50a8dc554f5a975b64;hpb=584c899914df33403e5e087ee093667445048758;p=my-code%2Fatmel.git

diff --git a/beginners/season_junior.asm b/beginners/season_junior.asm
index 540c152..78c7962 100644
--- a/beginners/season_junior.asm
+++ b/beginners/season_junior.asm
@@ -9,7 +9,7 @@
 ; vcc card --- atmel vcc
 ; vcc cam  --- 
 ; rst cam  --- atmel int0 (pd2)
-; rst card --- atmel (pb4)
+; rst card --- atmel (pd4)
 ; clk card -\ 
 ;            -  atmel t1 (pd5)
 ; clk cam  -/
@@ -33,6 +33,33 @@
 ;
 ; buffer/parse whole strings and decide whether to send to card or not.
 
+; some defines
+; ------------
+
+; baudrate = clock freq / etu
+; std smartcard etu: 372
+; other smartcards: 625
+.define clock 8000000
+.define clk_h 4000000
+.define etu 625
+.define etu_h 312
+.define baudrate 5 ; UBRR value for 76800 bits/s (8mhz clock)
+
+; names for registers
+.define tmp r16
+.define bitcount r17
+.define tmp1 r18
+.define tmp2 r19
+.define byte r20
+.define overflow_counter r21
+.define one r1
+.define zero r0
+
+
+;
+; programm code
+; -------------
+
 ;
 ; interrupt vectors:
 ;
@@ -74,51 +101,55 @@ reti
 ; init routine
 ;
 
-MAIN:
-rjmp MAIN
-
 INIT:
 
 ; set stackpointer
-ldi r16,low(RAMEND)
-out SPL,r16
-
-;
-; hier weiter ....
-;
+ldi tmp,low(RAMEND)
+out SPL,tmp
 
 ; enable interrupts int0,int1
-ldi r16,((1<<INT0)|(1<<INT1))
-out GIMSK,r16
+ldi tmp,((1<<INT0)|(1<<INT1))
+out GIMSK,tmp
 ; int0/1 setup
-ldi r16,((1<<ISC01)|(1<<ISC00)|(1<<ISC10)|(1<<ISC11))
-out MCUCR,r16
-in r16,MCUCR
-sbic PORTD,PD2
-cbr r16,ISC00
-out MCUCR,r16
-sbic PORTD,PD3
-cbr r16,ISC10
-out MCUCR,r16
+ldi tmp,((1<<ISC01)|(0<<ISC00)|(1<<ISC11)|(0<<ISC10))
+out MCUCR,tmp
+
+; enable t/c overflow interrupt and icp
+ldi tmp,((1<<TOIE1)|(1<<TICIE1))
+out TIMSK,tmp
+; setup t/c and icp
+ldi tmp,((1<<CS12)|(1<<CS11)|(1<<CS10)|(1<<ICNC1)|(1<<ICES1))
+out TCCR1B,tmp
+
+; configure uart - interrupt enabled when i/o
+ldi tmp,baudrate
+out UBRR,tmp
+sbi UCR,TXEN
+
+; init registers
+ldi bitcounter,0 
+ldi byte,0
+ldi overflow_counter,0
+ldi tmp1,0
+ldi tmp2,0 
+ldi tmp,1
+mov one,tmp
+ldi tmp,0
+mov zero,tmp
+
+; enable interrupts (global)
+sei
 
-; enable t/c overflow interrupt
-ldi r16,(1<<TOIE1)
-out TIMSK,r16
-; setup t/c
-ldi r16,((1<<CS12)|(1<<CS11)|(1<<CS10))
-out TCCR1B,r16
+; jump to mainloop
+rjmp MAIN
 
-; init bitcounter and overflow counter
-ldi r20,0 ; bitcounter
-ldi r21,0 ; register for constructing the byte
-ldi r22,0 ; overflow counter
+;
+; main routine
+;
 
-; constant 1 in r1
-ldi r16,1
-mov r1,r16
+MAIN:
 
-; enable interrupts (global)
-sei
+rjmp MAIN
 
 ;
 ; rec_card routines
@@ -126,38 +157,51 @@ sei
 
 REC_CARD:
 
-; int0 -> input, int1 -> output
-ldi r16,(1<<DDD3)
-out DDRD,r16
-
 ; decide what to do
-sbic PORTD,PD2
+sbic PORTD,PD6
 rjmp REC_CARD_HIGH
 rjmp REC_CARD_LOW
 
 REC_CARD_HIGH:
 
+; save counter
+in r24,ICR1L
+in r25,ICR1H
+
 ; output high on port to cam
-ldi r16,(1<<PD3)
-out PORTD,r16
+sbi PORTD,PD3
 
-; toggle int0 sense
-in r16,MCUCR
-cbr r16,ISC00
-out MCUCR,r16
+; toggle icp sense
+cbi TCCR1B,ICES1
+;in r16,TCCR1B
+;cbr r16,ICES1
+;out TCCR1B,r16
+
+; status tu submit
+ldi r26,1
+
+; enable uart dre interrupt
+sbi UCR,UDRIE
 
 reti
 
 REC_CARD_LOW:
 
+; save counter
+in r27,ICR1L
+in r28,ICR1H
+
 ; output low on port to cam
-ldi r16,0
-out PORTD,r16
+cbi PORTD,PD3
 
-; toggle int0 sense
-in r16,MCUCR
-cbr r16,ISC00
-out MCUCR,r16
+; toggle icp sense
+sbi TCCR1B,ICES1
+
+; status to submit
+ldi r26,0
+
+; enable uart dre interrupt
+sbi UCR,UDRIE
 
 reti
 
@@ -167,10 +211,6 @@ reti
 
 REC_CAM:
 
-; int1 -> input, int0 -> output
-ldi r16,(1<<DDD2)
-out DDRD,r16
-
 ; decide what to do
 sbic PORTD,PD3
 rjmp REC_CAM_HIGH
@@ -179,8 +219,7 @@ rjmp REC_CAM_LOW
 REC_CAM_HIGH:
 
 ; output high on port to card
-ldi r16,(1<<PD2)
-out PORTD,r16
+sbi PORTD,PD6
 
 ; toggle int1 sense
 in r16,MCUCR
@@ -192,12 +231,11 @@ reti
 REC_CAM_LOW:
 
 ; output low on port to card
-ldi r16,0
-out PORTD,r16
+cbi PORTD,PD6
 
 ; toggle int 1 sense
 in r16,MCUCR
-cbr r16,ISC10
+sbr r16,ISC10
 out MCUCR,r16
 
 reti
@@ -212,3 +250,47 @@ add r22,r1 ; inc counter overflow register
 
 reti
 
+;
+; rst_cam routine
+;
+
+RST_CAM:
+
+; decide what to do
+sbic PORTD,PD2
+rjmp RST_CAM_HIGH
+rjmp RST_CAM_LOW
+
+RST_CAM_HIGH:
+
+; output high on rst port to card
+sbi PORTD,PD4
+
+; toggle int0 sense
+in r16,MCUCR
+cbr r16,ISC00
+out MCUCR,r16
+
+reti
+
+RST_CAM_LOW:
+
+; output low on rst port to cam
+cbi PORTD,PD4
+
+; toggle int0 sense
+in r16,MCUCR
+sbr r16,ISC00
+out MCUCR,r16
+
+reti
+
+;
+; uart_out routines
+;
+
+UART_OUT:
+
+;
+; hier weiter ...
+;