diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM index 735d468..68810b3 100644 --- a/SP_TRDOS.ASM +++ b/SP_TRDOS.ASM @@ -67,17 +67,14 @@ AUTO_C308 EQU #C308 AUTO_C916 EQU #C916 AUTO_FE15 EQU #FE15 AUTO_FF00 EQU #FF00 -AUTO_FFFF EQU #FFFF ;**************************************** START: DI LD DE,#FFFF LD A,7 JR CONT_1 -RST08: - NOP -CONT_1: - OUT (#FE),A +RST08: NOP +CONT_1: OUT (#FE),A LD A,'?' JR CONT_2 @@ -158,10 +155,7 @@ CONT_7: PUSH HL LD HL,#3D2F PUSH HL - LD HL,#B8ED - -//////////////////////////////////////////////////////////////////////// - _mInfoBLOCK #64-$,0 + LD HL,#B8ED ;код команды LDDR AUTO_0064: JR CONT_8 //////////////////////////////////////////////////////////////////////// @@ -1579,7 +1573,7 @@ AUTO_12D9: CALL AUTO_115D POP HL PUSH HL - LD BC,RST08 + LD BC,8 ADD HL,BC AUTO_1303: LD A,(HL) @@ -2147,7 +2141,7 @@ AUTO_1775: CALL AUTO_03FD LD HL,ZX_VARS.FL_NAME LD DE,ZX_VARS.DISK_NAME - LD BC,RST08 + LD BC,8 LDIR CALL AUTO_1E43 JP AUTO_03E1 @@ -2645,14 +2639,11 @@ CMD_SAVE: LD HL,ZX_VARS.FL_TYPE JR AUTO_1B1F AUTO_1AF8: - CP 170 + CP ZX_Token.screen_dollar JR NZ,AUTO_1B0D - LD HL,AUTO_4000 - DB 34 -AUTO_1B00: - RST RST10 - LD E,H - LD HL,AUTO_1B00 + LD HL,AUTO_4000 ;начало файла - #4000 + LD (#5CD7),HL + LD HL,#1B00 ;его длина - #1B00 байтов LD (ZX_VARS.DOS_CH_ADR),HL LD (ZX_VARS.MED_LEN),HL JR AUTO_1B48 @@ -3301,12 +3292,12 @@ AUTO_1F55: LD (ZX_VARS.CODE_10H),A LD HL,ZX_VARS.DISK_MRK_1 LD DE,ZX_VARS.DISK_ALT_NM - LD BC,RST08 + LD BC,8 LD (HL),' ' LDIR LD HL,ZX_VARS.FL_NAME LD DE,ZX_VARS.DISK_NAME - LD BC,RST08 + LD BC,8 LDIR CALL set_side_0 LD B,1 @@ -4775,7 +4766,7 @@ AUTO_2A2B: DZ " File(s)", 141 AUTO_2A35: LD HL,AUTO_2A41 LD DE,AUTO_4080 - LD BC,RST20 + LD BC,20 LDIR RET ; @@ -4783,7 +4774,7 @@ AUTO_2A35: ; AUTO_2A41: LD A,(AUTO_03B5) - CP 243 + CP #F3 LD A,16 JR Z,AUTO_2A4B XOR A @@ -4836,7 +4827,7 @@ AUTO_2A56: CALL AUTO_2D73 POP HL PUSH HL - LD DE,RST08 + LD DE,8 CALL AUTO_2F1B LD HL,AUTO_40E3 LD A,(HL) @@ -4854,7 +4845,7 @@ AUTO_2A56: SBC HL,DE LD (AUTO_40E5),HL LD HL,AUTO_4000 - LD DE,RST08 + LD DE,8 CALL AUTO_2D73 POP HL LD DE,(AUTO_40E1) @@ -4864,11 +4855,11 @@ AUTO_2A56: POP DE CALL AUTO_2D4C PUSH DE - LD A,3Ch + LD A,#3C OUT (FDC_93.DrvCTRL),A CALL AUTO_2F65 LD HL,AUTO_4000 - LD DE,RST08 + LD DE,8 LD B,1 CALL AUTO_2F1B POP DE @@ -4876,7 +4867,7 @@ AUTO_2A56: LD (AUTO_40E1),DE PUSH HL LD HL,AUTO_4000 - LD DE,RST08 + LD DE,8 LD B,1 CALL AUTO_2D73 LD A,(AUTO_40E4) @@ -5179,12 +5170,12 @@ AUTO_2D1E: RET AUTO_2D2A: LD HL,AUTO_4000 - LD DE,RST08 + LD DE,8 CALL AUTO_2F1B RET AUTO_2D34: LD HL,AUTO_4000 - LD DE,RST08 + LD DE,8 CALL AUTO_2D73 RET AUTO_2D3E: @@ -5192,14 +5183,14 @@ AUTO_2D3E: LD C,D CALL AUTO_2F3A LD HL,AUTO_C000 - LD B,'@' + LD B,#40 JR AUTO_2D58 AUTO_2D4C: CALL AUTO_2F65 LD C,D CALL AUTO_2F3A LD HL,AUTO_4000 - LD B,192 + LD B,#C0 AUTO_2D58: PUSH BC PUSH DE @@ -6451,8 +6442,8 @@ NEW_NAME: ;***************************** ;FORMATER: -; LD DE,(ZX_VARS.E_LINE) ; LD HL,TX_FORMAT +; LD DE,(ZX_VARS.E_LINE) ; LD BC,LEN_TX_F ; LDIR ; EX DE,HL @@ -7081,8 +7072,7 @@ AUTO_3FEC: _mInfoBLOCK #3FF0-$, #FF HD_CMD: PUSH AF DI - ;LD A,SYS_PORT.EXTENSION - LD A,1 + LD A,SYS_PORT.EXTENSION OUT (SYS_PORT.ROM),A POP AF RET diff --git a/Shared_Includes b/Shared_Includes index f74ae7e..68bdeeb 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit f74ae7e760de5541ee4966d509442c6421225c3b +Subproject commit 68bdeebdecb62a68058d57f255ab646a4eb50512 diff --git a/TRDOS/TR_MSD_2.ASZ b/TRDOS/TR_MSD_2.ASZ index b6278be..6800937 100644 --- a/TRDOS/TR_MSD_2.ASZ +++ b/TRDOS/TR_MSD_2.ASZ @@ -41,7 +41,7 @@ MSDOS_TEST_FL: AND A SCF RET Z ; КОНЕЦ КАТАЛОГА - CP 0E5H + CP #E5 SCF CCF ; DEC A ; СТЕРТЫЙ ФАЙЛ @@ -50,7 +50,7 @@ MSDOS_TEST_FL: ;********************************** MSDOS_NEXT_FL: PUSH DE - LD DE,20H + LD DE," " ADD HL,DE DI IN A,(SLOT3) diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ index c17e924..84e70e4 100644 --- a/TRDOS/TR_MSD_S.ASZ +++ b/TRDOS/TR_MSD_S.ASZ @@ -129,7 +129,6 @@ PREPARE1: EI CALL Z,RES_1440 CALL NZ,SET_1440 - CALL CALC_SECTOR LD (ZX_VARS.CONT_SEC),DE LD A,(ZX_VARS.RD_WR_COM) @@ -346,9 +345,13 @@ SWITCH_DT: LD A,C OUT (SLOT2),A EI - CALL Z,RES_1440 - CALL NZ,SET_1440 - RET + ;!TEST + ;CALL Z,RES_1440 + ;CALL NZ,SET_1440 + ;RET + JR Z,RES_1440 + JR SET_1440 + ; NO_SW_DT: LD A,C OUT (SLOT2),A @@ -362,7 +365,7 @@ MSD_3FBA: LD B,4 MSD_3FBC: IN A,(FDC_93.DrvCTRL) - AND 192 + AND #C0 JR NZ,MSD_3FD1 INC DE LD A,E @@ -373,7 +376,7 @@ MSD_RET_IX: JP (IX) MSD_3FCA: IN A,(FDC_93.DrvCTRL) - AND 192 + AND #C0 JR Z,MSD_3FCA JP M,MSD_RET_IX MSD_3FD1: @@ -386,7 +389,7 @@ MSD_3FD5: LD B,4 MSD_3FD7: IN A,(FDC_93.DrvCTRL) - AND 192 + AND #C0 JR NZ,MSD_3FEC INC DE LD A,E @@ -397,7 +400,7 @@ MSD_RET_IX2: JP (IX) MSD_3FE5: IN A,(FDC_93.DrvCTRL) - AND 192 + AND #C0 JR Z,MSD_3FE5 JP M,MSD_RET_IX2 MSD_3FEC: @@ -408,13 +411,13 @@ MSD_3FEC: ;**************************************** RES_1440: - LD A,01h - OUT (0BDh),A + LD A,FDD_Density.SET_720 + OUT (FDD_Density),A RET SET_1440: - LD A,21h - OUT (0BDh),A + LD A,FDD_Density.SET_1440 + OUT (FDD_Density),A RET READ_BPB: diff --git a/TRDOS/TR_RMD_S.ASZ b/TRDOS/TR_RMD_S.ASZ index 6a90741..567e1ab 100644 --- a/TRDOS/TR_RMD_S.ASZ +++ b/TRDOS/TR_RMD_S.ASZ @@ -396,8 +396,11 @@ RD_WR_1SEC: LD DE,(ZX_VARS.CONT_SEC) CALL PAGE_CALC2 DI - LD A,(ZX_VARS.RD_WR_COM) - AND #C0 + ;!TEST + ;LD A,(ZX_VARS.RD_WR_COM) + ;AND #C0 + LD A,#C0 + ; OUT (RGADR),A LD A,H CP #A0 @@ -434,6 +437,7 @@ RD_WR_1SEC: OUT (RGADR),A EI RET + ; .RD_WR_C000: SET 7,D LD C,SLOT3 diff --git a/ZX_EXP/EXP_HDD.ASM b/ZX_EXP/EXP_HDD.ASM index 98d15c0..eb89e41 100644 --- a/ZX_EXP/EXP_HDD.ASM +++ b/ZX_EXP/EXP_HDD.ASM @@ -46,7 +46,6 @@ HD_CMD_X: ; C - COMAND ( 5 - RD, 6 - WR ) RET HD_BPB_PREP: - LD D,A IN A,(SLOT3) EX AF,AF' @@ -395,9 +394,7 @@ TEST_HDD_DRV: RET HD_CMD_0: - POP AF - LD BC,IDE.Write.DeviceHead LD A,0A0H OUT (C),A