From d6ed41730cc80a595385627a78a6616956c52aea Mon Sep 17 00:00:00 2001 From: Anatoliy Belyanskiy Date: Fri, 5 Jan 2024 01:32:23 +1000 Subject: [PATCH] bug --- SP_TRDOS.ASM | 1 + Shared_Includes | 2 +- TRDOS/TR_MSD_3.ASZ | 14 +++++++------- TRDOS/TR_MSD_S.ASZ | 19 ++++++++----------- TRDOS/TR_RMD_S.ASZ | 4 ++-- ZX_EXP/EXP_HDD.ASM | 3 +-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM index eeb9234..b3a35f6 100644 --- a/SP_TRDOS.ASM +++ b/SP_TRDOS.ASM @@ -11,6 +11,7 @@ INCLUDE 'INC/SPRINT00.INC' INCLUDE 'inc/rom_routines.inc' INCLUDE 'Shared_Includes/constants/zx_char_codes.inc' + INCLUDE 'Shared_Includes/constants/BIOS_equ.inc' ;*************************************** ;CNF_PORT EQU #74 AUTO_4000 EQU 04000H diff --git a/Shared_Includes b/Shared_Includes index c135d9b..d1ce639 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit c135d9b6038fcabca6cef3234d876f93d5865dee +Subproject commit d1ce63928bdbb44e48b311f9d4a0005c2f44fcd4 diff --git a/TRDOS/TR_MSD_3.ASZ b/TRDOS/TR_MSD_3.ASZ index a2de075..57179c7 100644 --- a/TRDOS/TR_MSD_3.ASZ +++ b/TRDOS/TR_MSD_3.ASZ @@ -336,7 +336,7 @@ FAT_DE_to_HL: PUSH HL LD A,H - AND 80H + AND #80 LD C,A LD H,D LD L,E @@ -412,18 +412,18 @@ FAT_HALF_L: JR NZ,FAT_HALF_L FAT_HALF: BIT 7,D - LD A,0FFH + LD A,#FF JR NZ,FAT_16_L2 - LD A,0FH + LD A,#0F AND B LD B,A - LD A,0FH + LD A,#0F FAT_16_L2: CP B JR NZ,NO_END_CLAST FAT_ALL: LD A,C - CP 0F0H + CP #F0 JR C,NO_END_CLAST LD L,C LD H,B @@ -548,7 +548,7 @@ GET_FL_L2: ;*************************************************************************** HDD_PROG: - LD C,0 + LD C,BIOS.HDD_INIT and #BF CALL HD_CMD JP C,HDD_PROG_E LD HL,HD_IDF_ADR+54 @@ -576,7 +576,7 @@ HDD_PROG_L: RST 10H POP BC DJNZ HDD_PROG_L - LD C,1 + LD C,BIOS.HDD_RECAL and #BF CALL HD_CMD JP NC,AUTO_03E1 diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ index c101509..eed69d8 100644 --- a/TRDOS/TR_MSD_S.ASZ +++ b/TRDOS/TR_MSD_S.ASZ @@ -14,7 +14,6 @@ ;* 4. Команда - C * ;* 5. Страница ОЗУ - A * ;************************************************ - HDD_REDIR: POP AF CALL HD_CMD @@ -429,7 +428,6 @@ READ_BPB: JP ERROR_MSDOS HDD_REDIR2: - CALL MAIN_BPB RET NC @@ -438,7 +436,7 @@ SPACIAL_BPB: LD DE,63 LD A,SYS_PAGE LD HL,MS_BPB - LD C,5 + LD C,BIOS.HDD_READ and #BF LD B,1 CALL MSD_R_W_UT CALL BPB_PARAMS @@ -446,12 +444,12 @@ SPACIAL_BPB: JP ERROR_MSDOS MAIN_BPB: - LD IX,0 - LD DE,0 + ;LD IX,0 + ;LD DE,0 LD A,SYS_PAGE LD HL,MS_BPB - LD C,4 - LD B,1 + LD C,BIOS.HDD_READ_BPB and #BF + ;LD B,1 CALL MSD_R_W_UT CALL BPB_PARAMS RET @@ -478,7 +476,6 @@ MAIN_BPB: ; CALL HD_CMD BPB_PARAMS: - DI IN A,(PAGE3) EX AF,AF' @@ -486,7 +483,7 @@ BPB_PARAMS: OUT (PAGE3),A LD A,(MS_BPB+FORM_CODE) - CP 0F0H + CP #F0 JP C,ERROR_BPB LD HL,MS_BPB+FAT_ID @@ -507,13 +504,13 @@ R_BPB_L11: DJNZ R_BPB_L1 LD A,(HL) CP '6' - LD HL,81FFH ; FAT16 флаг + LD HL,#81FF ; FAT16 флаг JR Z,BPB_FAT CP '2' JP NZ,ERROR_BPB PC_DOS_BPB: - LD HL,01FFH ; FAT12 флаг + LD HL,#01FF ; FAT12 флаг BPB_FAT: LD (FAT_FLAG),HL diff --git a/TRDOS/TR_RMD_S.ASZ b/TRDOS/TR_RMD_S.ASZ index 68ea148..e213620 100644 --- a/TRDOS/TR_RMD_S.ASZ +++ b/TRDOS/TR_RMD_S.ASZ @@ -3,7 +3,7 @@ DISK_REDIR: PUSH BC LD A,(OPER_DISK) AND 3 - LD C,#CF ;!HARDCODE BIOS.GET_DRV_ST + LD C,BIOS.GET_DRV_ST CALL EXP_FNS EI POP BC @@ -425,7 +425,7 @@ FDD_SET: RET HDD_SET: - LD C,0 + LD C,BIOS.HDD_INIT and #BF CALL HD_CMD JP C,HDD_PROG_E diff --git a/ZX_EXP/EXP_HDD.ASM b/ZX_EXP/EXP_HDD.ASM index 2903b09..98d15c0 100644 --- a/ZX_EXP/EXP_HDD.ASM +++ b/ZX_EXP/EXP_HDD.ASM @@ -17,8 +17,7 @@ HD_EXP_EXE: CALL HD_CMD_X JP HD_EXP_RET -HD_CMD: - POP AF +HD_CMD: POP AF CALL HD_CMD_X JP HD_DOS_RET