X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=beginners%2Fseason_junior.asm;h=6ed66de55125ee691cdce1a96ba11001988b5cfe;hb=fe1a3b3896f1f119cdde663e02a709531dffc26d;hp=9c02191752dac273f5e9dd0aed463254e8e686c4;hpb=1a32d72e62a19febb9269b0270966fe98f8540be;p=my-code%2Fatmel.git

diff --git a/beginners/season_junior.asm b/beginners/season_junior.asm
index 9c02191..6ed66de 100644
--- a/beginners/season_junior.asm
+++ b/beginners/season_junior.asm
@@ -6,11 +6,15 @@
 
 ; at90s2313
 ; setup:
-; vcc card --- vcc cam
-; rst card --- rst cam --- atmel t0 (pd4)
-; clk card --- clk cam --- atmel t1 (pd5)
+; vcc card --- atmel vcc
+; vcc cam  --- 
+; rst cam  --- atmel int0 (pd2)
+; rst card --- atmel (pd4)
+; clk card -\ 
+;            -  atmel t1 (pd5)
+; clk cam  -/
 ; gnd card --- gnd cam --- atmel gnd
-; i/o card --- atmel int0 (pd2)
+; i/o card --- atmel icp (pd6)
 ; i/o cam  --- atmel int1 (pd3)
 
 .include "../include/2313def.inc"
@@ -29,27 +33,87 @@
 ;
 ; buffer/parse whole strings and decide whether to send to card or not.
 
-;
+; #######
+; 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)
+
+; sizes
+.define uart_data_len 4
+.define uart_data_len_f 3
+
+; names for registers
+.define tmp r16
+.define bitcount r17
+.define tmp1 r18
+.define tmp2 r19
+.define byte r20
+.define overflow_counter r21
+.define counter_l r22
+.define counter_h r23
+.define state r24
+.define state_m r25
+.define mode r26
+.define counter_l_tmp r27
+.define counter_h_tmp r28
+.define address_h r31
+.define address_l r30
+.define one r1
+.define zero r0
+
+; state
+.define LOW (1<<0)
+.define LOW_F 1
+.define HIGH (1<<1)
+.define HIGH_F 2
+; mode
+.define STUPID (1<<0) ; forward cam <-> card communication
+.define STUPID_F 1
+.define COOL (1<<1) ; send time (clocks) & state via uart
+.define COOL_F 2
+.define ELITE (1<<2) ; create bytes, maybe even whole command arrays
+.define ELITE_F 3
+.define GODLIKE (1<<3) ; filter and mask for commands to card - send rejected via uart only
+.define GODLIKE_F 4
+.define INCREDIBLE_HACK (1<<4) ; destroy all your hardware
+.define INCREDIBLE_HACK_F 5 
+
+; but there is only stupid and cool mode right now %)
+
+
+; #############
+; programm code
+; #############
+
+; ------------------
 ; interrupt vectors:
-;
+; ------------------
 
 ; reset
 rjmp INIT
 
 ; int0
-rjmp REC_CARD
+rjmp RST_CAM
 
 ; int1
 rjmp REC_CAM
 
 ; timer/counter capt 1
-reti
+rjmp REC_CARD
 
 ; timer/counter compare
 reti
 
 ; timer/counter overflow 1
-rjmp T1_OVERFLOW
+rjmp CLK_OVERFLOW
 
 ; timer/counter overflow 0
 reti
@@ -58,7 +122,7 @@ reti
 reti
 
 ; uart data register empty
-reti
+rjmp UART_OUT
 
 ; uart tx complete
 reti
@@ -66,138 +130,240 @@ reti
 ; analog comparator
 reti
 
-;
+; ------------
 ; init routine
-;
+; ------------
 
 INIT:
 
 ; set stackpointer
