bug

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

Shared_Includes

@@ -1 +1 @@
-Subproject commit c135d9b6038fcabca6cef3234d876f93d5865dee
+Subproject commit d1ce63928bdbb44e48b311f9d4a0005c2f44fcd4

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
 

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 IX,0
-	LD DE,0
+	;LD DE,0
 	LD A,SYS_PAGE
 	LD HL,MS_BPB
-	LD C,4
+	LD C,BIOS.HDD_READ_BPB and #BF
-	LD B,1
+	;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
 

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
 

ZX_EXP/EXP_HDD.ASM

@@ -17,8 +17,7 @@ HD_EXP_EXE:
 	CALL HD_CMD_X
 	JP HD_EXP_RET
 
-HD_CMD:
+HD_CMD:	POP AF
-	POP AF
 	CALL HD_CMD_X
 	JP HD_DOS_RET