diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM index d18c351..8f2b97c 100644 --- a/SP_TRDOS.ASM +++ b/SP_TRDOS.ASM @@ -174,7 +174,7 @@ RET_1: INC HL LD (ZX_VARS.UDG),HL DEC HL - LD BC,AUTO_0540 + LD BC,AUTO_0540 ;!FIXIT check disasm LD (ZX_VARS.ERR_BEEP),BC LD (ZX_VARS.TOP_CLEAR),HL LD HL,#3C00 @@ -193,8 +193,8 @@ RET_1: LD HL,ZX_VARS.BEG_ADRESS AUTO_00A8: LD (ZX_VARS.CHANS),HL - LD DE,AUTO_15AF - LD BC,15h + LD DE,#15AF ;!HARDCODE адрес области описателей каналов в ПЗУ бейсика + LD BC,#15 EX DE,HL CALL AUTO_0117 EX DE,HL @@ -206,9 +206,7 @@ AUTO_00A8: LD (HL),128 INC HL LD (ZX_VARS.E_LINE),HL - DB 54 -AUTO_00C8: - DEC C + LD (HL),"\r" INC HL LD (HL),128 INC HL @@ -223,7 +221,7 @@ AUTO_00C8: LD (ZX_VARS.KEY_TIME),HL DEC (IY-58) DEC (IY-54) - LD HL,015C6h + LD HL,#15C6 LD DE,ZX_VARS.REP_K_TYME LD BC,14 CALL AUTO_0117 @@ -413,7 +411,7 @@ AUTO_0239: ; CP 244 JR Z,AUTO_0271 LD HL,AUTO_1000 -AUTO_0270: +;AUTO_0270: RST PRINT_LN AUTO_0271: LD A,(ZX_VARS.PRINTER_BUFFER) @@ -439,7 +437,7 @@ AUTO_0280: INC HL LD (HL),'"' INC HL -CMD_NEW_EXEC: +CMD_NEW_EXEC:;!TODO LD (ZX_VARS.K_CUR),HL LD (HL),13 INC HL @@ -562,6 +560,8 @@ AUTO_0359: ; DB " ",0,0 ;----------------------------------------------------------------------- + + AUTO_03AC: CALL AUTO_03FD CALL PRINT_CR @@ -571,7 +571,7 @@ AUTO_03B5: CALL AUTO_1DA9 LD HL,AUTO_29D2 RST PRINT_LN -AUTO_03C0: +;AUTO_03C0: JP AUTO_01D3 AUTO_03C3: PUSH AF @@ -768,6 +768,7 @@ AUTO_0507: LD DE,RST10 ADD HL,DE RET + AUTO_050C: PUSH HL PUSH BC @@ -777,6 +778,7 @@ AUTO_050C: POP BC POP HL RET + AUTO_0517: LD HL,ZX_VARS.CAT_SEC INC (HL) @@ -1019,7 +1021,7 @@ AUTO_06F3: CALL SET_DISK CALL AUTO_05B4 JP NZ,AUTO_03E1 -AUTO_0716: +;AUTO_0716: CALL AUTO_165D LD HL,ZX_VARS.FL_START LD DE,ZX_VARS.VAR_2 @@ -1251,7 +1253,7 @@ AUTO_1052: PUSH DE AUTO_1056: RST_ROM ROUTINE.key_scan -AUTO_1059: +;AUTO_1059: LD C,0 JR NZ,AUTO_1056 RST_ROM ROUTINE.key_test @@ -1570,7 +1572,7 @@ AUTO_12D9: PUSH HL LD BC,8 ADD HL,BC -AUTO_1303: +;AUTO_1303: LD A,(HL) CP 'B' CALL Z,AUTO_131B @@ -1887,7 +1889,6 @@ AUTO_1575: LD DE,CONT_1 LD (ZX_VARS.CONT_SEC),DE CALL AUTO_1E43 -AUTO_15AF: JP AUTO_03E1 AUTO_15B2: LD HL,(ZX_VARS.FL_TYPE) @@ -2465,7 +2466,7 @@ CMD_MERGE: PUSH BC INC BC RST_ROM ROUTINE.bc_spaces -AUTO_19D1: +;AUTO_19D1: LD (HL),128 EX DE,HL POP DE @@ -2955,6 +2956,7 @@ AUTO_1D25: ERR_EXIT: CALL AUTO_03C3 JP AUTO_01D3 + AUTO_1D2F: LD A,(ZX_VARS.ERR_NR) LD HL,AUTO_27CA @@ -3014,8 +3016,10 @@ OPEN_CH2: JR AUTO_1D84 AUTO_1D8C: RST_ROM ROUTINE.get_char -AUTO_1D8F: +;AUTO_1D8F: RET + +GET_CMD: CALL OPEN_CH0 RST_ROM ROUTINE.editor RET @@ -3363,11 +3367,7 @@ AUTO_2000: ; OUT (FDC_93.Command),A ; LD HL,(ZX_VARS.FL_START) ; LD C,127 - - -;//////////////////////////////////// - -AUTO_2007: +;AUTO_2007: LD B,3Eh ; первый пробел LD D,'N' CALL AUTO_20B1 @@ -3523,7 +3523,7 @@ AUTO_2113: LD C,(HL) LD A,(DE) LD (HL),A -AUTO_2116: +;AUTO_2116: LD A,C LD (DE),A INC HL @@ -3563,7 +3563,7 @@ INPUT_LINE: RST RST10 LD (IY+0),255 EI - JP EDIT_X00 + JP EDIT_X00 ;!FIXIT зачем вместо #1D90 EDIT_X00??? AUTO_2158: CALL BASIC_RST20 CALL AUTO_1D8C @@ -4780,7 +4780,7 @@ AUTO_2A4B: OUT (C),A RET MAGIC_2: -AUTO_2A56: +;AUTO_2A56: PUSH AF PUSH BC PUSH DE @@ -6299,7 +6299,7 @@ EDIT_RET: LD (HL),80H RET -EDIT_X00: +EDIT_X00: ;!FIXIT зачем вместо #1D90 EDIT_X00??? RES 5,(IY+1) RST RST20 ; ввод клавиши DW 15D4h diff --git a/TRDOS/TR_MSD_2.ASZ b/TRDOS/TR_MSD_2.ASZ index 9f5dbc3..c7474c8 100644 --- a/TRDOS/TR_MSD_2.ASZ +++ b/TRDOS/TR_MSD_2.ASZ @@ -14,7 +14,7 @@ MSDOS_FIND_FILE: FIND_LOOP_ALL: CALL MSDOS_KOMP_FL RET Z ; ВОЗВРАТ - ФАЙЛ НАЙДЕН !! -MSDOS_FIND_NEXT: +;MSDOS_FIND_NEXT: CALL MSDOS_NEXT_FL JR NC,FIND_LOOP_ALL RET @@ -283,7 +283,7 @@ LOOP_FIND: INC HL DJNZ LOOP_FIND LD A,(DE) - CP 13 + CP "\r" JR Z,CMD_EXE1 CP ' ' JR Z,CMD_EXE @@ -353,7 +353,7 @@ END_TAB3: JP LOAD_RMD_XX MSD_ERR: - LD HL,MSDOS_MSG + LD HL,MSDOS_MSG ; File not found... JP AUTO_03E4 ;************************************ @@ -391,7 +391,7 @@ SAVE_RMD: JP C,MSD_ERR ; A - номер первого блока JP Z,MSD_ERR - LD HL,0C000H + LD HL,#C000 CALL MSDOS_WRITE_FILE JP AUTO_03E1 @@ -573,11 +573,14 @@ CALC_CL_LP: POP BC RET -HD_TX: DC ' ERR_HD ' -HD_TX2: DC 'HDD not found ' -MSG_3: DC 'ERROR... ' -MSDOS_MSG: DC 'File not found... ' -NO_MEMORY: DC 'No RAM-Disk MEM ' + +HD_TX: DC ' - HDD error' +;HD_TX: DC 'HDD error #' +HD_TX2: DC 'HDD not found' +MSG_3: DC '*ERROR*' +MSDOS_MSG: DC 'File not found' +NO_MEMORY: DC 'Out of memory' +;NO_MEMORY: DC 'No RAM-Disk MEM' WORDS: DB 5,'CLEAR' ; очистить RAM-Disk DW CLEAR_RAMD_X diff --git a/TRDOS/TR_MSD_3.ASZ b/TRDOS/TR_MSD_3.ASZ index bb2e306..4e676f6 100644 --- a/TRDOS/TR_MSD_3.ASZ +++ b/TRDOS/TR_MSD_3.ASZ @@ -276,14 +276,15 @@ SKEEP_XX1: POP IX RET ;***************************************** -MADE_next_blk: - PUSH BC - LD C,BIOS.GetMemPageNext - CALL EXP_FNS - POP BC - INC L ; SET ZF, if END BLK !!! - LD HL,#C000 - RET +;!TODO посмотреть +; MADE_next_blk: +; PUSH BC +; LD C,BIOS.GetMemPageNext +; CALL EXP_FNS +; POP BC +; INC L ; SET ZF, if END BLK !!! +; LD HL,#C000 +; RET ;***************************************** CLAST_TO_SEC: @@ -431,7 +432,7 @@ FAT_HALF: FAT_16_L2: CP B JR NZ,NO_END_CLAST -FAT_ALL: +;FAT_ALL: LD A,C CP #F0 JR C,NO_END_CLAST @@ -469,8 +470,9 @@ NO_END_CLAST: AND A RET -ERROR_FAT: - LD HL,MSG_3 ; ERROR +ERROR_MSG: + LD HL,MSG_3 ; ERROR msg + ;LD HL,AUTO_29B2 ; ERROR msg JP AUTO_03E4 ;********************************************** diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ index c51e05b..5901d72 100644 --- a/TRDOS/TR_MSD_S.ASZ +++ b/TRDOS/TR_MSD_S.ASZ @@ -273,8 +273,7 @@ MSD_RET_ADR: LD B,A AND 127 RET Z - -MSD_3F39: +;MSD_3F39: LD HL,READ_ONLY_MSG AND '@' JR NZ,MSD_3F4B @@ -434,13 +433,13 @@ READ_BPB: CP #40 JR NC,.HDD CP 4 - JP NC,.ERROR_MSDOS + JP NC,ERROR_MSG ; CALL SET_DISK ; CALL .MAIN RET NC - JP .ERROR_MSDOS + JP ERROR_MSG ; .HDD: CALL .MAIN RET NC @@ -455,7 +454,7 @@ READ_BPB: ; CALL .PARAMS RET NC - JP .ERROR_MSDOS + JP ERROR_MSG ; .MAIN: LD A,SYS_PAGE LD HL,SYS_PAGE.MS_BPB @@ -633,9 +632,9 @@ READ_BPB: EI RET ; -.ERROR_MSDOS: - LD HL,MSG_3 - JP AUTO_03E4 +; .ERROR_MSDOS: +; LD HL,MSG_3 +; JP AUTO_03E4 ; .FAT1_MSG: DB 'FAT1' @@ -758,13 +757,13 @@ PRINT_HEX_SYM: PUSH HL PUSH DE PUSH BC - AND 0FH + AND #0F ADD A,'0' CP '9'+1 JR C,NO_ADD ADD A,7 NO_ADD: - RST 10H + RST #10 POP BC POP DE POP HL diff --git a/TRDOS/TR_RMD_S.ASZ b/TRDOS/TR_RMD_S.ASZ index 73ea1d2..9f39e1f 100644 --- a/TRDOS/TR_RMD_S.ASZ +++ b/TRDOS/TR_RMD_S.ASZ @@ -38,15 +38,15 @@ RECALL_RAMD: JR Z,ERROR_DISK JP READ_WRITE_RAMD -RECALL_MSD: - JR ERROR_DISK ; переход на ошибку диска +; RECALL_MSD: +; JR ERROR_DISK ; переход на ошибку диска TEST_RAMD: PUSH HL LD C,BIOS.GET_RAMD_ST CALL EXP_FNS ;!TEST 06/01/2024 сохраняем состояние прерываний зачем-то - ;EI + EI ; POP HL RET @@ -60,7 +60,7 @@ RAMD_X12: ; CP 20 RET C ; JR C,RAMD_TEST -NO_DISK2: +;NO_DISK2: JP AUTO_3EE7 ; NO_DISK X_AUTO_3DCE: @@ -145,7 +145,7 @@ CLEAR_RAMD_X: RET NZ CLEAR_RAMD: CALL DISK_REDIR -CLEAR_NEXT: +;CLEAR_NEXT: SUB 4 RET C CP SYS_PAGE.RAMD_KEYS.NUM @@ -176,7 +176,7 @@ GET_RAM_BLK: ;EI ; RET NC -NO_MEM: +;NO_MEM: LD HL,NO_MEMORY JP ERR_EXIT @@ -198,7 +198,8 @@ FDD_SET: RAMD_SET: CALL RAMD_SYM - RET C + ;RET C + JP C,ERROR_MSG RAMD_SET1: PUSH AF LD A,(ZX_VARS.OPER_DISK) @@ -221,7 +222,7 @@ RAMD_SYM: CP 'E' RET C SUB 'E' - CP 16 + CP SYS_PAGE.RAMD_KEYS.NUM CCF RET C PUSH AF