diff --git a/Shared_Includes b/Shared_Includes index 5a5dcf0..cbc1fd5 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 5a5dcf0bd035d2adaaa27d28bb8ed1bd86260d59 +Subproject commit cbc1fd596a5a56298407c13a529a574e968235c7 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index 212f4f8..88ffa07 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -211,28 +211,29 @@ NMI_Point: ; BLOCK MEM_MAP.ID_Version-$,0 ;#C0-$,0 ID_Version: DW BIOS_ver_hex -ID_SPRINTER_length: - DB ID_SPRINTER.LENGTH +; ID_SPRINTER_FullSize: +; DB ID_SPRINTER.Size ; запись 1 ID_SPRINTER: DB 'Firmware v' -.BIOS_ver: DB BIOS_ver_string,', ' - IF DEBUG - DB 'BETA release' +.BIOS_ver: DB BIOS_ver_string,' ' + IF BETA_BUILD + DB 'BETA' ELSE - DB 'release ',BUILD_DATE + DB '[',BUILD_DATE,']' ENDIF DB 0 +.Record1_Size EQU $-ID_SPRINTER ; запись 2 DB 'Sprinter',0 ; запись 3 .bitstream_ver: DB bitstream_ver_string,0 DB 0 ; +.Size EQU $-ID_SPRINTER .Records_Num EQU 3 -.LENGTH EQU $-ID_SPRINTER ; Check for max length of string - ASSERT ID_SPRINTER.LENGTH < #FF, 'ERROR! ID String is to long!' + ASSERT ID_SPRINTER.Record1_Size < SYS_PAGE.ID_FLAG.Size, 'ERROR! ID String is to long!' ;======================================= diff --git a/src/bios/exp/FUNC_SYS.ASM b/src/bios/exp/FUNC_SYS.ASM index 71d7f38..58a8ec3 100644 --- a/src/bios/exp/FUNC_SYS.ASM +++ b/src/bios/exp/FUNC_SYS.ASM @@ -31,11 +31,13 @@ EMM.GetBanksPorts: FN_VERSION: PUSH HL EX DE,HL - LD HL,ID_SPRINTER_length - ; - LD B,0 - LD C,(HL) - INC HL + ; LD HL,ID_SPRINTER_FullSize + + ; LD B,0 + ; LD C,(HL) + ; INC HL + LD HL,ID_SPRINTER + LD BC,ID_SPRINTER.Size LDIR ; POP HL @@ -147,11 +149,13 @@ EMM.CheckColdInit: OUT (SLOT2),A LD HL,SYS_PAGE.ID_FLAG - #4000 - LD DE,ID_SPRINTER_length - LD A,(DE) - DEC A - INC DE - LD B,A + ; LD DE,ID_SPRINTER_FullSize + ; LD A,(DE) + ; DEC A + ; INC DE + ; LD B,A + LD B,ID_SPRINTER.Record1_Size + LD DE,ID_SPRINTER .loop: LD A,(DE) CP (HL) JR NZ,INIT_SYS_ALL @@ -178,11 +182,14 @@ EMM.FullInit: OUT (SLOT2),A INIT_SYS_ALL: DI - LD HL,ID_SPRINTER_length - LD DE,SYS_PAGE.ID_FLAG - #4000 - LD C,(HL) - LD B,0 - INC HL + ; LD HL,ID_SPRINTER_FullSize + ; LD DE,SYS_PAGE.ID_FLAG - #4000 + ; LD C,(HL) + ; LD B,0 + ; INC HL + LD HL,ID_SPRINTER + LD DE,SYS_PAGE.ID_FLAG - #4000 + LD BC,ID_SPRINTER.Record1_Size LDIR ; Disable user IM address in SYS_PAGE diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index e3c521b..aece5f3 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -426,7 +426,7 @@ INSTALL: LD E,COLORS.CGA.INC.GREEN CALL POSTMSC - IF DEBUG + IF BETA_BUILD LD DE,#0328 CALL LP_SET_PLACE LD A,msgStrings.testBIOSmsg diff --git a/src/bios/rom/SETUP/messages.z80 b/src/bios/rom/SETUP/messages.z80 index 836093e..70ee306 100644 --- a/src/bios/rom/SETUP/messages.z80 +++ b/src/bios/rom/SETUP/messages.z80 @@ -632,7 +632,7 @@ msgStrings: _mSetStr parSetTime, tmp_Counter : DZ 'Date and Time setup : ' _mSetStr valFolder, tmp_Counter : DB 16,'ENTER',17,0 ENDIF - IF DEBUG + IF BETA_BUILD _mSetStr testBIOSmsg, tmp_Counter : DZ 'Test build! ',BUILD_DATE,', ',__TIME__ ENDIF ; @@ -781,7 +781,7 @@ msgRusStrings: _mSetStrRus parSetTime, tmp_Counter : DZ 'Дата и время : ' _mSetStrRus valFolder, tmp_Counter : DB 16,'ВВОД',17,0 ENDIF - IF DEBUG + IF BETA_BUILD _mSetStrRus testBIOSmsg, tmp_Counter : DZ 'Тестовая сборка! ',BUILD_DATE,', ',__TIME__ ENDIF ; diff --git a/src/bios/shared/DEFINES.INC b/src/bios/shared/DEFINES.INC index 3e79b28..f0b5345 100644 --- a/src/bios/shared/DEFINES.INC +++ b/src/bios/shared/DEFINES.INC @@ -1,6 +1,6 @@ ; ;---------[All shared defines]---------- - DEFINE DEBUG 1 ; добавляет строку и сообщение о тестовой сборке на стартовом экране + DEFINE BETA_BUILD 1 ; добавляет строку и сообщение о тестовой сборке на стартовом экране DEFINE PACKED_MAIN 0 ; паковать MAIN или влезает без этого? DEFINE SP2000_Loader_Flag #0107 DEFINE IDE_Optimization 1 ; слегка оптимизирует некоторые процедуры работы с HDD