godzil/sd2snes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SuperCIC/key: fix unreliable pair mode entry (sync with lock)

Browse Source
This commit is contained in:
ikari 2011-12-18 18:41:00 +01:00
parent 37a9f09a78
commit 72642321a2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cic/supercic/supercic-key.asm
View File

@ -64,6 +64,7 @@ processor p12f629
; 0x4d buffer for eeprom access ; 0x4d buffer for eeprom access
; 0x4e loop variable for longwait ; 0x4e loop variable for longwait
; 0x4f loop variable for wait ; 0x4f loop variable for wait
; 0x5c GPIO buffer variable for pair mode allow
; 0x5d 0: SuperCIC pair mode available flag ; 0x5d 0: SuperCIC pair mode available flag
; 0x5e SuperCIC pair mode detect (phase 1) ; 0x5e SuperCIC pair mode detect (phase 1)
; 0x5f SuperCIC pair mode detect (phase 2) ; 0x5f SuperCIC pair mode detect (phase 2)
@ -90,8 +91,8 @@ isr
clrf 0x5f ; clear pair mode detect clrf 0x5f ; clear pair mode detect
bsf 0x5f, 1 ; bsf 0x5f, 1 ;
clrf 0x5d ; clear pair mode available clrf 0x5d ; clear pair mode available
nop clrf 0x5c ; clear pair mode allow buffer
nop bsf 0x5c, 3 ; assume disallow
bsf INTCON, 7 ; re-enable interrupts (ISR will continue as main) bsf INTCON, 7 ; re-enable interrupts (ISR will continue as main)
goto main goto main
init init
@ -296,8 +297,8 @@ swapskip
; indirect access, no post increment, etc. ; indirect access, no post increment, etc.
mangle mangle
call mangle_lock call mangle_lock
nop movf GPIO, w ; buffer GPIO state
nop movwf 0x5c ; for pair mode "transaction"
mangle_key mangle_key
movf 0x2f, w movf 0x2f, w
movwf 0x20 movwf 0x20
@ -459,7 +460,7 @@ mangle_key_withskip
;-------pair mode code------- ;-------pair mode code-------
bcf GPIO, 0 bcf GPIO, 0
movf GPIO, w movf GPIO, w
btfss GPIO, 3 btfss 0x5c, 3
bsf GPIO, 0 bsf GPIO, 0
movwf 0x5e movwf 0x5e
movf GPIO, w movf GPIO, w
@ -642,7 +643,7 @@ mangle_lock_withskip
goto scic_pair_skip1 goto scic_pair_skip1
btfsc 0x5f, 1 btfsc 0x5f, 1
goto scic_pair_skip2 goto scic_pair_skip2
btfsc GPIO, 3 btfsc 0x5c, 3
goto scic_pair_skip3 goto scic_pair_skip3
goto supercic_pairmode goto supercic_pairmode
scic_pair_skip1 scic_pair_skip1