fixed fdd a/b bug

Shared_Includes

@@ -1 +1 @@
-Subproject commit daae799b0dfc833d6bbbb8910910790f834996a3
+Subproject commit cb54ddb2079648878b113592fe33e370741b0471

src/bios/exp/EXTENDED/FDD_DRIVER.asm

@@ -22,8 +22,8 @@
 ;	    D0   - FDD drv number
 ;	A - D0   - "1" - Removable media
 ;[]===========================================================[]
-;!FIXIT ¢á¥£¤  ¨¤¥â à ¡®â  á ¤ ­­ë¬¨ ¤«ï ¤¨áª  €
-;!FIXIT ç¨â âì ¤ ­­ë¥ á ­ã«¥¢®© ¤®à®¦ª¨? <20>ਤ㬠âì çâ® ¤¥« âì á £¥®¬¥âਥ© ä«®¯ à¥©
+;[x] ¢á¥£¤  è«  à ¡®â  á ¤ ­­ë¬¨ ¤«ï ¤¨áª  €
+;[x] ç¨â âì ¤ ­­ë¥ á ­ã«¥¢®© ¤®à®¦ª¨? <20>ਤ㬠âì çâ® ¤¥« âì á £¥®¬¥âਥ© ä«®¯ à¥©
 FDD_5x_GET_PAR:	CALL	SELECT_FDD
 		RET	C
 		;
@@ -758,7 +758,7 @@ P50ms:		PUSH	BC
 ; 		;
 ;EXECOM:	OUT	(FDC_93.Command),A
 ; 		LD	HL,#0000	; áçñâ稪
-;.WREST:		DEC	HL
+;.WREST:	DEC	HL
 ; 		LD	A,H
 ; 		OR	L
 ; 		SCF 
@@ -770,23 +770,21 @@ P50ms:		PUSH	BC
 ; 		RET 
 ;
 RESWG:		LD	A,8	;!HARDCODE CMD Š<>1818‚ƒ93
-		;
 EXECOM:		OUT	(FDC_93.Command),A
 		LD	HL,#0000	; áçñâ稪
 		PUSH	BC
-		LD	B,3		; áçñâ稪
+		LD	BC,#0380	; áçñâ稪 ¨ ¬ áª 
 .WREST:		DEC	HL
 		LD	A,H
 		OR	L
 		JR	NZ,.get_state
 		DJNZ	.WREST
-		;
 		POP	BC
 		SCF
 		RET
 		;
 .get_state:	IN	A,(FDC_93.DrvCTRL)
-		AND	#80
+		AND	C
 		JR	Z,.WREST
 		POP	BC
 		RET

src/bios/exp/FUNC_SYS.ASM

@@ -344,16 +344,16 @@ FN_TURBO:
 
 ;!FIXIT ¬¥­ï¥¬ ¯«®â­®áâì - ¬¥­ï¥¬ ¢ á¨á⥬­®© áâà ­¨æ¥ ¨­äã ®¡ í⮬
 .SET_FDD_720:
-	LD A,FDD_Density.SET_720
+	LD	A,FDD_Density.SET_720
 	JR	.set
 	; OUT (FDD_Density),A
 	; AND A
 	; RET
 ;!FIXIT ¬¥­ï¥¬ ¯«®â­®áâì - ¬¥­ï¥¬ ¢ á¨á⥬­®© áâà ­¨æ¥ ¨­äã ®¡ í⮬
 .SET_FDD_1440:
-	LD A,FDD_Density.SET_1440
-.set:	OUT (FDD_Density),A
-	AND A
+	LD	A,FDD_Density.SET_1440
+.set:	OUT	(FDD_Density),A
+	AND	A
 	RET
 
 .TURBO_SWITCH:

src/bios/rom/SETUP/MAIN.asm

@@ -1193,8 +1193,8 @@ MOVE1:		LD	HL,#8000					; !HARDCODE
 .length		EQU	$-MOVE1
 
 
-SYSID:	DZ	"Starting..."
-.length	EQU	$-SYSID
+SYSID:		DZ	"Starting..."
+.length		EQU	$-SYSID
 
 
 ;FD144A:	DB	#80,#12,#02,#50,#00,#00,#02,FDD_INIT_TABLE.FDD
@@ -1214,7 +1214,7 @@ FDD_INIT_TABLE_35:	FDD_TABLE_s	{
 					}
 ;
 FDD_INIT_TABLE_525:	FDD_TABLE_s	{
-					 #01	;.DISK
+					 #00	;.DISK
 					 #09	;.SECTORS
 					 #02	;.HEADS
 					 #50	;.CYLINDL
@@ -1248,6 +1248,9 @@ FDD_INSTAL:	IN	A,(SLOT3)
 		LD	DE,SYS_PAGE.FDD_TABLE.B
 		LD	BC,SYS_PAGE.FDD_TABLE.B.Size
 		LDIR 
+		LD	A,(SYS_PAGE.FDD_TABLE.B + FDD_TABLE_s.DISK)
+		OR	1
+		LD	(SYS_PAGE.FDD_TABLE.B + FDD_TABLE_s.DISK),A
 .NOFDD1:	EX	AF,AF'
 		OUT	(SLOT3),A
 		RET
@@ -1261,60 +1264,17 @@ FDD_INSTAL:	IN	A,(SLOT3)
 		LD	HL,FDD_INIT_TABLE_525
 		DEC	A
 		RET
-/*
-		LD	BC,CMOS_CELL.DrivesSetup_1.Mask.FirstFDD	;#0311
-		CALL	GET_CMOS_VALUE
-		LD	HL,FDD_INIT_TABLE_525
+
+
+PIDNUM:		LD	HL,memBUFFER.ID
+		LD	BC,#00FF
+		XOR	A
+		CPIR
+		LD	A,(HL)
 		OR	A
-		JR	Z,.SETFD0
-		;
-		LD	HL,FDD_INIT_TABLE_35
-		DEC	A
-		JR	NZ,.NOFDD0
-		;
-.SETFD0:	;
-		;IN	A,(SLOT3)
-		;EX	AF,AF'
-		;LD	A,SYS_PAGE
-		;OUT	(SLOT3),A
-		LD	DE,SYS_PAGE.FDD_TABLE
-		LD	BC,SYS_PAGE.FDD_TABLE.Size
-		LDIR 
-		;EX	AF,AF'
-		;OUT	(SLOT3),A
-.NOFDD0:	LD	BC,CMOS_CELL.DrivesSetup_1.Mask.SecondFDD	;#0C11
-		CALL	GET_CMOS_VALUE
-		LD	HL,FDD_INIT_TABLE_525
-		OR	A
-		JR	Z,.SETFD1
-		;
-		LD	HL,FDD_INIT_TABLE_35
-		DEC	A
-		JR	NZ,.NOFDD1
-		;
-.SETFD1:	;
-		;IN	A,(SLOT3)
-		;EX	AF,AF'
-		;LD	A,SYS_PAGE
-		;OUT	(SLOT3),A
-		LD	DE,SYS_PAGE.FDD_1_TABLE
-		LD	BC,FD144A.Size
-		LDIR 
-.NOFDD1:	EX	AF,AF'
-		OUT	(SLOT3),A
+		RET	Z
+		CALL	PRINTZ
 		RET
-*/
-
-
-PIDNUM:	LD	HL,memBUFFER.ID
-	LD	BC,#00FF
-	XOR	A
-	CPIR
-	LD	A,(HL)
-	OR	A
-	RET	Z
-	CALL	PRINTZ
-	RET
 
 PIDBOARD:      	CALL    FN_CRIPT.board_id
 		;