diff --git a/src/bios/BIOS.asm b/src/bios/BIOS.asm index 39c79f7..8876735 100644 --- a/src/bios/BIOS.asm +++ b/src/bios/BIOS.asm @@ -142,10 +142,10 @@ EXPORT BoardID.end EXPORT FN_CRIPT.cnf EXPORT ID_SPRINTER.bitstream_ver + EXPORT bitstream_ver_hex ;EXPORT ID_Version ;EXPORT ID_SPRINTER.BIOS_ver ;EXPORT BIOS_ver_hex - ;EXPORT bitstream_ver_hex ;EXPORT Disk_subsystem_ver_hex EXPORT EXP_ID.VER ; Версия биоса EXPORT EXP_ID.MOD @@ -153,7 +153,8 @@ ;EXPORT ROM_ID.MOD EXPORT CNF_ID.VER ; Версия конфы EXPORT CNF_ID.MOD - + EXPORT msgStrings.str_ACEX_MODEL + EXPORT msgRusStrings.str_ACEX_MODEL ; LUA ALLPASS ; print ("DEPACKER", sj.get_label("DEPACKER.PackedMAIN")) ; print ("UnPacker", sj.get_label("UnPacker.PackedMAIN")) diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index 88ffa07..d3d0aad 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -1103,7 +1103,7 @@ PORTS_INIT: INCLUDE 'FUNC_SERVICE.asm' INCLUDE 'FLEX.asm' -; INCLUDE 'EXP_SCR.ASZ' + ; INCLUDE 'EXP_SCR.ASZ' INCLUDE 'FUNC_PIC.ASM' INCLUDE 'FUNC_RAM_ROM_DRV.ASM' INCLUDE 'FUNC_SYS.ASM' diff --git a/src/bios/loader/loader.asm b/src/bios/loader/loader.asm index 1fb7745..9428e3c 100644 --- a/src/bios/loader/loader.asm +++ b/src/bios/loader/loader.asm @@ -156,7 +156,7 @@ DEFINE Altera_Chip altera_chip LUA - local file_path = 'Build/Bin/temp/' + local file_path = 'Build/ACEX/' local file_ext = '.BIN' local altera_ver = sj.get_define("Altera_Chip") sj.insert_define("Altera_File", '"' .. file_path .. altera_ver .. file_ext .. '"') diff --git a/src/bios/logo/3.bmp b/src/bios/logo/3.bmp deleted file mode 100644 index 2553ac6..0000000 Binary files a/src/bios/logo/3.bmp and /dev/null differ diff --git a/src/bios/logo/4.bmp b/src/bios/logo/4.bmp deleted file mode 100644 index 9831c77..0000000 Binary files a/src/bios/logo/4.bmp and /dev/null differ diff --git a/src/bios/logo/5.bmp b/src/bios/logo/5.bmp deleted file mode 100644 index 061995c..0000000 Binary files a/src/bios/logo/5.bmp and /dev/null differ diff --git a/src/bios/logo/6.bmp b/src/bios/logo/6.bmp deleted file mode 100644 index 7529664..0000000 Binary files a/src/bios/logo/6.bmp and /dev/null differ diff --git a/src/bios/logo/_LOGO_DAT.BIN b/src/bios/logo/_LOGO_DAT.BIN deleted file mode 100644 index 62d0c7a..0000000 Binary files a/src/bios/logo/_LOGO_DAT.BIN and /dev/null differ diff --git a/src/bios/logo/_LOGO_PAL.BIN b/src/bios/logo/_LOGO_PAL.BIN deleted file mode 100644 index 324e29c..0000000 Binary files a/src/bios/logo/_LOGO_PAL.BIN and /dev/null differ diff --git a/src/bios/logo/fathers.bmp b/src/bios/logo/fathers.bmp deleted file mode 100644 index 3e3e957..0000000 Binary files a/src/bios/logo/fathers.bmp and /dev/null differ diff --git a/src/bios/logo/test.bmp b/src/bios/logo/test.bmp deleted file mode 100644 index d5b16f5..0000000 Binary files a/src/bios/logo/test.bmp and /dev/null differ diff --git a/src/bios/logo/test2.bmp b/src/bios/logo/test2.bmp deleted file mode 100644 index c3b4136..0000000 Binary files a/src/bios/logo/test2.bmp and /dev/null differ diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index aece5f3..d2814c9 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -42,11 +42,13 @@ ;#FEE0-#FEEF : Any buffer (Video mode set?!) Used in Sprinter DOS and CD driver ;#FF00 ; + +; для варианта с запаковкой части бинарника (может не сработать без напильника за давностью лет) IFDEF PREBUILD ; ENCODING "DOS" DEVICE ZXSPECTRUM4096 ; модель с 4 метрами памяти MMU 2 e, 0 ; страница 0 в банку 2 и проверка на границы. - INCLUDE 'src/bios/shared/includes.inc'; Includes + INCLUDE 'src/bios/shared/includes.inc' ORG COMPILE_ADDR.MAIN OUTPUT 'Build/Bin/temp/MAIN.BIN' ENDIF diff --git a/src/bios/rom/SETUP/messages.z80 b/src/bios/rom/SETUP/messages.z80 index 70ee306..b9b6ba1 100644 --- a/src/bios/rom/SETUP/messages.z80 +++ b/src/bios/rom/SETUP/messages.z80 @@ -525,15 +525,16 @@ msgStrings: _mSetStr ideNone, tmp_Counter : DZ 'None ' _mSetStr ideSkiped, tmp_Counter : DZ 'Skipped ' _mSetStr ideFail, tmp_Counter : DZ 'Fail ' ; !FIXIT strFail - _mSetStr spModel, tmp_Counter : DZ 'Model name: ' - _mSetStr spCNFver, tmp_Counter : DZ 'Config. : ' - _mSetStr spMemory, tmp_Counter : DZ 'Memory : ' - _mSetStr cmosFound, tmp_Counter : DZ 'CMOS : Found' - _mSetStr cmosNone, tmp_Counter : DZ 'CMOS : None' - _mSetStr memoryAvailable, tmp_Counter : DZ 'Available : ' + _mSetStr spModel, tmp_Counter : DZ 'Model name : ' +.str_ACEX_MODEL EQU $ ; указатель на строку ниже для патча апдейтером + _mSetStr spCNFver, tmp_Counter : DZ '1K30 config: ' + _mSetStr spMemory, tmp_Counter : DZ 'Memory : ' + _mSetStr cmosFound, tmp_Counter : DZ 'CMOS : Found' + _mSetStr cmosNone, tmp_Counter : DZ 'CMOS : None' + _mSetStr memoryAvailable, tmp_Counter : DZ 'Available : ' ; _mSetStr unknownSTR1, tmp_Counter : DZ "7" ; _mSetStr unknownSTR2, tmp_Counter : DZ "8" - _mSetStr boardID, tmp_Counter : DZ 'Board ID : ' + _mSetStr boardID, tmp_Counter : DZ 'Board ID : ' _mSetStr bootFdd, tmp_Counter : DZ 'Boot from Diskette' ; _mSetStr bootHdd, tmp_Counter : DZ 'Boot from Hard disk ' _mSetStr bootHdd, tmp_Counter : DZ 'Boot from HDD ' @@ -675,15 +676,16 @@ msgRusStrings: _mSetStrRus ideNone, tmp_Counter : DZ 'Нет ' _mSetStrRus ideSkiped, tmp_Counter : DZ 'Пропущен ' _mSetStrRus ideFail, tmp_Counter : DZ 'Не определён ' - _mSetStrRus spModel, tmp_Counter : DZ 'Модель : ' - _mSetStrRus spCNFver, tmp_Counter : DZ 'Конфиг. : ' - _mSetStrRus spMemory, tmp_Counter : DZ 'Память : ' - _mSetStrRus cmosFound, tmp_Counter : DZ 'CMOS : Найден' - _mSetStrRus cmosNone, tmp_Counter : DZ 'CMOS : Нет' - _mSetStrRus memoryAvailable, tmp_Counter : DZ 'Доступно : ' + _mSetStrRus spModel, tmp_Counter : DZ 'Модель : ' +.str_ACEX_MODEL EQU $ ; указатель на строку ниже для патча апдейтером + _mSetStrRus spCNFver, tmp_Counter : DZ '1K30 конфиг: ' + _mSetStrRus spMemory, tmp_Counter : DZ 'Память : ' + _mSetStrRus cmosFound, tmp_Counter : DZ 'CMOS : Найден' + _mSetStrRus cmosNone, tmp_Counter : DZ 'CMOS : Нет' + _mSetStrRus memoryAvailable, tmp_Counter : DZ 'Доступно : ' ; _mSetStrRus unknownSTR1, tmp_Counter : DZ '7' ; _mSetStrRus unknownSTR2, tmp_Counter : DZ '8' - _mSetStrRus boardID, tmp_Counter : DZ 'ID платы : ' + _mSetStrRus boardID, tmp_Counter : DZ 'ID платы : ' _mSetStrRus bootFdd, tmp_Counter : DZ 'Запуск с дискеты' _mSetStrRus bootHdd, tmp_Counter : DZ 'Запуск с HDD ' _mSetStrRus bootCd, tmp_Counter : DZ 'Запуск с CD-ROM ' @@ -790,5 +792,4 @@ MSG_RUS: MSG_RUS.size EQU $-MSG_RUS ;================================================================================================================================== ASSERT MSG_ENG.size = MSG_RUS.size, "ERROR IN MESSAGE STRINGS: RUS and ENG do not match" -; ; \ No newline at end of file diff --git a/src/bios/rom/_MEM_MAP.INC.txt b/src/bios/rom/_MEM_MAP.INC.txt deleted file mode 100644 index 9616ef6..0000000 --- a/src/bios/rom/_MEM_MAP.INC.txt +++ /dev/null @@ -1,17 +0,0 @@ -; -; ██████╗ ███████╗██████╗ █████╗ ██████╗██╗ ██╗███████╗██████╗ -; ██╔══██╗██╔════╝██╔══██╗██╔══██╗██╔════╝██║ ██╔╝██╔════╝██╔══██╗ -; ██║ ██║█████╗ ██████╔╝███████║██║ █████╔╝ █████╗ ██████╔╝ -; ██║ ██║██╔══╝ ██╔═══╝ ██╔══██║██║ ██╔═██╗ ██╔══╝ ██╔══██╗ -; ██████╔╝███████╗██║ ██║ ██║╚██████╗██║ ██╗███████╗██║ ██║ -; ╚═════╝ ╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ -; -Depacker_start EQU #D000 -;Depacked_logo_start EQU #D900 -;MAIN_Unpacked_Start EQU #8000 - -COMPILE_ADDR: -.EXP: EQU 0 -.ROM: EQU 0 -.MAIN EQU #8000 - diff --git a/src/bios/rom/_ROM.txt b/src/bios/rom/_ROM.txt deleted file mode 100644 index 7355d0c..0000000 --- a/src/bios/rom/_ROM.txt +++ /dev/null @@ -1,119 +0,0 @@ -;-----------[#0000 Extended]------------ - INCLUDE 'src/bios/rom/EXTENDED/EXTENDED.ASM' -;--------------------------------------- - - - -;-------------[#1000 SETUP]------------- - BLOCK #1000-$,#FF -setup_start EQU $ - - DISP #8000 ;!!!!!!!!!!hardcode - - DB "SETUP" -; JR JUMP - DB " (C) 2001 PETERS PLUS LTD " -SETUP_DEPACK: - DI - POP HL - LD SP,#7FFF ;!!!!!!!!!!hardcode - PUSH HL - PUSH AF - LD HL,#8000 ;!!!!!!!!!!hardcode - PUSH HL - LD DE,Depacker_start ; адрес процедуры депакера !!!!! - PUSH DE - LD HL,Depacker - LD BC,Depacker.length - LDIR - LD HL,Depacker.packcode ; где архив - LD DE,COMPILE_ADDR.MAIN ; куда распаковывать - RET - -Depacker: - ENT - - -DEPACK_CODE: - DISP Depacker_start -; сделать тут условие для исходника депакера, чтоб автоматом выбирался разный алгоритм запаковки и распаковки - INCLUDE 'src/bios/ROM/SETUP/DEHRUST.ASM' - ENT -DEPACK_CODE.length EQU $-DEPACK_CODE - - - DISP Depacker+DEPACK_CODE.length -Depacker.packcode: - INCBIN 'Build/Bin/MAIN.PAK' -Depacker.length EQU $-Depacker.packcode+DEPACK_CODE.length - ENT - -setup_length EQU $-setup_start -;--------------------------------------- - - - -;---------------[SET EXP]--------------- - BLOCK #3FD0-$,#FF -; call exp bios from setup -RST18h: - PUSH AF - LD A,D_ROM16OFF ; set exp-rom to bank0 - OUT (SYS_PORT_ON),A - POP AF - RET -;--------------------------------------- - - - -;-------------[???????????]------------- - BLOCK #3FD8-$,#FF -A3FD8: - JP #0107 -;--------------------------------------- - - - -;-------------[???????????]------------- - BLOCK #3FE0-$,#FF - -A3FE0: - LD A,#00 - OUT (SYS_PORT_OFF),A - JP #0000 -;--------------------------------------- - - - -;-------------[???????????]------------- - BLOCK #3FE8-$,#FF -RET_EXP_ROM: - PUSH AF - LD A,D_ROM16OFF - OUT (SYS_PORT_ON),A - JP #0100 -;--------------------------------------- - - - -;-------------[???????????]------------- - BLOCK #3FF0-$,255 -A3FF0: - PUSH AF - DI - LD A,D_ROM16OFF - OUT (SYS_PORT_OFF),A - JR A3FD8 -;--------------------------------------- - - - -;-------------[???????????]------------- -A3FF8: - PUSH AF - LD A,#00 - OUT (SYS_PORT_OFF),A - JP #0000 -;--------------------------------------- -A4000: -;======================================= \ No newline at end of file diff --git a/src/bios/shared/DCP_PAGE.bin b/src/bios/shared/DCP_PAGE.bin deleted file mode 100644 index 8f766b8..0000000 Binary files a/src/bios/shared/DCP_PAGE.bin and /dev/null differ diff --git a/src/bios/shared/VERSION.inc b/src/bios/shared/VERSION.inc index a87334e..c418309 100644 --- a/src/bios/shared/VERSION.inc +++ b/src/bios/shared/VERSION.inc @@ -2,7 +2,7 @@ ;------[Version of BIOS "VER.MOD"]------ EXP_ID: .VER EQU 3 ; Номер версии менять тут! -.MOD EQU 05 ; Номер версии менять тут! +.MOD EQU 06 ; Номер версии менять тут! BIOS_ver_hex EQU EXP_ID.VER*256+EXP_ID.MOD DEFINE BIOS_ver_string '0'+EXP_ID.VER, '.', '0'+EXP_ID.MOD/10, '0'+EXP_ID.MOD-(EXP_ID.MOD/10)*10