From c1011079f6f4c862549180d13e3df6ad7f8bdbbc Mon Sep 17 00:00:00 2001 From: Tolik <85737314+Tolik-Trek@users.noreply.github.com> Date: Sat, 20 Jul 2024 05:00:21 +1000 Subject: [PATCH] Settings: Load ZX ROMS --- Shared_Includes | 2 +- src/ZX_ROMS/new/SP_TRDOS.bin | Bin 16384 -> 16384 bytes src/bios/exp/EXP.asm | 229 ++++++++++++------------ src/bios/rom/SETUP/MAIN.asm | 301 +++++++++++++++++++++++--------- src/bios/rom/SETUP/messages.z80 | 34 +++- src/bios/shared/DEFINES.INC | 2 +- 6 files changed, 360 insertions(+), 208 deletions(-) diff --git a/Shared_Includes b/Shared_Includes index f3ac185..1799727 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit f3ac185e2fe2d1e76f8e54c3c1f421a99fafdd62 +Subproject commit 17997278e4aea455a68532547beb561fd216ad19 diff --git a/src/ZX_ROMS/new/SP_TRDOS.bin b/src/ZX_ROMS/new/SP_TRDOS.bin index 5b0e1380905a074ced34066b0ee3ec5bac811d3d..2e94520690e8642f76be0ac415f774c41468e852 100644 GIT binary patch delta 430 zcmZo@U~Fh$+~Cd0XfxS|b3bGEWFD?I#x0X4bIk#g2HX=Fw@p68ZB_3i_3ZvNM+@tJ zEC$*}-(rj;W8JO9VxQG)FcOQs{GV^u*&p`*94vUB@$>~tQh8!=zcHkf`q+heN8aNuko z2T%i&Dj|fjvrkNbT28r4F6VI)y~6YG;z=pte+nAE{_$#vNV9RAW#gTEjz^3MNIm1Z zq}I;I?B?P!&y+dH*JZgWvxiHFJ0DY!i!TRDuw$5O0S}9hzoU!SoBN=qL;GP#~l!>o~yZ|312_7E887Er48;YX%#?f`jFtg~sH&e3F8E3>8P;dVh`KI|~e}k0%woCv)&W-Xt(t mm2uhRDWmDk$uRRO@-P2=lH>9t^WQ)vn=>qDumJ#y;;0n> delta 429 zcmZo@U~Fh$+~Cd0s5aS$b3bG0WFD?I#(9$`bIk#g2HX=F7fe3HZRM#W_3ZvNM+?<| zEC!-R-(rj;W8JO9VxQG)FcOQs{QvMn=4&kf1Ps{Dt~Ld-?HCSQ@hH~u9)7}ncAM!f zJszVQF=xBEfQ++^lcRYgB~e6ptbnplOn|bd^d|T6IO*==d3f=pl<+?VjbHzGHAJM@ zIL?0HIUw~AG4c_%RE!&AYYf|rpz8LA%=WR zK`y==EWwUpu2DQJKK_m_CX>JLDzFLhF*!!EO_t&_X3U=K$EPP54|1krI*5eZ$to>< zc-`cwd>V<_e0(zx|FDP1NCB<)mHKC5;PKDE!sVKQxVXPGh-(StnqD*5_?6H7><{~c z7MiyoaoGL4{K#t7!GHfXIE-c=TyJYM>mbMFN9+A7+>gHX{u;w~7O3*$NyXC1viy%H r7ch%%5}2&YIAQV>(^ZT~o9)eHn0a~lm;XKq)MNe|sBCkF UnusedSettingsFeatures }, [2]={ - "TrDosA", -- 1 - "TrDosB", -- 2 - "TrDosC", -- 3 - "TrDosD", -- 4 - "SetTime", -- 5 DEFINES.INC --> NEW_FEATURE - "HddWrPr", -- 6 DEFINES.INC --> HDDwriteProtect - -- 7 + "LoadZXroms", -- 1 + "TrDosA", -- 2 + "TrDosB", -- 3 + "TrDosC", -- 4 + "TrDosD", -- 5 + "SetTime", -- 6 DEFINES.INC --> NEW_FEATURE + "HddWrPr", -- 7 DEFINES.INC --> HDDwriteProtect -- 8 -- 9 -- 10 @@ -467,6 +467,16 @@ SettingsItemsTabs: DB msgStrings.valFDD DB msgStrings.valHDD + _mSETitemParams LoadZXroms + DW OnChangeAction.nothing + IF NEW_FEATURE : DB paramLine : ENDIF + DB columnNum,lineNum + DB paramName + DW CMOS_CELL.Options.Mask.LoadZXroms : DB %0000'1000 + DB msgStrings.valLoadZXromsManually + DB msgStrings.valLoadZXromsFlag + DB msgStrings.valLoadZXromsCAD + IF NEW_FEATURE _mSETitemParams SetTime DW OnChangeAction.SetTime @@ -651,6 +661,11 @@ msgStrings: _mSetStr parTrDosB, tmp_Counter : DZ 'TR DOS B:> : ' _mSetStr parTrDosC, tmp_Counter : DZ 'TR DOS C:> : ' _mSetStr parTrDosD, tmp_Counter : DZ 'TR DOS D:> : ' + _mSetStr parLoadZXroms, tmp_Counter : DZ 'Load ZX ROMs : ' + _mSetStr valLoadZXromsManually, tmp_Counter : DZ 'Manually ' + _mSetStr valLoadZXromsFlag, tmp_Counter : DZ 'By ZX flag ' + _mSetStr valLoadZXromsCAD, tmp_Counter : DZ 'On restart ' +; _mSetStrRus valLoadZXromsAuto, tmp_Counter : DZ 'On call ' IF NEW_FEATURE _mSetStr parSetTime, tmp_Counter : DZ 'Date and time setup : ' _mSetStr valFolder, tmp_Counter : DB 16,'ENTER',17,0 @@ -804,6 +819,11 @@ msgRusStrings: _mSetStrRus parTrDosB, tmp_Counter : DZ 'TR DOS B:> : ' _mSetStrRus parTrDosC, tmp_Counter : DZ 'TR DOS C:> : ' _mSetStrRus parTrDosD, tmp_Counter : DZ 'TR DOS D:> : ' + _mSetStrRus parLoadZXroms, tmp_Counter : DZ 'Загружать ZX ПЗУ : ' + _mSetStrRus valLoadZXromsManually, tmp_Counter : DZ 'Вручную ' + _mSetStrRus valLoadZXromsFlag, tmp_Counter : DZ 'По флагу ZX ' + _mSetStrRus valLoadZXromsCAD, tmp_Counter : DZ 'При рестарте' +; _mSetStrRus valLoadZXromsAuto, tmp_Counter : DZ 'При вызове ' IF NEW_FEATURE _mSetStrRus parSetTime, tmp_Counter : DZ 'Дата и время : ' _mSetStrRus valFolder, tmp_Counter : DB 16,'ВВОД',17,0 diff --git a/src/bios/shared/DEFINES.INC b/src/bios/shared/DEFINES.INC index 8064a10..3836ab1 100644 --- a/src/bios/shared/DEFINES.INC +++ b/src/bios/shared/DEFINES.INC @@ -1,5 +1,5 @@ ;=======================[All shared EQUs]=======================; -BETA_BUILD EQU 5 ; добавляет строку и сообщение о тестовой сборке на стартовом экране +BETA_BUILD EQU 6 ; добавляет строку и сообщение о тестовой сборке на стартовом экране ;======================[All shared defines]=====================; DEFINE PACKED_MAIN 0 ; паковать MAIN или влезает без этого? DEFINE SP2000_Loader_Flag #0107 ;