в конфиге можно пропустить загрузку с HDD выбранных vROM, они пропускаются если перед путём стоит ";"

This commit is contained in:
Anatoliy Belyanskiy 2024-02-23 01:52:38 +10:00
parent f88b1ceba7
commit 8dd95b8ff0
2 changed files with 21 additions and 24 deletions

@ -1 +1 @@
Subproject commit e5122b68be360be61be821f68988c29021ec8411
Subproject commit 215d0f3c90865dd2c4c0d92d17e64513a0b0407e

View File

@ -15,11 +15,12 @@
/*
SYS
[x] - § ¤ ¢ âì CONFIG_DE ¯¥à¥¤ § ¯ã᪮¬ ᯥªâà㬠 ¨ ¢ ¯¥à¥å¢ â稪¥ à¥á¥â 
[x] - § ¤ ñâáï CONFIG_DE ¯¥à¥¤ § ¯ã᪮¬ ᯥªâà㬠 ¨ ¢ ¯¥à¥å¢ â稪¥ à¥á¥â  (¤«ï ¡®«¥¥ £« ¤ª®© ᮢ¬¥á⨬®á⨠ᮠáâ àë¬ á®ä⮬ Sp97)
[x] - ¯®¤¤¥à¦ª  ­®¢ëå ®¡à §®¢ vROM
[x] - ¢ ª®­ä¨£¥ ¬®£ãâ ¡ëâì ¯à®¯ãé¥­ë ­¥ª®â®àë¥ vROM,®­¨ ­¥ § £à㦠îâáï
[x] - ¤®¡ ¢«¥­  ᮢ¬¥á⨬®áâì á ¤¥¬® ATARIN, ãᯮ«ì§ãî饥 ­¥¯®«­ãî ¤¥è¨äà æ¨î ¯®àâ  AY
[x] - ¢ ª®­ä¨£¥ ¬®¦­® ¯à®¯ãáâ¨âì § £à㧪ã á HDD ¢ë¡à ­­ëå vROM, ®­¨ ¯à®¯ã᪠îâáï ¥á«¨ ¯¥à¥¤ ¯ãâñ¬ á⮨â ";"
[x] - ¯à®¢¥àïâì ¬¥âªã ZX, ¥á«¨ ¬ë ­¥ £à㧨¬ 3 ®á­®¢­ëå vROM
[x] - ¤®¡ ¢«¥­  ᮢ¬¥á⨬®áâì á ¤¥¬® ATARIN, ãᯮ«ì§ãî饥 ­¥¯®«­ãî ¤¥è¨äà æ¨î ¯®àâ  AY
[x] - ¯¥à¥¤ ¢å®¤®¬ ¢ ०¨¬ ᯥªâà㬠 ⥪ã騬 ãáâ ­ ¢«¨¢ ¥âáï à §¤¥« HDD á ª®â®à®£® § £à㦠«áï ®¡à § TRD
;
Images
[+] - Load SCL image
@ -30,8 +31,6 @@
[+] - ᫨ ¢ë¡à ­® ret-zx,â® ¯à¨ ­ ¦ â¨¨ ­  ¯à®¡¥« áà §ã ¯®á«¥ CAD ¢¥à­ñâ ¢ DSS
[*] - Œ¥­ïâì ᯥªâà㬮¢áªãî ¯ «¨âàã
[ ] - 뤠¢ âì á®®¡é¥­¨ï ­  ï§ëª¥ ãáâ ­®¢«¥­­®¬ ¢ CMOS
[ ] - ¥á«¨ 㪠§ ­® ⮫쪮 ¨¬ï ®¡à §  IMAGE.TRD ¯à¨ § ¯ã᪥ ¨áª âì ¢ í⮩ ¦¥ ¯ ¯ª¥ IMAGE.ZX
¨ ⮫쪮 ¥á«¨ ¥£® ­¥â, â® £à㧨âì ¤¥ä®«â­ë© spectrum.cfg ¨§ ¯ ¯ª¨ á ¯à®£à ¬¬®©
*/
;
@ -379,37 +378,34 @@ A_LINES: BLOCK CFG_FILE_LINES*2,0
CONTINUE: LD (LEN_CNF),DE ; CNF ä ©« ¯à®ç¨â ­, DE - ¤«¨­  CNF
LD HL,#C000
READ_CNF_FILE: LD HL,#C000
LD DE,A_LINES
LD C,CFG_FILE_LINES
LOOP_A: LD B,MAX_LINE_LENGTH ; ¤«¨­  áâப¨
.LOOP_A: LD B,MAX_LINE_LENGTH ; ¤«¨­  áâப¨
EX DE,HL
LD (HL),E
INC HL
LD (HL),D
INC HL
EX DE,HL
LOOP_L: LD A,(HL)
.LOOP_L: LD A,(HL)
CP 13
JR Z,N_LINE
JR Z,.N_LINE
CP 10
JR Z,N_LINE
JR Z,.N_LINE
AND A
JP Z,END_CNF_ERROR
INC HL
CP ';'
JR Z,N_LINE
DJNZ LOOP_L
N_LINE: LD (HL),0
INC HL
DJNZ .LOOP_L
.N_LINE: LD (HL),0
.N_LINE2: INC HL
LD A,(HL)
CP 13
JR Z,N_LINE
JR Z,.N_LINE2
CP 10
JR Z,N_LINE
JR Z,.N_LINE2
DEC C
JR NZ,LOOP_A
JR NZ,.LOOP_A
; ¢ë¤¥«¥­® 8 áâப ¢ CNF
;*************************************
;!TODO ¥á«¨ ¯à®¯ã᪠¥¬ § £à㧪ã ROM ¤«ï 48, 128 ¨«¨ trdos, â® ¢áâ ¢«ïâì ¢ ¯®àâ vROM ­®¬¥à ¨§ áâ ­¤ àâ­®£® ¯¥à¢®£® ¡«®ª 
@ -445,6 +441,7 @@ N_LINE: LD (HL),0
EX DE,HL
ENDM
;
LOAD_ZXROMS:
;!FIXIT ¢à¥¬¥­­ ï § ¯« âª 
CALL CHECK_ZX_FLAG
;
@ -523,7 +520,7 @@ LOADING_PALETTE:
OUT (SLOT3),A
LD HL,(A_LINES + (OPTIONS_LINE-1)*2 ) ; áâப  ¯ à ¬¥â஢
LOOP_PAR1: LD A,(HL)
CP "/"
CP '/'
JR Z,PARAM_TEST
CP 0
JR Z,PARAM_END
@ -551,7 +548,7 @@ LOOP_PAR2: LD A,(DE)
PARAM_E1: CP 255
JR NZ,NO_PAR
LD A,(HL)
CP 20h
CP ' '
JR Z,PARAM_E2
CP 0
JR Z,PARAM_E2
@ -1060,7 +1057,7 @@ RESET_TO_ZX: DI
LD BC,ACEX.AY_FFFD_WRITE*256 + BIOS.DCP_CONFIG
RST ToBIOS
;
;!TEST; [ ] 04/11/2023 Žâ¤¥«ì­ë¥ à ¬¤¨áª¨ ¤«ï ०¨¬  ᯥªâà㬠 ¨ DSS. BLK_TO_RAMD
;[x] 04/11/2023 Žâ¤¥«ì­ë¥ à ¬¤¨áª¨ ¤«ï ०¨¬  ᯥªâà㬠 ¨ DSS. BLK_TO_RAMD
LD BC,BIOS.SWAP_RAM_DRIVES.ZX
RST ToBIOS
;
@ -1358,7 +1355,7 @@ Int_or_: DW Int_or, #0300 ;
Ret_zx_: DW Ret_zx, #4100 ; ¢ª«îç¨âì ¢®§¢à â ¢ ZX áâà ­¨æ  (#41) ¤®«¦­  ᮢ¯ ¤ âì á ret_fn_
Ret_fn_: DW Ret_fn, #4100 ; ¢ª«îç¨âì ¢®§¢à â ¢ FN áâà ­¨æ  (#41) ¤®«¦­  ᮢ¯ ¤ âì á ret_zx_
LD_Pal_: DW LD_Pal, #FF00
RMD_Keep_: DW RMD_Keep, #FF00 ;!TEST; [ ] 05/11/2023 ®ç¨é âì à ¬¤¨áª¨ ¯à¨ ¢ë室¥
RMD_Keep_: DW RMD_Keep, #FF00 ; [x] 05/11/2023 ®ç¨é âì à ¬¤¨áª¨ ¯à¨ ¢ë室¥
DW 0,0 ; end marker
Turbo_: DB "turbo", 255,0