-ldi r16,low(RAMEND)
-out SPL,r16
+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
-
-; 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
-
-; init bitcounter and overflow counter
-ldi r20,0 ; bitcounter
-ldi r21,0 ; register for constructing the byte
-ldi r22,0 ; overflow counter
-
-; constant 1 in r1
-ldi r16,1
-mov r1,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)|(0<<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 counter_l,0
+ldi counter_h,0
+ldi state,HIGH ; .. as waiting for falling edge of start bit
+ldi state_m,0x03
+ldi mode,(STUPID|COOL)
+ldi counter_l_tmp,0
+ldi counter_h_tmp,0
+ldi address_h,SRAM_START_H
+ldi tmp,1
+mov one,tmp
+ldi tmp,0
+mov zero,tmp
 
 ; enable interrupts (global)
 sei
 
-;
-; rec_card routines
-;
+; jump to mainloop
+rjmp MAIN
+
+; ------------
+; main routine
+; ------------
+
+MAIN:
+
+; loop and wait for interrupts
+rjmp MAIN
+
+; ----------------
+; rec_card routine
+; ----------------
 
 REC_CARD:
 
-; int0 -> input, int1 -> output
-ldi r16,(1<<DDD3)
-out DDRD,r16
+; save counter
+In counter_l,ICR1L
+in counter_h,ICR1H
+
+; toggle state
+eor state,state_m
 
-; decide what to do
-sbic PORTD,PD2
-rjmp REC_CARD_HIGH
-rjmp REC_CARD_LOW
+; toggle icp sense
+rcall TOGGLE_ICP_SENSE
 
-REC_CARD_HIGH:
+; fwd to cam if in stupid mode
+sbrc mode,STUPID_F
+rcall FWD_TO_CAM
 
-; output high on port to cam
-ldi r16,(1<<PD3)
-out PORTD,r16
+; calculate delta clocks if in stupid mode
+sbrc mode,COOL_F
+rcall CALC_DELTA_CLOCK ; -> calc delta, store to counter_l_tmp, counter_h_tmp
 
-; toggle int0 sense
-in r16,MCUCR
-cbr r16,ISC00
-out MCUCR,r16
+; send time and state via uart
+sbrc mode,COOL_F
+rcall PREPARE_UART
 
+; return
 reti
 
-REC_CARD_LOW:
+; ------------------------
+; toggle_icp_sense routine
+; ------------------------
 
-; output low on port to cam
-ldi r16,0
-out PORTD,r16
+TOGGLE_ICP_SENSE:
 
-; toggle int0 sense
-in r16,MCUCR
-cbr r16,ISC00
-out MCUCR,r16
+; toggle according to state
+in tmp,TCCR1B
+cbi tmp,ICES1
+sbrs state,HIGH ; maybe toggle according to TCCR1B?
+sbi tmp,ICES1
+out TCCR1B,tmp
 
-reti
+; return 
+ret
 
-;
-; rec_cam routines
-;
+; ------------------
+; fwd_to_cam routine
+; ------------------
+
+FWD_TO_CAM:
+
+; disable external interrupt 1 while toggling edge
+in tmp,GIMSK
+cbr tmp,INT1
+out GIMSK,tmp
+
+; output state on port to cam
+in tmp1,PORTD
+sbr tmp1,PD3
+sbrs state,HIGH_F
+cbr tmp1,PD3
+
+; configure as output and push-pull low/high
+sbi DDRD,DDD3
+out PORTD,tmp1;
+
+; reenable external interrupt 1
+cbr tmp,INT1
+out GIMSK,tmp
+
+; return
+ret
+
+; --------------------
+; prepare_uart routine
+; --------------------
+
+PREPARE_UART:
+
+; by now just send state and  counter, so there is no data to prepare
+
+; enable uart data register empty interrupt
+sbi UCR,UDRIE
+
+; return
+ret
+
+
+; ---------------
+; rec_cam routine
+; ---------------
 
 REC_CAM:
 
-; int1 -> input, int0 -> output
-ldi r16,(1<<DDD2)
-out DDRD,r16
+; first thing - pullup on
+cbi DDRD,DDD3
+sbi DDRD,PD3
 
-; decide what to do
-sbic PORTD,PD3
-rjmp REC_CAM_HIGH
-rjmp REC_CAM_LOW
+; save counter
+in counter_l,ICR1L
+in counter_h,ICR1H
 
-REC_CAM_HIGH:
+; toggle state
+eor state,state_m
 
-; output high on port to card
-ldi r16,(1<<PD2)
-out PORTD,r16
+; toggle int sense
+rcall TOGGLE_INT_SENSE
 
-; toggle int1 sense
-in r16,MCUCR
-cbr r16,ISC10
-out MCUCR,r16
+HIER FEHLT NOCH VIEL ...
 
+; return
 reti
 
-REC_CAM_LOW:
+; ------------------------
+: toggle_int_sense routine
+; ------------------------
 
-; output low on port to card
-ldi r16,0
-out PORTD,r16
+TOGGLE_INT_SENSE:
 
-; toggle int 1 sense
-in r16,MCUCR
-cbr r16,ISC10
-out MCUCR,r16
+in tmp,MCUCR
+cbr tmp,ISC10
+sbis state,HIGH_F
+sbr tmp,ISC10
+out MCUCR,tmp
 
-reti
+; return
+ret
 
-;
+; -------------------
 ; t1_overflow routine
-;
+; -------------------
 
 T1_OVERFLOW:
 
-add r22,r1 ; inc counter overflow register
+; increment counter overflow
+add overflow_counter,one
+
+; return
+reti
+
+; ---------------
+; rst_cam routine
+; ---------------
+
+RST_CAM:
+
+; pull down rst from card
+sbi DDRD,DDD4
+cbi PORTD,PD4
+
+; jump to init
+rjmp INIT
+
+; ----------------
+; uart_out routine
+; ----------------
+
+UART_OUT:
+
+; disable uart data register empty interrupt
+cbi UCR,UDRIE
+
+; init counter
+mov address_l,zero
+
+; send the data
+rcall UART_SEND
 
+; return
 reti
 
+.... wahhh ! zzZz