diff --git a/Shared_Includes b/Shared_Includes index 4ecde88..4a5753e 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 4ecde88739cd3e2b7447dd36b79163f1a5e0d40d +Subproject commit 4a5753ea2c090485263117929d6a734d4a669ec4 diff --git a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm index 3a2f58f..6f98de1 100644 --- a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm +++ b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm @@ -669,10 +669,9 @@ SEEK: LD XL,A OUT (FDC_93.DrvCTRL),A IN A,(FDC_93.Track) CP C - PUSH BC + ;PUSH BC CALL NZ,P50ms - ; - POP BC + ;POP BC LD A,C OUT (FDC_93.Data),A IN A,(FDC_93.Track) @@ -685,9 +684,9 @@ SEEK: LD XL,A LD A,C OUT (FDC_93.Track),A RET Z -.STOL: PUSH BC +.STOL: ;PUSH BC CALL P50ms - POP BC + ;POP BC RET ; ;P750ms LD B,3 @@ -695,12 +694,14 @@ SEEK: LD XL,A ; CALL P1ms ; DJNZ PMS2 ; RET -P50ms: LD A,12 +P50ms: PUSH BC + LD A,12 .P1ms: LD C,255 .PMS: DEC C JR NZ,.PMS DEC A JR NZ,.P1ms + POP BC RET ; diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index f4e1785..d12460a 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -1194,22 +1194,25 @@ MOVE1: LD HL,#8000 ; !HARDCODE SYSID: DZ "Starting..." .length EQU $-SYSID +;!FIXIT переделать под структуру для переменных FDD, отдельные переменные под A и B FD144A: DB #80,#12,#02,#50,#00,#00,#02,FDD_INIT_TABLE.FDD +.Size EQU $ - FD144A FD720A: DB #00,#09,#02,#50,#00,#00,#02,FDD_INIT_TABLE.FDD +.Size EQU $ - FD720A FDD_INSTAL: IN A,(SLOT3) EX AF,AF' LD A,SYS_PAGE OUT (SLOT3),A LD HL,FDD_INIT_TABLE.FDD_0 - LD BC,SYS_PAGE.FDD_TBL.Size*256 + #FF ; table_size*256 + fill_byte + LD BC,SYS_PAGE.FDD_TBL.Size*256 + #FF ; table_size*256 + fill_byte .FILLFDD: LD (HL),C INC HL DJNZ .FILLFDD ; EX AF,AF' OUT (SLOT3),A - LD BC,CMOS_CELL.DrivesSetup_1.Mask.FirstFDD ;#0311 + LD BC,CMOS_CELL.DrivesSetup_1.Mask.FirstFDD ;#0311 CALL GET_CMOS_VALUE LD HL,FD720A OR A @@ -1222,11 +1225,11 @@ FDD_INSTAL: IN A,(SLOT3) LD A,SYS_PAGE OUT (SLOT3),A LD DE,FDD_INIT_TABLE.FDD_0 - LD BC,#0008 ; !HARDCODE + LD BC,FD144A.Size ; !HARDCODE LDIR EX AF,AF' OUT (SLOT3),A -.NOFDD0: LD BC,CMOS_CELL.DrivesSetup_1.Mask.SecondFDD ;#0C11 +.NOFDD0: LD BC,CMOS_CELL.DrivesSetup_1.Mask.SecondFDD ;#0C11 CALL GET_CMOS_VALUE LD HL,FD720A OR A @@ -1239,7 +1242,7 @@ FDD_INSTAL: IN A,(SLOT3) LD A,SYS_PAGE OUT (SLOT3),A LD DE,FDD_INIT_TABLE.FDD_1 - LD BC,#0008 ; !HARDCODE + LD BC,FD144A.Size ; !HARDCODE LDIR EX AF,AF' OUT (SLOT3),A diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG old mode 100755 new mode 100644 index 2508338..be9229c Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