Pecus/jataricart
1
0
Fork 0
mirror of https://github.com/Pecusx/jataricart.git synced 2026-05-20 22:33:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

rewritten flash recognition procedure

Browse Source 
updated flasher to handle all chip configuration.
This commit is contained in:
Jakub Husak
2025-01-26 17:59:18 +01:00
parent 28df695a9d
commit e6dc1ff925
18 changed files with 177 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/flashwrite.asx
+65 -28
View File
@@ -55,7 +55,7 @@ STARTFLASHWRITE
TITLE+128
dta $9b,c'JatariCart/MaxFlash flasher'
dta $9b
dta c'by JHusak, 10.02.2023'
dta c'by JHusak, version 26.01.2025'
dta $9b
dta c'JatariCart of size '
.print "#define CARTSIZE1 0x",*-$2000+6
@@ -72,7 +72,7 @@ STARTFLASHWRITE
bcc ?wloop
ldx #$25
?lloop
?lloop ; wait 0.5 sec after inserting
bit VCOUNT
bmi *-3
bit VCOUNT
@@ -81,39 +81,45 @@ STARTFLASHWRITE
bne ?lloop
jsr print
dta c' inserted.',$9b,0
dta $9b,c'Inserted.',$9b,0
; cart inserted, fake it was not changed
jsr accept_bank_change
ldx #0 ; chip address
stx numchips
stx numgoodchipsneeded
_check_chips
stx _storex
jsr check_type
bcc ?_next
bcc ?chip_ok
beq ?unrecog2
?unrecog1
jsr print
dta c'unrecognized chip: ',0
lda m_vendor
jsr printhex
lda m_kind
jsr printhex
cpx #$0
seq
jmp *
jsr print
dta c'ignoring chip ...',0
jmp menu
?_next inc numchips
lda numchips
dta c'no chip #'
?chipign1
dta c'1, ignoring... ',0
clc
adc #'0'
sta chipno ; stored as '0'/'1' to print inline
bcc ?common
?unrecog2
jsr print
dta c'chip '
chipno
dta c'0' ; will be replaced
dta c'unknown chip #'
?chipign2
dta c'1 protocol, ignoring...',0
?common
lda #0
sta m_vendor
sta m_kind
jmp ?exit
?chip_ok
lda numgoodchipsneeded
ora goodchipsmask
sta numgoodchipsneeded
jsr print
dta c'chip #'
?chipno
dta c'1' ; will be incremented if TWOCHIPS defined
dta c' vend/prod: ',0
lda m_vendor
jsr printhex
@@ -131,7 +137,7 @@ chipno
adc #0
sta ?taddr+1
ldy #0
?loop ; write string onscreen till 0
?loop ; write string onscreen, 0-ended
lda ?taddr:$ffff,y
beq ?exit
sty st_y
@@ -142,22 +148,52 @@ chipno
?exit
jsr printnl
ldx _storex
cpx #0
bne menu
asl goodchipsmask
cpx #$40
beq menu
lda m_vendor
sta t_vendor
lda m_kind
sta t_kind
inc ?chipno
inc ?chipign1
inc ?chipign2
ldx #$40
jmp _check_chips
menu
lda numgoodchipsneeded
.if .def TWOCHIPS
cmp #3 ; two chips needed
.else
and #1
cmp #1 ; at least first chip needed
.endif
beq ?cont
; FAIL and loop forever
jsr print
dta $9b
dta c'Sorry, recognized chip configuration',$9b
dta c'does not suit your binary.',$9b
dta c'Your cart needs '
.if .def TWOCHIPS
dta c'two chips.',$9b
.else
dta c'at least first chip.',$9b
.endif
dta c'Please reboot.',$9b,0
jmp *
?cont
jsr printnl
;lda #$ff
;sta $d301
jsr print
dta c'Press:',$9b
dta c'START - format cart and programm',$9b
dta c'START - cartridge format and flash!',$9b
;dta c'SELECT - verify; repair bad blocks.',$9b
dta c'OPTION - verify',$9b,0
?wloop lda 53279
@@ -224,7 +260,8 @@ CHECKONLY
t_vendor .byte 0
t_kind .byte 0
numchips .byte 0
numgoodchipsneeded .byte 0
goodchipsmask .byte 1
_storex .byte 0
crcsums
lib/flashwritelib.asx
+110 -7
View File
@@ -30,7 +30,6 @@ m_offsets
M_VECTOR .word 0
m_vendor .byte 0
m_kind .byte 0
m_iter .byte 0
; ro section again
; Protocols for known kinds of memory:
@@ -66,17 +65,22 @@ M_CHECK_VECS .word M_VECTORS_39SF, M_VECTORS_29F, M_VECTORS_28SF
; --------------------------
; PROCEDURE
; x = 0 or 0x40 - flash chip address.
; stores proper vector table pointer if worked
; stores proper vector table pointer
; this fails only when somebody stores vendor and product bytes
; at the proper cells.
; The second case is that there is no mem at all.
; Then two cases are possible: random number OR fixed ff.
;
; then in the code we call lda #offset/jsr jsrtovectorproc
.if 0
check_type
ldy #(2*(num_mems-1))
?again
sty m_iter
?again_loop
; store default values
jsr flashsetbank
jsr flashsetbank0
; load real values, may be random if no chip.
lda $a000
sta m_vendor
lda $a001
@@ -84,7 +88,7 @@ check_type
jsr jsrtosoftidentry
jsr flashsetbank
jsr flashsetbank0
lda $a000 ; vendor
cmp m_vendor
sta m_vendor
@@ -100,13 +104,108 @@ check_type
dey
bpl ?again
; error
sec
sec ; failed, no chip
rts
?check_again
; if zero, decrement check_bad_counter
sne
dec check_bad_counter
dec check_counter
bne ?again_loop
lda check_bad_counter
cmp #CNTINIT
; if check_counter is 0 and check_bad_counter is CNTINIT then ok, else
; go to ?next
bne ?next
.endif
check_type
ldy #(2*(num_mems-1))
?again
sty ?m_iter
lda #0
sta ?or_val
sta ?or_val+1
sta ?c_iter
lda #$ff
sta ?and_val
sta ?and_val+1
?repeat
jsr flashsetbank0
jsr jsrtosoftidentry
lda $A000
sta ?_id_m
lda $A001
sta ?_id_m+1
jsr jsrtosoftidexit
lda $A000
sta ?_no_m
lda $A001
sta ?_no_m+1
lda ?_id_m
and:sta ?and_val
lda ?_id_m+1
and:sta ?and_val+1
lda ?_id_m
ora:sta ?or_val
lda ?_id_m+1
ora:sta ?or_val+1
dec ?c_iter
bne ?repeat
;@
; lda #$ff
; sta $d01a
; lda #0
; sta $d01a
; jmp @-
cpw ?and_val ?or_val
bne ?next_chip ; empty slot, random values, no chip, check next chip
cpw ?and_val ?_no_m
beq ?next_chip ; the came content, stable values, no response so no chip, check next chip
?OK
lda ?_id_m
sta m_vendor
lda ?_id_m+1
sta m_vendor+1
lda M_CHECK_VECS+1,y
sta M_VECTOR+1
lda M_CHECK_VECS,y
sta M_VECTOR
clc
rts
?next_chip
php ; store zero flag
pla
ldy ?m_iter
dey
dey
jpl ?again
pha ; restored zero flag
plp
sec
rts
?or_val dta 0,0
?and_val dta 0,0
?_id_m dta 0,0
?_no_m dta 0,0
?c_iter .byte 0
?m_iter .byte 0
jsrtosoftidexit
lda #softid_exit
@@ -116,10 +215,14 @@ jsrtosoftidexit
clc
rts
jsrtosoftidentry
lda M_CHECK_VECS+1,y ; first is softid entry
sta M_VECTOR+1
pha
lda M_CHECK_VECS,y ; first is softid entry
sta M_VECTOR
pha
php
rti ; jsr to tabled func
@@ -254,7 +357,7 @@ flashformatsector
;sei
ldx flashformatstorex
jsr flashsetbank
jsr flashsetbank0
cli
; check if all data in sector is $ff
@@ -416,7 +519,7 @@ flashlockchip
lda #flash_lockchip
jmp jsrtovectorproc
flashsetbank
flashsetbank0
sta $d500,x
pha
lda $d013