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

diff --git a/beginners/season_junior.asm b/beginners/season_junior.asm
index 78c7962..e6a4606 100644
--- a/beginners/season_junior.asm
+++ b/beginners/season_junior.asm
@@ -6,6 +6,7 @@
 
 ; at90s2313
 ; setup:
+;
 ; vcc card --- atmel vcc
 ; vcc cam  --- 
 ; rst cam  --- atmel int0 (pd2)
@@ -19,22 +20,10 @@
 
 .include "../include/2313def.inc"
 
-; functions by now:
-;
-; stupid mode only by now. just see what cam/card do and redirect
-; this to card/cam.
-;
-; next implementation:
-; 
-; try to read one byte of card/cam communication and output via uart.
-; output time information in some way.
-;
-; future:
-;
-; buffer/parse whole strings and decide whether to send to card or not.
 
-; some defines
-; ------------
+; #######
+; defines
+; #######
 
 ; baudrate = clock freq / etu
 ; std smartcard etu: 372
@@ -45,24 +34,55 @@
 .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
-
+; sizes
+.define uart_data_len 4
 
-;
+; names for registers
+.def tmp = r16
+.def bitcount = r17
+.def tmp1 = r18
+.def tmp2 = r19
+.def byte = r20
+.def overflow_counter = r21
+.def counter_l = r22
+.def counter_h = r23
+.def state = r24
+.def state_m = r25
+.def mode = r26
+.def counter_l_tmp = r27
+.def counter_h_tmp = r28
+.def address_h = r31
+.def address_l = r30
+.def one = r1
+.def 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
@@ -80,7 +100,7 @@ rjmp REC_CARD
 reti
 
 ; timer/counter overflow 1
-rjmp CLK_OVERFLOW
+rjmp T1_OVERFLOW
 
 ; timer/counter overflow 0
 reti
@@ -97,12 +117,16 @@ reti
 ; analog comparator
 reti
 
-;
+; ------------
 ; init routine
-;
+; ------------
 
 INIT:
 
+; output low on rst to card while init
+sbi DDRD,DDD4
+cbi PORTD,PD4
+
 ; set stackpointer
 ldi tmp,low(RAMEND)
 out SPL,tmp
@@ -115,10 +139,10 @@ 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))
+ldi tmp,((1<<TOIE1)|(1<<TICIE))
 out TIMSK,tmp
 ; setup t/c and icp
-ldi tmp,((1<<CS12)|(1<<CS11)|(1<<CS10)|(1<<ICNC1)|(1<<ICES1))
+ldi tmp,((1<<CS12)|(1<<CS11)|(1<<CS10)|(1<<ICNC1)|(0<<ICES1))
 out TCCR1B,tmp
 
 ; configure uart - interrupt enabled when i/o
@@ -126,12 +150,19 @@ ldi tmp,baudrate
 out UBRR,tmp
 sbi UCR,TXEN
 
+; enable pullups on int0, int1, clk, icp io ports
+ldi tmp,((1<<PD2)|(1<<PD3)|(1<<PD5)|(1<<PD6))
+
 ; init registers
-ldi bitcounter,0 
+ldi bitcount,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 address_h,0
 ldi tmp,1
 mov one,tmp
 ldi tmp,0
@@ -140,157 +171,276 @@ mov zero,tmp
 ; enable interrupts (global)
 sei
 
+; output high on rst to card
+sbi PORTD,PD4
+
 ; jump to mainloop
 rjmp MAIN
 
-;
+; ------------
 ; main routine
-;
+; ------------
 
 MAIN:
 
+; loop and wait for interrupts
 rjmp MAIN
 
-;
-; rec_card routines
-;
+; ----------------
+; rec_card routine
+; ----------------
 
 REC_CARD:
 
-; decide what to do
-sbic PORTD,PD6
-rjmp REC_CARD_HIGH
-rjmp REC_CARD_LOW
-
-REC_CARD_HIGH:
-
-; save counter
-in r24,ICR1L
-in r25,ICR1H
+; input & pullup
+cbi DDRD,DDD6
+sbi PORTD,PD6
 
-; output high on port to cam
-sbi PORTD,PD3
+; toggle state
+eor state,state_m
 
 ; toggle icp sense
-cbi TCCR1B,ICES1
-;in r16,TCCR1B
-;cbr r16,ICES1
-;out TCCR1B,r16
+rcall TOGGLE_ICP_SENSE
 
-; status tu submit
-ldi r26,1
+; fwd to cam if in stupid mode
+sbrc mode,STUPID_F
+rcall FWD_TO_CAM
 
-; enable uart dre interrupt
-sbi UCR,UDRIE
+; calculate delta clocks if in cool mode
+sbrc mode,COOL_F
+rcall CALC_DELTA_CLOCK
+
+; send time and state via uart
+sbrc mode,COOL_F
+rcall PREPARE_UART
 
+; return
 reti
 
-REC_CARD_LOW:
+; ------------------------
+; calc_delta_clock routine
+; ------------------------
 
-; save counter
-in r27,ICR1L
-in r28,ICR1H
+CALC_DELTA_CLOCK:
 
