diff --git a/Shared_Includes b/Shared_Includes index 6073b87..2fec620 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 6073b8787867fe5d217d064c9f5f77972303148c +Subproject commit 2fec6202f716cfa3ed48fb9bfd79d1081cc2721b diff --git a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm b/src/bios/exp/EXTENDED/FDD_DRIVER.asm similarity index 91% rename from src/bios/exp/EXTENDED/FDD_DRIVER_2.asm rename to src/bios/exp/EXTENDED/FDD_DRIVER.asm index c1b1e06..bf74c2f 100644 --- a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm +++ b/src/bios/exp/EXTENDED/FDD_DRIVER.asm @@ -683,22 +683,47 @@ P50ms: PUSH BC RET ; +; +//////////////////////////////////////////////////////////////////////// +;RESWG: LD A,8 +; ; +;EXECOM: OUT (FDC_93.Command),A +; LD HL,#0000 ; счётчик +;.WREST: DEC HL +; LD A,H +; OR L +; SCF +; RET Z +; ; +; IN A,(FDC_93.DrvCTRL) +; AND #80 +; JR Z,.WREST +; RET ; RESWG: LD A,8 ;!HARDCODE CMD КР1818ВГ93 ; EXECOM: OUT (FDC_93.Command),A LD HL,#0000 ; счётчик + PUSH BC + LD B,3 ; счётчик + ; .WREST: DEC HL LD A,H OR L - SCF - RET Z + JR NZ,.get_state ; - IN A,(FDC_93.DrvCTRL) + DJNZ .WREST + ; + POP BC + SCF + RET + ; +.get_state: IN A,(FDC_93.DrvCTRL) AND #80 JR Z,.WREST - RET -; + POP BC + RET +//////////////////////////////////////////////////////////////////////// ; ;------------------------------- diff --git a/src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm b/src/bios/exp/EXTENDED/RAM_DISK_DRIVER.asm similarity index 100% rename from src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm rename to src/bios/exp/EXTENDED/RAM_DISK_DRIVER.asm diff --git a/src/bios/exp/FUNC_5x.asm b/src/bios/exp/FUNC_5x.asm index 7ce5449..295748c 100644 --- a/src/bios/exp/FUNC_5x.asm +++ b/src/bios/exp/FUNC_5x.asm @@ -85,8 +85,8 @@ DRV_LIST: ; RET ; ; - INCLUDE 'EXTENDED/FDD_DRIVER_2.asm' - INCLUDE 'EXTENDED/RAM_DISK_DRIVER_1.asm' + INCLUDE 'EXTENDED/FDD_DRIVER.asm' + INCLUDE 'EXTENDED/RAM_DISK_DRIVER.asm' INCLUDE 'EXTENDED/IDE/ATA_DRV.asm' INCLUDE 'EXTENDED/IDE/ATAPI_DRV.asm' INCLUDE 'EXTENDED/IDE/SHARED.asm' diff --git a/src/bios/shared/DEFINES.INC b/src/bios/shared/DEFINES.INC index 6f20c93..f70d049 100644 --- a/src/bios/shared/DEFINES.INC +++ b/src/bios/shared/DEFINES.INC @@ -1,8 +1,10 @@ ;=======================[All shared EQUs]=======================; -BETA_BUILD EQU 1 ; 40 ; добавляет строку и сообщение о тестовой сборке на стартовом экране + DEFINE SET_EXPID_VER 3 + DEFINE SET_EXPID_MOD 06 +BETA_BUILD EQU 0 ; 40 ; добавляет строку и сообщение о тестовой сборке на стартовом экране BETA_RC EQU 0 ; 2 ; -RELEASEhotFIX EQU 1 ; - DEFINE RELEASE_BUILD_DATE "04.07.2025" +RELEASEhotFIX EQU 2 ; + DEFINE RELEASE_BUILD_DATE "19.01.2026" ;======================[All shared defines]=====================; DEFINE PACKED_MAIN 0 ; паковать MAIN или влезает без этого? DEFINE SP2000_Loader_Flag #0107 ; diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG index 4114146..d78660a 100644 Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ diff --git a/src/bios/shared/VERSION.inc b/src/bios/shared/VERSION.inc index 13f096e..87f4338 100644 --- a/src/bios/shared/VERSION.inc +++ b/src/bios/shared/VERSION.inc @@ -2,8 +2,8 @@ ; ============[For EXP part]============= ; ------[Version of BIOS "VER.MOD"]------ EXP_ID: -.VER EQU 3 ; Номер версии менять тут! -.MOD EQU 07 ; Номер версии менять тут! +.VER EQU SET_EXPID_VER ; Номер версии менять тут! +.MOD EQU SET_EXPID_MOD ; Номер версии менять тут! 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