This commit is contained in:
Anatoliy Belyanskiy 2024-02-13 00:18:33 +10:00
parent bb5d7f3253
commit f6e082dd16
6 changed files with 48 additions and 54 deletions

View File

@ -67,17 +67,14 @@ AUTO_C308 EQU #C308
AUTO_C916 EQU #C916 AUTO_C916 EQU #C916
AUTO_FE15 EQU #FE15 AUTO_FE15 EQU #FE15
AUTO_FF00 EQU #FF00 AUTO_FF00 EQU #FF00
AUTO_FFFF EQU #FFFF
;**************************************** ;****************************************
START: DI START: DI
LD DE,#FFFF LD DE,#FFFF
LD A,7 LD A,7
JR CONT_1 JR CONT_1
RST08: RST08: NOP
NOP CONT_1: OUT (#FE),A
CONT_1:
OUT (#FE),A
LD A,'?' LD A,'?'
JR CONT_2 JR CONT_2
@ -158,10 +155,7 @@ CONT_7:
PUSH HL PUSH HL
LD HL,#3D2F LD HL,#3D2F
PUSH HL PUSH HL
LD HL,#B8ED LD HL,#B8ED ;ª®¤ ª®¬ ­¤ë LDDR
////////////////////////////////////////////////////////////////////////
_mInfoBLOCK #64-$,0
AUTO_0064: AUTO_0064:
JR CONT_8 JR CONT_8
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -1579,7 +1573,7 @@ AUTO_12D9:
CALL AUTO_115D CALL AUTO_115D
POP HL POP HL
PUSH HL PUSH HL
LD BC,RST08 LD BC,8
ADD HL,BC ADD HL,BC
AUTO_1303: AUTO_1303:
LD A,(HL) LD A,(HL)
@ -2147,7 +2141,7 @@ AUTO_1775:
CALL AUTO_03FD CALL AUTO_03FD
LD HL,ZX_VARS.FL_NAME LD HL,ZX_VARS.FL_NAME
LD DE,ZX_VARS.DISK_NAME LD DE,ZX_VARS.DISK_NAME
LD BC,RST08 LD BC,8
LDIR LDIR
CALL AUTO_1E43 CALL AUTO_1E43
JP AUTO_03E1 JP AUTO_03E1
@ -2645,14 +2639,11 @@ CMD_SAVE:
LD HL,ZX_VARS.FL_TYPE LD HL,ZX_VARS.FL_TYPE
JR AUTO_1B1F JR AUTO_1B1F
AUTO_1AF8: AUTO_1AF8:
CP 170 CP ZX_Token.screen_dollar
JR NZ,AUTO_1B0D JR NZ,AUTO_1B0D
LD HL,AUTO_4000 LD HL,AUTO_4000 ;­ ç «® ä ©«  - #4000
DB 34 LD (#5CD7),HL
AUTO_1B00: LD HL,#1B00 ;¥£® ¤«¨­  - #1B00 ¡ ©â®¢
RST RST10
LD E,H
LD HL,AUTO_1B00
LD (ZX_VARS.DOS_CH_ADR),HL LD (ZX_VARS.DOS_CH_ADR),HL
LD (ZX_VARS.MED_LEN),HL LD (ZX_VARS.MED_LEN),HL
JR AUTO_1B48 JR AUTO_1B48
@ -3301,12 +3292,12 @@ AUTO_1F55:
LD (ZX_VARS.CODE_10H),A LD (ZX_VARS.CODE_10H),A
LD HL,ZX_VARS.DISK_MRK_1 LD HL,ZX_VARS.DISK_MRK_1
LD DE,ZX_VARS.DISK_ALT_NM LD DE,ZX_VARS.DISK_ALT_NM
LD BC,RST08 LD BC,8
LD (HL),' ' LD (HL),' '
LDIR LDIR
LD HL,ZX_VARS.FL_NAME LD HL,ZX_VARS.FL_NAME
LD DE,ZX_VARS.DISK_NAME LD DE,ZX_VARS.DISK_NAME
LD BC,RST08 LD BC,8
LDIR LDIR
CALL set_side_0 CALL set_side_0
LD B,1 LD B,1
@ -4775,7 +4766,7 @@ AUTO_2A2B: DZ " File(s)", 141
AUTO_2A35: AUTO_2A35:
LD HL,AUTO_2A41 LD HL,AUTO_2A41
LD DE,AUTO_4080 LD DE,AUTO_4080
LD BC,RST20 LD BC,20
LDIR LDIR
RET RET
; ;
@ -4783,7 +4774,7 @@ AUTO_2A35:
; ;
AUTO_2A41: AUTO_2A41:
LD A,(AUTO_03B5) LD A,(AUTO_03B5)
CP 243 CP #F3
LD A,16 LD A,16
JR Z,AUTO_2A4B JR Z,AUTO_2A4B
XOR A XOR A
@ -4836,7 +4827,7 @@ AUTO_2A56:
CALL AUTO_2D73 CALL AUTO_2D73
POP HL POP HL
PUSH HL PUSH HL
LD DE,RST08 LD DE,8
CALL AUTO_2F1B CALL AUTO_2F1B
LD HL,AUTO_40E3 LD HL,AUTO_40E3
LD A,(HL) LD A,(HL)
@ -4854,7 +4845,7 @@ AUTO_2A56:
SBC HL,DE SBC HL,DE
LD (AUTO_40E5),HL LD (AUTO_40E5),HL
LD HL,AUTO_4000 LD HL,AUTO_4000
LD DE,RST08 LD DE,8
CALL AUTO_2D73 CALL AUTO_2D73
POP HL POP HL
LD DE,(AUTO_40E1) LD DE,(AUTO_40E1)
@ -4864,11 +4855,11 @@ AUTO_2A56:
POP DE POP DE
CALL AUTO_2D4C CALL AUTO_2D4C
PUSH DE PUSH DE
LD A,3Ch LD A,#3C
OUT (FDC_93.DrvCTRL),A OUT (FDC_93.DrvCTRL),A
CALL AUTO_2F65 CALL AUTO_2F65
LD HL,AUTO_4000 LD HL,AUTO_4000
LD DE,RST08 LD DE,8
LD B,1 LD B,1
CALL AUTO_2F1B CALL AUTO_2F1B
POP DE POP DE
@ -4876,7 +4867,7 @@ AUTO_2A56:
LD (AUTO_40E1),DE LD (AUTO_40E1),DE
PUSH HL PUSH HL
LD HL,AUTO_4000 LD HL,AUTO_4000
LD DE,RST08 LD DE,8
LD B,1 LD B,1
CALL AUTO_2D73 CALL AUTO_2D73
LD A,(AUTO_40E4) LD A,(AUTO_40E4)
@ -5179,12 +5170,12 @@ AUTO_2D1E:
RET RET
AUTO_2D2A: AUTO_2D2A:
LD HL,AUTO_4000 LD HL,AUTO_4000
LD DE,RST08 LD DE,8
CALL AUTO_2F1B CALL AUTO_2F1B
RET RET
AUTO_2D34: AUTO_2D34:
LD HL,AUTO_4000 LD HL,AUTO_4000
LD DE,RST08 LD DE,8
CALL AUTO_2D73 CALL AUTO_2D73
RET RET
AUTO_2D3E: AUTO_2D3E:
@ -5192,14 +5183,14 @@ AUTO_2D3E:
LD C,D LD C,D
CALL AUTO_2F3A CALL AUTO_2F3A
LD HL,AUTO_C000 LD HL,AUTO_C000
LD B,'@' LD B,#40
JR AUTO_2D58 JR AUTO_2D58
AUTO_2D4C: AUTO_2D4C:
CALL AUTO_2F65 CALL AUTO_2F65
LD C,D LD C,D
CALL AUTO_2F3A CALL AUTO_2F3A
LD HL,AUTO_4000 LD HL,AUTO_4000
LD B,192 LD B,#C0
AUTO_2D58: AUTO_2D58:
PUSH BC PUSH BC
PUSH DE PUSH DE
@ -6451,8 +6442,8 @@ NEW_NAME:
;***************************** ;*****************************
;FORMATER: ;FORMATER:
; LD DE,(ZX_VARS.E_LINE)
; LD HL,TX_FORMAT ; LD HL,TX_FORMAT
; LD DE,(ZX_VARS.E_LINE)
; LD BC,LEN_TX_F ; LD BC,LEN_TX_F
; LDIR ; LDIR
; EX DE,HL ; EX DE,HL
@ -7081,8 +7072,7 @@ AUTO_3FEC:
_mInfoBLOCK #3FF0-$, #FF _mInfoBLOCK #3FF0-$, #FF
HD_CMD: PUSH AF HD_CMD: PUSH AF
DI DI
;LD A,SYS_PORT.EXTENSION LD A,SYS_PORT.EXTENSION
LD A,1
OUT (SYS_PORT.ROM),A OUT (SYS_PORT.ROM),A
POP AF POP AF
RET RET

@ -1 +1 @@
Subproject commit f74ae7e760de5541ee4966d509442c6421225c3b Subproject commit 68bdeebdecb62a68058d57f255ab646a4eb50512

View File

@ -41,7 +41,7 @@ MSDOS_TEST_FL:
AND A AND A
SCF SCF
RET Z ; ŠŽ<C5A0> Š€’€‹Žƒ€ RET Z ; ŠŽ<C5A0> Š€’€‹Žƒ€
CP 0E5H CP #E5
SCF SCF
CCF CCF
; DEC A ; <E28099>‰ ”€‰‹ ; DEC A ; <E28099>‰ ”€‰‹
@ -50,7 +50,7 @@ MSDOS_TEST_FL:
;********************************** ;**********************************
MSDOS_NEXT_FL: MSDOS_NEXT_FL:
PUSH DE PUSH DE
LD DE,20H LD DE," "
ADD HL,DE ADD HL,DE
DI DI
IN A,(SLOT3) IN A,(SLOT3)

View File

@ -129,7 +129,6 @@ PREPARE1:
EI EI
CALL Z,RES_1440 CALL Z,RES_1440
CALL NZ,SET_1440 CALL NZ,SET_1440
CALL CALC_SECTOR CALL CALC_SECTOR
LD (ZX_VARS.CONT_SEC),DE LD (ZX_VARS.CONT_SEC),DE
LD A,(ZX_VARS.RD_WR_COM) LD A,(ZX_VARS.RD_WR_COM)
@ -346,9 +345,13 @@ SWITCH_DT:
LD A,C LD A,C
OUT (SLOT2),A OUT (SLOT2),A
EI EI
CALL Z,RES_1440 ;!TEST
CALL NZ,SET_1440 ;CALL Z,RES_1440
RET ;CALL NZ,SET_1440
;RET
JR Z,RES_1440
JR SET_1440
;
NO_SW_DT: NO_SW_DT:
LD A,C LD A,C
OUT (SLOT2),A OUT (SLOT2),A
@ -362,7 +365,7 @@ MSD_3FBA:
LD B,4 LD B,4
MSD_3FBC: MSD_3FBC:
IN A,(FDC_93.DrvCTRL) IN A,(FDC_93.DrvCTRL)
AND 192 AND #C0
JR NZ,MSD_3FD1 JR NZ,MSD_3FD1
INC DE INC DE
LD A,E LD A,E
@ -373,7 +376,7 @@ MSD_RET_IX:
JP (IX) JP (IX)
MSD_3FCA: MSD_3FCA:
IN A,(FDC_93.DrvCTRL) IN A,(FDC_93.DrvCTRL)
AND 192 AND #C0
JR Z,MSD_3FCA JR Z,MSD_3FCA
JP M,MSD_RET_IX JP M,MSD_RET_IX
MSD_3FD1: MSD_3FD1:
@ -386,7 +389,7 @@ MSD_3FD5:
LD B,4 LD B,4
MSD_3FD7: MSD_3FD7:
IN A,(FDC_93.DrvCTRL) IN A,(FDC_93.DrvCTRL)
AND 192 AND #C0
JR NZ,MSD_3FEC JR NZ,MSD_3FEC
INC DE INC DE
LD A,E LD A,E
@ -397,7 +400,7 @@ MSD_RET_IX2:
JP (IX) JP (IX)
MSD_3FE5: MSD_3FE5:
IN A,(FDC_93.DrvCTRL) IN A,(FDC_93.DrvCTRL)
AND 192 AND #C0
JR Z,MSD_3FE5 JR Z,MSD_3FE5
JP M,MSD_RET_IX2 JP M,MSD_RET_IX2
MSD_3FEC: MSD_3FEC:
@ -408,13 +411,13 @@ MSD_3FEC:
;**************************************** ;****************************************
RES_1440: RES_1440:
LD A,01h LD A,FDD_Density.SET_720
OUT (0BDh),A OUT (FDD_Density),A
RET RET
SET_1440: SET_1440:
LD A,21h LD A,FDD_Density.SET_1440
OUT (0BDh),A OUT (FDD_Density),A
RET RET
READ_BPB: READ_BPB:

View File

@ -396,8 +396,11 @@ RD_WR_1SEC:
LD DE,(ZX_VARS.CONT_SEC) LD DE,(ZX_VARS.CONT_SEC)
CALL PAGE_CALC2 CALL PAGE_CALC2
DI DI
LD A,(ZX_VARS.RD_WR_COM) ;!TEST
AND #C0 ;LD A,(ZX_VARS.RD_WR_COM)
;AND #C0
LD A,#C0
;
OUT (RGADR),A OUT (RGADR),A
LD A,H LD A,H
CP #A0 CP #A0
@ -434,6 +437,7 @@ RD_WR_1SEC:
OUT (RGADR),A OUT (RGADR),A
EI EI
RET RET
;
.RD_WR_C000: .RD_WR_C000:
SET 7,D SET 7,D
LD C,SLOT3 LD C,SLOT3

View File

@ -46,7 +46,6 @@ HD_CMD_X: ; C - COMAND ( 5 - RD, 6 - WR )
RET RET
HD_BPB_PREP: HD_BPB_PREP:
LD D,A LD D,A
IN A,(SLOT3) IN A,(SLOT3)
EX AF,AF' EX AF,AF'
@ -395,9 +394,7 @@ TEST_HDD_DRV:
RET RET
HD_CMD_0: HD_CMD_0:
POP AF POP AF
LD BC,IDE.Write.DeviceHead LD BC,IDE.Write.DeviceHead
LD A,0A0H LD A,0A0H
OUT (C),A OUT (C),A