-; output low on port to cam
-cbi PORTD,PD3
+; store counters
+mov counter_l_tmp,counter_l
+mov counter_h_tmp,counter_h
 
-; toggle icp sense
-sbi TCCR1B,ICES1
+; get new ones
+in counter_l,ICR1L
+in counter_h,ICR1H
+
+; delta calc on host software by now
+
+; return
+ret
+
+; ------------------------
+; toggle_icp_sense routine
+; ------------------------
+
+TOGGLE_ICP_SENSE:
+
+; toggle according to state
+in tmp,TCCR1B
+cbr tmp,ICES1
+sbrs state,HIGH ; maybe toggle according to TCCR1B?
+sbr tmp,ICES1
+out TCCR1B,tmp
+
+; return 
+ret
+
+; ------------------
+; 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
+sbr tmp,INT1
+out GIMSK,tmp
+
+; return
+ret
 
-; status to submit
-ldi r26,0
+; --------------------
+; prepare_uart routine
+; --------------------
 
-; enable uart dre interrupt
+PREPARE_UART:
+
+; write transfer data to sram
+ldi address_l,0x60
+st address_l+,counter_l
+st address_l+,counter_h
+st address_l+,overflow_counter
+st address_l+,state
+
+; enable uart data register empty interrupt
 sbi UCR,UDRIE
 
-reti
+; return
+ret
 
-;
-; rec_cam routines
-;
+
+; ---------------
+; rec_cam routine
+; ---------------
 
 REC_CAM:
 
-; decide what to do
-sbic PORTD,PD3
-rjmp REC_CAM_HIGH
-rjmp REC_CAM_LOW
+; first thing - pullup on
+cbi DDRD,DDD3
+sbi DDRD,PD3
 
-REC_CAM_HIGH:
+; toggle state
+eor state,state_m
 
-; output high on port to card
-sbi PORTD,PD6
+; toggle int sense
+rcall TOGGLE_INT_SENSE
+
+; fwd to card if in stupid mode
+sbrc mode,STUPID_F
+rcall FWD_TO_CARD
 
-; toggle int1 sense
-in r16,MCUCR
-cbr r16,ISC10
-out MCUCR,r16
+; calculate delta clocks if in cool mode
+sbrc mode,COOL_F
+rcall CALC_DELTA_CLOCK
 
+; return
 reti
 
-REC_CAM_LOW:
+; ------------------------
+; toggle_int_sense routine
+; ------------------------
 
-; output low on port to card
-cbi PORTD,PD6
+TOGGLE_INT_SENSE:
 
-; toggle int 1 sense
-in r16,MCUCR
-sbr r16,ISC10
-out MCUCR,r16
+in tmp,MCUCR
+cbr tmp,ISC10
+sbrs state,HIGH_F
+sbr tmp,ISC10
+out MCUCR,tmp
 
-reti
+; return
+ret
 
-;
+; -------------------
+; fwd_to_card routine
+; -------------------
+
+FWD_TO_CARD:
+
+; disable icp interrupt while toggling edge
+in tmp,TIMSK
+cbr tmp,TICIE
+out TIMSK,tmp
+
+; output state on port to card
+in tmp1,PORTD
+sbr tmp1,PD6
+sbrs state,HIGH_F
+cbr tmp1,PD6
+
+; configure as output and push-pull low/high
+sbi DDRD,DDD6
+out PORTD,tmp1;
+
+; reenable icp interrupt
+sbr tmp,TICIE
+out TIMSK,tmp
+
+; 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:
 
-; decide what to do
-sbic PORTD,PD2
-rjmp RST_CAM_HIGH
-rjmp RST_CAM_LOW
+; by now just jump to init
+rjmp INIT
 
-RST_CAM_HIGH:
+; ----------------
+; uart_out routine
+; ----------------
 
-; output high on rst port to card
-sbi PORTD,PD4
+UART_OUT:
+
+; disable uart data register empty interrupt
+cbi UCR,UDRIE
 
-; toggle int0 sense
-in r16,MCUCR
-cbr r16,ISC00
-out MCUCR,r16
+; init counter(s)
+mov address_l,zero
+mov tmp,zero
 
+; send the data
+rcall UART_SEND
+
+; return
 reti
 
-RST_CAM_LOW:
+; -----------------
+; uart_send routine
+; -----------------
 
-; output low on rst port to cam
-cbi PORTD,PD4
+UART_SEND:
 
-; toggle int0 sense
-in r16,MCUCR
-sbr r16,ISC00
-out MCUCR,r16
+; read next byte from memmory and transfer via uart
+sbic USR,UDRE
+rcall UART_GS
 
-reti
+; return if everything was sent
+cpi tmp,uart_data_len
+brne UART_SEND
+ret
 
-;
-; uart_out routines
-;
+; ---------------
+; uart_gs routine
+; ---------------
 
-UART_OUT:
+UART_GS:
 
+; 
+; wie macht man load mit autoinc richtig?
 ;
-; hier weiter ...
-;
+
+; read byte from memory and write via uart
+ld tmp1,address_l+
+out UDR,tmp1
+
+; increment counter (maybe needed later)
+add tmp,one
+
+; return
+ret