diff --git a/Shared_Includes b/Shared_Includes index e7e58e7..5cb5d02 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit e7e58e7b816a25137a0a253321164e863bbe782e +Subproject commit 5cb5d02cf145ff2d6d14fca5a5f9a5fb2ec6a673 diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ index e6fc1d0..4bccc88 100644 --- a/TRDOS/TR_MSD_S.ASZ +++ b/TRDOS/TR_MSD_S.ASZ @@ -440,7 +440,8 @@ READ_BPB: ; LD BC,256*1 + TRDOS_ROM_CMD.READ CALL MSD_R_W_UT - CALL READ_BPB.PARAMS + ; + CALL .PARAMS RET NC JP .ERROR_MSDOS .MAIN: LD A,SYS_PAGE diff --git a/TRDOS/TR_RMD_S.ASZ b/TRDOS/TR_RMD_S.ASZ index 1cf7929..8597159 100644 --- a/TRDOS/TR_RMD_S.ASZ +++ b/TRDOS/TR_RMD_S.ASZ @@ -431,7 +431,7 @@ READ_ONLY: FDD_SET: LD A,(OPER_DISK) LD B,A - LD C,#CC ;!HARDCODE BIOS.FDD_TO_DRV + LD C,BIOS.FDD_TO_DRV ;!TEST 06/01/2024 сохраняем состояние прерываний зачем-то JP EXP_FNS ;CALL EXP_FNS @@ -466,7 +466,7 @@ RAMD_SET1: LD A,(OPER_DISK) LD B,A POP AF - LD C,#CB ;!HARDCODE BIOS.RAMD_TO_DRV + LD C,BIOS.RAMD_TO_DRV ;!TEST 06/01/2024 сохраняем состояние прерываний зачем-то JP EXP_FNS ;CALL EXP_FNS @@ -521,7 +521,7 @@ CHOOSE_HDD: CP #0D JR Z,.error ; номер раздела - INC DE + ;INC DE LD A,(DE) CP "4" JR NC,.error @@ -531,21 +531,21 @@ CHOOSE_HDD: RLA RLA LD C,A - ; master/slave + ; ; master/slave + ; DEC DE + ; LD A,(DE) + ; CP "2" + ; JR NC,.error + ; CP "0" + ; JR C,.error + ; SUB "0" + ; RLA + ; OR C + ; LD C,A + ; Primary/Secondary, master/slave DEC DE LD A,(DE) - CP "2" - JR NC,.error - CP "0" - JR C,.error - SUB "0" - RLA - OR C - LD C,A - ; Primary/Secondary - DEC DE - LD A,(DE) - CP "2" + CP "4" JR NC,.error CP "0" JR C,.error