From 4880d5dfbdfc4e77e08b5b18095cd5091ade60ff Mon Sep 17 00:00:00 2001 From: Anatoliy Belyanskiy Date: Mon, 31 Jul 2023 01:45:15 +1000 Subject: [PATCH] ... --- Shared_Includes | 2 +- src/bios/exp/EXTENDED/HDD_DRIVER_6.asm | 6 +++--- src/bios/exp/FUNC_4x.ASM | 14 +++++++------- src/bios/rom/SETUP/AUTOIDE.asm | 8 ++++---- src/bios/shared/includes.inc | 1 + 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Shared_Includes b/Shared_Includes index b25c377..785b2ad 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit b25c3779d6af8abc2970d3a9a55006f43292c86e +Subproject commit 785b2adeb82bc426c6a7cc5da0d2c041d414ebc3 diff --git a/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm b/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm index 40e5ef0..9cc7be7 100644 --- a/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm +++ b/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm @@ -292,7 +292,7 @@ RDS000: CALL SELECTH LD XL,0 LD XH,A LD BC,IDE.Write.Command - LD A,#020 ;READ WITH RETRY + LD A,ATA_READ_SECTORS ; WITH RETRY OUT (C),A ;????? ;SAVE HL! @@ -473,7 +473,7 @@ NO_WriteProtect: LD XL,0 LD XH,A LD BC,IDE.Write.Command - LD A,#30 ;WRITE WITH RETRY + LD A,ATA_WRITE_SECTORS ; WITH RETRY OUT (C),A ;SAVE HL! WRS002: EXX @@ -570,7 +570,7 @@ VRS000: CALL SELECTH CALL PRESET POP HL LD BC,IDE.Write.Command - LD A,#40 ; !HARDCODE VERIFY WITH RETRY + LD A,ATA_READ_VERIFY_SECTORS ; WITH RETRY OUT (C),A VRS002: LD BC,IDE.Read.Status IN A,(C) diff --git a/src/bios/exp/FUNC_4x.ASM b/src/bios/exp/FUNC_4x.ASM index 87b740a..15dc933 100644 --- a/src/bios/exp/FUNC_4x.ASM +++ b/src/bios/exp/FUNC_4x.ASM @@ -169,8 +169,8 @@ FN_HDD_PREPARE: ; .SetCommand: LD BC,IDE.Write.Command - LD A,#20 -; OUT (C),A + LD A,ATA_READ_SECTORS + ; OUT (C),A AND A RET @@ -220,7 +220,7 @@ HD_RD_L1: SAFE_PORTY LD BC,IDE.Write.Command - LD A,#20 + LD A,ATA_READ_SECTORS OUT (C),A HD_RD_L2: @@ -293,7 +293,7 @@ FN_HDD_WRITE: EX AF,AF' LD BC,IDE.Write.Command - LD A,#30 + LD A,ATA_WRITE_SECTORS OUT (C),A HD_WR_L2: @@ -331,7 +331,7 @@ FN_HDD_RECAL: LD A,#A0 LD BC,IDE.Write.DriveCtrl OUT (C),A - LD A,#90 ; DIAGNOSTICS + LD A,ATA_EXECUTE_DEVICE_DIAGNOSTIC CALL HD_CMD_EXE AND A BIT IDE.ControlBit.Error,A @@ -451,7 +451,7 @@ HD_C0_L3: WAIT_HDD LD BC,IDE.Write.Command - LD A,#EC ; !HARDCODE + LD A,ATA_IDENTIFY_DEVICE OUT (C),A WAIT_HDD @@ -519,7 +519,7 @@ HD_C0_NO_LBA: LD A,D OUT (SLOT3),A - LD A,#91 ; SET HDD PARAMETERS + LD A,ATA_INITIALIZE_DEVICE_PARAMETERS ; SET HDD PARAMETERS CALL HD_CMD_EXE RET diff --git a/src/bios/rom/SETUP/AUTOIDE.asm b/src/bios/rom/SETUP/AUTOIDE.asm index 4a1e120..7288f71 100644 --- a/src/bios/rom/SETUP/AUTOIDE.asm +++ b/src/bios/rom/SETUP/AUTOIDE.asm @@ -178,7 +178,7 @@ NO_BUSY: CP IDE.Device.CDROM JP Z,NOHDD - LD E,#00 ;NOP + LD E,ATA_NOP LD BC,IDE.Write.Command OUT (C),E IF IDE_Optimization @@ -205,7 +205,7 @@ WXREADY: LD A,IDE.Device.HDD LD (IDEDEV),A - LD E,#EC ;IDENTIFY ATA + LD E,ATA_IDENTIFY_DEVICE LD BC,IDE.Write.Command OUT (C),E @@ -238,7 +238,7 @@ GETPARM: NOHDD: LD A,IDE.Device.CDROM LD (IDEDEV),A - LD E,#A1 ;IDENTIFY ATAPI + LD E,#A1 ;!HARDCODE IDENTIFY ATAPI LD BC,IDE.Write.Command OUT (C),E @@ -299,7 +299,7 @@ NONLBA: LD A,B LD BC,IDE.Write.Counter ENDIF OUT (C),A - LD A,#91 ; + LD A,ATA_INITIALIZE_DEVICE_PARAMETERS CALL IDE_CMD ; RET C LD C,(IY+IDE.HDD_INIT_TABLE.SectorsPerTrack) ; Sector per track diff --git a/src/bios/shared/includes.inc b/src/bios/shared/includes.inc index bac6d14..32e8210 100644 --- a/src/bios/shared/includes.inc +++ b/src/bios/shared/includes.inc @@ -13,5 +13,6 @@ INCLUDE 'src/bios/shared/VERSION.inc' ; Версия EXP и ROM INCLUDE 'Shared_Includes/constants/BIOS_EQU.inc' INCLUDE 'src/bios/ROM/BIOS.inc' + INCLUDE 'Shared_Includes/constants/ata.inc' ;--------------------------------------- ;