Fix IDE Detection on Spinning Disks

Prior improvement to IDE device detection broke detection of spinning hard disks. IDE registers cannot be used prior to device init completion (spin up). Not a problem for CF, but special steps required to ensure devices are fully initialized before register testing.
Improve IDE Device Detection
2026-02-06 22:43:15 -06:00 · 2023-04-23 18:47:43 -07:00 · 2023-04-21 17:08:18 -07:00 · 2023-04-20 16:24:14 -07:00 · 2023-04-18 11:40:22 -07:00
23 changed files with 432 additions and 298 deletions
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -3,6 +3,8 @@ Version 3.3
 - WBW: Support Front Panel switches
 - A?C: Preliminary support for Z80-Retro
 - A?C: Support for SD PIO
+- A?C: Support for Z80-Retro SD interface
+- WBW: Support per-drive floppy configuration

 Version 3.2.1
 -------------
--- a/Source/HBIOS/Config/Z80RETRO_std.asm
+++ b/Source/HBIOS/Config/Z80RETRO_std.asm
@@ -32,4 +32,4 @@ CRTACT		.SET	FALSE		; ACTIVATE CRT (VDU,CVDU,PROPIO,ETC) AT STARTUP
 ;
 UARTENABLE	.SET	FALSE		; UART: ENABLE 8250/16550-LIKE SERIAL DRIVER (UART.ASM)
 ;
-SDENABLE	.SET	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
+SDENABLE	.SET	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
--- a/Source/HBIOS/cfg_dyno.asm
+++ b/Source/HBIOS/cfg_dyno.asm
@@ -185,9 +185,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_DYNO	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -227,7 +227,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_master.asm
+++ b/Source/HBIOS/cfg_master.asm
@@ -239,9 +239,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_NONE	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -282,7 +282,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_NONE	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_NONE	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_mbc.asm
+++ b/Source/HBIOS/cfg_mbc.asm
@@ -168,9 +168,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_MBC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -211,7 +211,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_JUHA	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_JUHA	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_mk4.asm
+++ b/Source/HBIOS/cfg_mk4.asm
@@ -178,9 +178,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_DIDE	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -221,7 +221,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_MK4	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_MK4	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_n8.asm
+++ b/Source/HBIOS/cfg_n8.asm
@@ -180,9 +180,9 @@ FDENABLE	.EQU	TRUE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_N8	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -223,7 +223,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_CSIO	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_CSIO	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	N8_PPI0		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_rcz180.asm
+++ b/Source/HBIOS/cfg_rcz180.asm
@@ -185,9 +185,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_RCWDC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -227,7 +227,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_rcz280.asm
+++ b/Source/HBIOS/cfg_rcz280.asm
@@ -195,9 +195,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_RCWDC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -237,7 +237,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_rcz80.asm
+++ b/Source/HBIOS/cfg_rcz80.asm
@@ -189,9 +189,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_RCWDC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -231,7 +231,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_rph.asm
+++ b/Source/HBIOS/cfg_rph.asm
@@ -169,9 +169,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_N8	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -212,7 +212,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_CSIO	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_CSIO	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	RPH_PPI0	; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_sbc.asm
+++ b/Source/HBIOS/cfg_sbc.asm
@@ -163,14 +163,13 @@ MDRAM		.EQU	TRUE		; MD: ENABLE RAM DISK
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 MDFFENABLE	.EQU	FALSE		; MD: ENABLE FLASH FILE SYSTEM
 ;
-;
 FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_DIO3	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 RFCNT		.EQU	1		; RF: NUMBER OF RAM FLOPPY UNITS (1-4)
@@ -211,7 +210,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_JUHA	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_JUHA	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_scz180.asm
+++ b/Source/HBIOS/cfg_scz180.asm
@@ -185,9 +185,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_RCWDC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	2		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -227,7 +227,7 @@ PPIDE2A8BIT	.EQU	FALSE		; PPIDE 2A (MASTER): 8 BIT XFER
 PPIDE2B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_SC	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_SC	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_z80retro.asm
+++ b/Source/HBIOS/cfg_z80retro.asm
@@ -169,9 +169,9 @@ FDENABLE	.EQU	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_ZETA2	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	1		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -184,9 +184,8 @@ PPIDE0BASE	.EQU	$60		; PPIDE 0: PPI REGISTERS BASE ADR
 PPIDE0A8BIT	.EQU	FALSE		; PPIDE 0A (MASTER): 8 BIT XFER
 PPIDE0B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
-SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
-SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
+SDENABLE	.EQU	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
+SDMODE		.EQU	SDMODE_Z80R	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 SDCSIOFAST	.EQU	FALSE		; SD: ENABLE TABLE-DRIVEN BIT INVERTER IN CSIO MODE
--- a/Source/HBIOS/cfg_zeta.asm
+++ b/Source/HBIOS/cfg_zeta.asm
@@ -139,9 +139,9 @@ FDENABLE	.EQU	TRUE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_ZETA	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	1		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -155,7 +155,7 @@ PPIDE0A8BIT	.EQU	FALSE		; PPIDE 0A (MASTER): 8 BIT XFER
 PPIDE0B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/cfg_zeta2.asm
+++ b/Source/HBIOS/cfg_zeta2.asm
@@ -150,9 +150,9 @@ FDENABLE	.EQU	TRUE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
 FDMODE		.EQU	FDMODE_ZETA2	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPFDC|MBC]
 FDCNT		.EQU	1		; FD: NUMBER OF FLOPPY DRIVES ON THE INTERFACE (1-2)
 FDTRACE		.EQU	1		; FD: TRACE LEVEL (0=NO,1=FATAL,2=ERRORS,3=ALL)
-FDMEDIA		.EQU	FDM144		; FD: DEFAULT MEDIA FORMAT FDM[720|144|360|120|111]
-FDMEDIAALT	.EQU	FDM720		; FD: ALTERNATE MEDIA FORMAT FDM[720|144|360|120|111]
 FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
+FD0TYPE		.EQU	FDT_3HD		; FD 0: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
+FD1TYPE		.EQU	FDT_3HD		; FD 1: DRIVE TYPE: FDT_[3DD|3HD|5DD|5HD|8]
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
@@ -166,7 +166,7 @@ PPIDE0A8BIT	.EQU	FALSE		; PPIDE 0A (MASTER): 8 BIT XFER
 PPIDE0B8BIT	.EQU	FALSE		; PPIDE 0B (SLAVE): 8 BIT XFER
 ;
 SDENABLE	.EQU	FALSE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
-SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|USR]
+SDMODE		.EQU	SDMODE_PPI	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT|PIO|Z80R|USR]
 SDPPIBASE	.EQU	$60		; SD: BASE I/O ADDRESS OF PPI FOR PPI MODDE
 SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD/SC/MT ONLY
 SDTRACE		.EQU	1		; SD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
--- a/Source/HBIOS/fd.asm
+++ b/Source/HBIOS/fd.asm
@@ -109,7 +109,7 @@ FRC_TOSEEKWT	.EQU	-15H		; EB
 ; FD DEVICE CONFIGURATION
 ;
 FD_DEVCNT	.EQU	FDCNT		; 2 DEVICES SUPPORTED
-FD_CFGSIZ	.EQU	8		; SIZE OF CFG TBL ENTRIES
+FD_CFGSIZ	.EQU	9		; SIZE OF CFG TBL ENTRIES
 ;
 ; PER DEVICE DATA OFFSETS
 ;					; OFFSET OF...
@@ -121,25 +121,28 @@ FD_HST		.EQU	4		; HOSTS SEEK POSITION
 FD_HSTTRK	.EQU	FD_HST + 0	; HOST TRACK (WORD)
 FD_HSTSEC	.EQU	FD_HST + 2	; HOST SECTOR (BYTE)
 FD_HSTHD	.EQU	FD_HST + 3	; HOST HEAD (BYTE)
+FD_TYPE		.EQU	8		; FLOPPY DSIK TYPE (BYTE)
 ;
 FD_CFGTBL:
 	; DEVICE 0, PRIMARY MASTER
 	.DB	0			; DEVICE NUMBER
 	.DB	0			; DEVICE STATUS
-	.DB	FDMEDIA			; MEDIA TYPE
+	.DB	$FF			; CURRENT MEDIA TYPE (INIT TO NONE)
 	.DB	$FF			; CURRENT TRACK
 	.DW	0			; HOST TRACK
 	.DB	0			; HOST SECTOR
 	.DB	0			; HOST HEAD
+	.DB	FD0TYPE			; DRIVE TYPE
 #IF (FD_DEVCNT >= 2)
 	; DEVICE 1, PRIMARY SLAVE
 	.DB	1			; DRIVER DEVICE NUMBER
 	.DB	0			; DEVICE STATUS
-	.DB	FDMEDIA			; MEDIA TYPE
+	.DB	$FF			; CURRENT MEDIA TYPE (INIT TO NONE)
 	.DB	$FF			; CURRENT TRACK
 	.DW	0			; HOST TRACK
 	.DB	0			; HOST SECTOR
 	.DB	0			; HOST HEAD
+	.DB	FD1TYPE			; DRIVE TYPE
 #ENDIF
 ;
 #IF ($ - FD_CFGTBL) != (FD_DEVCNT * FD_CFGSIZ)
@@ -199,6 +202,42 @@ FSST_ENTSIZ	.EQU	$ - FSST
 FSST_COUNT	.EQU	(($ - FSST) / FSST_ENTSIZ)	; # ENTRIES IN TABLE
 #ENDIF
 ;
+; FDC DRIVE TYPE MEDIA OPTIONS
+;
+; THIS TABLE LISTS THE TYPES OF MEDIA THAT SHOULD BE ATTEMPTED
+; FOR EACH POSSIBLE DRIVE TYPE.  THE ENTRIES MATCH THE ORDER OF THE
+; FDT_ VALUES DEFINED IN STD.ASM
+;
+FD_MEDIAMAP:
+		.DW	FDMM_NONE	; NO DRIVE TYPE
+		.DW	FDMM_3DD
+		.DW	FDMM_3HD
+		.DW	FDMM_5DD
+		.DW	FDMM_5HD
+		.DW	FDMM_8
+;
+FDMM_NONE	.DB	$FF
+FDMM_3DD	.DB	FDM720, $FF
+FDMM_3HD	.DB	FDM144, FDM720, $FF
+FDMM_5DD	.DB	FDM360, $FF
+FDMM_5HD	.DB	FDM120, FDM360, $FF
+FDMM_8		.DB	FDM111, $FF
+;
+; FDC DRIVE TYPE ATTRIBUTES
+;
+; LOOKUP TABLE TO MAP THE DEVICE ATTRIBUTES BYTE RETURNED
+; BY THE FD_DEVICE FUNCTION BASED ON THE DRIVE TYPE.
+; THE ENTRIES MATCH THE ORDER OF THE
+; FDT_ VALUES DEFINED IN STD.ASM
+;
+FD_DEVATTR:
+		.DB	%11100000	; DRIVE TYPE NONE
+		.DB	%11010100	; DRIVE TYPE 3.5 DD
+		.DB	%11011000	; DRIVE TYPE 3.5 HD
+		.DB	%10110100	; DRIVE TYPE 5.25 DD
+		.DB	%10111000	; DRIVE TYPE 5.25 HD
+		.DB	%10010100	; DRIVE TYPE 8
+;
 ; FDC COMMANDS
 ;
 CFD_READ	.EQU	00000110B	; CMD,HDS/DS,C,H,R,N,EOT,GPL,DTL --> ST0,ST1,ST2,C,H,R,N
@@ -498,21 +537,11 @@ FD_DEFMED:
 FD_DEVICE:
 	LD	D,DIODEV_FD		; D := DEVICE TYPE
 	LD	E,(IY+FD_DEV)		; E := PHYSICAL DEVICE NUMBER
-#IF (FDMEDIA == FDM720)
-	LD	C,%11010100		; 3.5" DS/DD
-#ENDIF
-#IF (FDMEDIA == FDM144)
-	LD	C,%11011000		; 3.5" DS/HD
-#ENDIF
-#IF (FDMEDIA == FDM360)
-	LD	C,%10110100		; 5.25" DS/DD
-#ENDIF
-#IF (FDMEDIA == FDM120)
-	LD	C,%10111000		; 5.25" DS/HD
-#ENDIF
-#IF (FDMEDIA == FDM111)
-	LD	C,%10010100		; 8" DS/DD
-#ENDIF
+
+	LD	A,(IY+FD_TYPE)		; DRIVE TYPE
+	LD	HL,FD_DEVATTR		; DEVICE ATTR TABLE
+	CALL	ADDHLA			; POINT TO ENTRY
+	LD	C,(HL)			; GET IT
 	LD	H,FDMODE		; H := MODE
 	LD	L,FDC_MSR		; L := BASE I/O ADDRESS
 	XOR	A			; SIGNAL SUCCESS
@@ -527,9 +556,7 @@ FD_MEDIA:

 #IF (FDMAUTO)
 	; SETUP TO READ TRK 0, HD 0, SEC 0
-	;LD	A,C			; C STILL HAS REQUESTED DRIVE
 	LD	A,(IY+FD_DEV)		; GET DRIVE UNIT
-	;AND	0FH
 	LD	(FCD_DS),A
 	LD	A,0
 	LD	(FCD_C),A
@@ -538,53 +565,77 @@ FD_MEDIA:
 	LD	(FCD_R),A
 	LD	A,DOP_READID
 	LD	(FCD_DOP),A
+#ENDIF

-#IF (FDTRACE < 3)
+
+	LD	A,(IY+FD_TYPE)		; GET DRIVE TYPE VALUE
+	;CALL	PRTHEXBYTE		; *DEBUG*
+	LD	HL,FD_MEDIAMAP		; POINT TO MEDIA MAP TABLE
+	ADD	A,A			; TABLE IS WORD SIZED
+	CALL	ADDHLA			; LOOKUP ENTRY
+	LD	A,(HL)			; DEREFERENCE
+	INC	HL
+	LD	H,(HL)
+	LD	L,A
+
+#IF (FDMAUTO)
+  #IF (FDTRACE < 3)
 	; SUPPRESS TRACING FOR MEDIA TESTS
 	LD	A,0
 	LD	(FCD_TRACE),A
-#ENDIF
-
-	LD	B,5
+  #ENDIF

+	LD	B,5			; 5 ATTEMPTS
 FD_MEDIARETRY:
-	; TRY PRIMARY MEDIA CHOICE FIRST
-	LD	A,FDMEDIA
-	CALL	FD_TESTMEDIA
-	JR	Z,FD_MEDIA3		; IF SUCCESS, WE ARE DONE
-
-	; TRY ALTERNATE MEDIA CHOICE
-	LD	A,FDMEDIAALT
-	CALL	FD_TESTMEDIA
-	JR	Z,FD_MEDIA3		; IF SUCCESS, WE ARE DONE
-
-	DJNZ	FD_MEDIARETRY
+	PUSH	HL			; SAVE MEDIA MAP PTR
+	CALL	FD_MEDIALOOP		; TRY IT
+	POP	HL			; RECOVER MEDIA MAP PTR
+	JR	Z,FD_MEDIA3		; CONTINUE ON SUCCESS
+	DJNZ	FD_MEDIARETRY		; LOOP TILL DONE

+FD_MEDIARETRY1:
 	; NO JOY, RETURN WITH E=0 (NO MEDIA)
-	;LD	HL,(FDDS_MEDIAADR)
-	;LD	(HL),0			; SET TO NO MEDIA
-	LD	(IY+FD_MEDTYP),0	; SET DRIVE = NO MEDIA
-	LD	E,0
+	LD	(IY+FD_MEDTYP),$FF	; SET MEDIA TYPE TO UNDEFINED
+	LD	E,0			; NO MEDIA FLAG
 	LD	A,ERR_NOMEDIA		; SIGNAL ERROR
 	OR	A			; SET FLAGS
 	RET

+FD_MEDIALOOP:
+	LD	A,(HL)			; LOAD NEXT MEDIA TYPE TO TRY
+	CP	$FF			; END OF MEDIA TYPES TO TRY?
+	JR	Z,FD_MEDIALOOP1		; NO MORE TO TRY, LOOP EXIT
+	CALL	FD_TESTMEDIA		; TRY IT
+	RET	Z			; RETURN ON SUCCESS
+	INC	HL			; NEXT MEDIA TYPE TO TRY
+	JR	FD_MEDIALOOP		; LOOP
+FD_MEDIALOOP1:
+	OR	$FF			; SIGNAL FAILURE
+	RET				; RETURN
+
 FD_TESTMEDIA:
-	;LD	HL,(FDDS_MEDIAADR)
-	;LD	(HL),A
+	;CALL	PRTHEXBYTE		; *DEBUG*
 	LD	(IY+FD_MEDTYP),A
+	PUSH	HL
 	PUSH	BC
 	CALL	FD_START
 	POP	BC
+	POP	HL
+	;CALL	PRTHEXBYTE		; *DEBUG*
 	RET

 FD_MEDIA3:

-#IF (FDTRACE < 3)
+  #IF (FDTRACE < 3)
 	; RESTORE TRACING FOR MEDIA TESTS
 	LD	A,FDTRACE
 	LD	(FCD_TRACE),A
-#ENDIF
+  #ENDIF
+#ELSE
+
+	LD	A,(HL)
+	LD	(IY+FD_MEDTYP),A
+
 #ENDIF

 FD_MEDIA4:
@@ -778,7 +829,7 @@ FD_DETECT1:
 ;
 FD_INITUNIT:
 	LD	(IY+FD_STAT),0		; CLEAR STATUS
-	LD	(IY+FD_MEDTYP),FDMEDIA	; SET DEFAULT MEDIA TYPE
+	LD	(IY+FD_MEDTYP),$FF	; SET UNKNOWN MEDIA TYPE
 	LD	(IY+FD_CURTRK),$FE	; SPECIAL VALUE FOR CURTRK
 	RET
 ;
@@ -1285,7 +1336,8 @@ FC_SETUPIO:
 	LD	(DE),A
 	INC	DE

-	LD	A,(FCD_EOT)
+	;LD	A,(FCD_EOT)
+	LD	A,(FCD_R)		; READ ONLY ONE SECTOR
 	LD	(DE),A
 	INC	DE

@@ -1397,15 +1449,17 @@ FC_RESETFDC:
 ; PULSE TERMCT TO TERMINATE ANY ACTIVE EXECUTION PHASE
 ;
 FC_PULSETC:
-#IF ((FDMODE == FDMODE_DIDE) | (FDMODE == FDMODE_N8) | (FDMODE == FDMODE_ZETA2) | (FDMODE == FDMODE_RCWDC) | (FDMODE == FDMODE_DYNO) | (FDMODE == FDMODE_EPFDC) | (FDMODE == FDMODE_MBC))
-	IN	A,(FDC_TC)
-#ELSE
-	LD	A,(FST_DOR)
-	SET	0,A
-	OUT	(FDC_DOR),A
-	RES	0,A
-	OUT	(FDC_DOR),A
-#ENDIF
+; PULSING TC NO LONGER REQUIRED BECAUSE WE ONLY READ A SINGLE SECTOR
+;
+;#IF ((FDMODE == FDMODE_DIDE) | (FDMODE == FDMODE_N8) | (FDMODE == FDMODE_ZETA2) | (FDMODE == FDMODE_RCWDC) | (FDMODE == FDMODE_DYNO) | (FDMODE == FDMODE_EPFDC) | (FDMODE == FDMODE_MBC))
+;	IN	A,(FDC_TC)
+;#ELSE
+;	LD	A,(FST_DOR)
+;	SET	0,A
+;	OUT	(FDC_DOR),A
+;	RES	0,A
+;	OUT	(FDC_DOR),A
+;#ENDIF
 	RET
 ;
 ; SET FST_DOR FOR MOTOR CONTROL ON
@@ -1694,7 +1748,7 @@ FXR_TO:		; TIMEOUT
 ;
 FXR_ABORT:	; EXECUTION ABORTED
 	HB_EI				; INTERRUPTS OK AGAIN
-	JR	FOP_RES			; GET RSEULTS, NO NEED TO PULSE TC
+	JR	FOP_RES			; GET RESULTS, NO NEED TO PULSE TC
 ;
 FXR_END:	; EXECUTION COMPLETED NORMALLY
 	CALL	FC_PULSETC		; PULSE TC TO END EXECUTION
@@ -1828,7 +1882,9 @@ FOP_EVALST1:

 	LD	C,FRC_ENDCYL
 	BIT	7,A
-	JR	NZ,FOP_SETFST
+	; THI IS NORMAL BECAUSE WE NOW READ ONLY A SINGLE SECTOR
+	;JR	NZ,FOP_SETFST
+	JR	NZ,FOP_EXIT

 	LD	C,FRC_DATAERR
 	BIT	5,A
--- a/Source/HBIOS/ide.asm
+++ b/Source/HBIOS/ide.asm
@@ -937,42 +937,6 @@ IDE_RESET:
 	PRTS(" RESET$")
 #ENDIF
 ;
-;#IF (IDEMODE == IDEMODE_RC)
-;
-	; OLDER CF CARDS DO NOT SEEM TO SET THE 
-	; REGISTERS ON RESET, SO HERE WE FAKE THINGS BY
-	; SETTING THEM AS A RESET WOULD.  SO WE ALWAYS
-	; DO THE FAKE.
-	;LD	A,(IY+IDE_MODE)		; GET MODE
-	;CP	IDEMODE_RC		; RCBUS?
-	;JR	NZ,IDE_RESET2		; IF NOT, BYPASS
-;
-	; RCBUS CANNOT ADDRESS THE DEVICE CONTROL PORT AND
-	; HAS NO WAY TO PERFORM A HARD RESET FROM SOFTWARE,
-	; SO FAKE IT BY SETTING THE REGISTERS TO THE SAME
-	; VALUES THAT A RESET WOULD CAUSE.
-#IF (IDETRACE >= 3)
-	PRTS(" FAKE$")
-#ENDIF
-	XOR	A
-	;OUT	(IDE_IO_CYLLO),A
-	CALL	IDE_OUT
-	.DB	IDE_REG_CYLLO
-	;OUT	(IDE_IO_CYLHI),A
-	CALL	IDE_OUT
-	.DB	IDE_REG_CYLHI
-	INC	A
-	;OUT	(IDE_IO_COUNT),A
-	CALL	IDE_OUT
-	.DB	IDE_REG_COUNT
-	;OUT	(IDE_IO_SECT),A
-	CALL	IDE_OUT
-	.DB	IDE_REG_SECT
-;
-IDE_RESET2:
-;
-;#ENDIF
-;
 ;#IF (IDEMODE == IDEMODE_MK4)
 ;
 	LD	A,(IY+IDE_MODE)		; GET MODE
@@ -1106,11 +1070,20 @@ IDE_SELUNIT2:
 ;
 ;
 IDE_PROBE:
+;
+; PROBE FOR A DRIVE ON THE INTERFACE (EITHER MASTER OR SLAVE).
+; IDEALLY, THIS IS BEING CALLED IMMEDIATELY AFTER A HARD OR SOFT
+; INTERFACE RESET.  HOWEVER, THERE ARE SOME HARDWARE IMPLEMENTATTIONS
+; WHICH ARE NOT CAPABLE OF EITHER A HARD NOR SOFT RESET.  SO THIS
+; CODE SHOULD TRY TO HANDLE THE SCENARIO WHERE NO INTERFACE RESET
+; HAS OCCURRED.
+;
 #IF (IDETRACE >= 3)
 	CALL	IDE_PRTPREFIX
 	PRTS(" PROBE$")			; LABEL FOR IO ADDRESS
 #ENDIF
 ;
+	; SELECT DEVICE (MASTER/SLAVE)
 	LD	A,(IDE_DRVHD)
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
@@ -1119,35 +1092,77 @@ IDE_PROBE:
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
-
 	CALL	DELAY			; DELAY ~16US
 ;
-	;LD	C,IDE_IO_STAT
-	;IN	A,(C)
+; IF WE GET HERE AND THE INTERFACE IS STILL INITIALIZING, WE NEED TO
+; WAIT UNTIL THE INTERFACE IS READY.  PER SPEC, THE STATUS REGISTER
+; WILL BE EXACTLY $80 IN THIS SCENARIO.  SINCE $80 IS UNLIKELY
+; FOR A FLOATING PORT VALUE, WE INTERPRET THIS VALUE TO MEAN HARDWARE
+; IS THERE AND INIT IS IN PROGRESS, SO IT WILL BE IMPOSSIBLE TO
+; INTERROGATE REGISTERS YET.  SINCE WE NOW BELIEVE THAT SOME HARDWARE
+; IS RESPONDING, IT IS SAFE (AND NECESSARY) TO WAIT FOR BUSY TO
+; CLEAR.
+;
 	CALL	IDE_IN
 	.DB	IDE_REG_STAT
 #IF (IDETRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
-	CP	$FF
-	JP	Z,IDE_NOMEDIA
-	CP	$78
-	JP	Z,IDE_NOMEDIA
+	CP	$80			; INIT IN PROGRESS?
+	CALL	Z,IDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
+;
+; TEST FOR PRESENCE OF IDE REGISTERS.  USE LBA0/1 TO SEE
+; IF VALUE CAN BE PERSISTED.  THE USE OF BOTH LBA0 AND LBA1
+; IS TO MAINTAIN CONSISTENCY WITH THE THE PPIDE DRIVER BECAUSE
+; PPI ITSELF WILL PERSIST THE LAST VALUE WRITTEN, SO WE USE
+; MULTIPLE REGISTERS TO WORK AROUND THIS.
+;
+	; $AA -> LBA0
+	LD	A,$AA
+	CALL	IDE_OUT
+	.DB	IDE_REG_LBA0
+;	
+	; $55 => LBA1
+	LD	A,$55
+	CALL	IDE_OUT
+	.DB	IDE_REG_LBA1
+;
+	; TEST LBA0 == $AA
+	CALL	IDE_IN
+	.DB	IDE_REG_LBA0
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	CP	$AA
+	JP	NZ,IDE_NOMEDIA
+;
+	; TEST LBA1 == $55
+	CALL	IDE_IN
+	.DB	IDE_REG_LBA1
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	CP	$55
+	JP	NZ,IDE_NOMEDIA
 ;
 #IF (IDETRACE >= 3)
 	CALL	IDE_REGDUMP
 #ENDIF
 ;
-	;JR	IDE_PROBE1		; *DEBUG*
-;
-IDE_PROBE0:
 	CALL	IDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
 	JP	NZ,IDE_NOMEDIA		; CONVERT TIMEOUT TO NO MEDIA AND RETURN
 ;
 #IF (IDETRACE >= 3)
 	CALL	IDE_REGDUMP
 #ENDIF
+;
+; IF THE INTERFACE HAS A MASTER AND NO SLAVE, THEN THE ABOVE CHECKS
+; MAY ALL SUCCEED WHEN PROBING FOR THE SLAVE.  HOWEVER, THE STATUS
+; BYTE FOR THE SLAVE WILL REMAIN $00, SO WE LOOK FOR THAT VALUE AS A
+; FINAL WAY TO DETECT NO MEDIA.
 ;
 	; CHECK STATUS
 	;IN	A,(IDE_IO_STAT)		; GET STATUS
@@ -1160,54 +1175,7 @@ IDE_PROBE0:
 	OR	A			; SET FLAGS TO TEST FOR ZERO
 	JP	Z,IDE_NOMEDIA
 ;
-	; CHECK SIGNATURE
-#IF (IDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(IDE_IO_COUNT)
-	CALL	IDE_IN
-	.DB	IDE_REG_COUNT
-#IF (IDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$01
-	JP	NZ,IDE_NOMEDIA
-#IF (IDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(IDE_IO_SECT)
-	CALL	IDE_IN
-	.DB	IDE_REG_SECT
-#IF (IDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$01
-	JP	NZ,IDE_NOMEDIA
-#IF (IDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(IDE_IO_CYLLO)
-	CALL	IDE_IN
-	.DB	IDE_REG_CYLLO
-#IF (IDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$00
-	JP	NZ,IDE_NOMEDIA
-#IF (IDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(IDE_IO_CYLHI)
-	CALL	IDE_IN
-	.DB	IDE_REG_CYLHI
-#IF (IDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$00
-	JP	NZ,IDE_NOMEDIA
-;
-IDE_PROBE1:
-	; SIGNATURE MATCHES ATA DEVICE, RECORD TYPE AND RETURN SUCCESS
+	; ASSUME ATA DEVICE FOR NOW, RECORD TYPE AND RETURN SUCCESS
 	LD	A,IDE_TYPEATA		; TYPE = ATA
 	LD	(IY+IDE_TYPE),A		; SET IT IN INSTANCE DATA
 	XOR	A			; SIGNAL SUCCESS
--- a/Source/HBIOS/ppide.asm
+++ b/Source/HBIOS/ppide.asm
@@ -989,27 +989,6 @@ PPIDE_RESET:
 	CALL	PPIDE_PRTPREFIX
 	PRTS(" RESET$")
 #ENDIF
-;
-	; OLDER CF CARDS DO NOT SEEM TO SET THE 
-	; REGISTERS ON RESET, SO HERE WE FAKE THINGS BY
-	; SETTING THEM AS A RESET WOULD
-#IF (PPIDETRACE >= 3)
-	PRTS(" FAKE$")
-#ENDIF
-	XOR	A
-	;OUT	(IDE_IO_CYLLO),A
-	CALL	PPIDE_OUT
-	.DB	PPIDE_REG_CYLLO
-	;OUT	(IDE_IO_CYLHI),A
-	CALL	PPIDE_OUT
-	.DB	PPIDE_REG_CYLHI
-	INC	A
-	;OUT	(IDE_IO_COUNT),A
-	CALL	PPIDE_OUT
-	.DB	PPIDE_REG_COUNT
-	;OUT	(IDE_IO_SECT),A
-	CALL	PPIDE_OUT
-	.DB	PPIDE_REG_SECT
 ;
 	; SETUP PPI TO READ
 	LD	A,PPIDE_DIR_READ	; SET DATA BUS DIRECTION TO READ
@@ -1034,6 +1013,9 @@ PPIDE_RESET:
 #ENDIF
 ;
 	; PULSE IDE RESET LINE
+#IF (IDETRACE >= 3)
+	PRTS(" HARD$")
+#ENDIF
 	LD	A,PPIDE_CTL_RESET
 	;OUT	(PPIDE_IO_CTL),A
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
@@ -1057,6 +1039,10 @@ PPIDE_RESET:
  #ENDIF
 #ENDIF
 ;
+	; CONFIGURE OPERATION
+#IF (PPIDETRACE >= 3)
+	PRTS(" CONFIG$")
+#ENDIF
 	LD	A,%00001010		; SET ~IEN, NO INTERRUPTS
 	;OUT	(PPIDE_REG_CTRL),A
 	CALL	PPIDE_OUT
@@ -1122,11 +1108,20 @@ PPIDE_SELUNIT2:
 ;
 ;
 PPIDE_PROBE:
+;
+; PROBE FOR A DRIVE ON THE INTERFACE (EITHER MASTER OR SLAVE).
+; IDEALLY, THIS IS BEING CALLED IMMEDIATELY AFTER A HARD OR SOFT
+; INTERFACE RESET.  HOWEVER, THERE ARE SOME HARDWARE IMPLEMENTATTIONS
+; WHICH ARE NOT CAPABLE OF EITHER A HARD NOR SOFT RESET.  SO THIS
+; CODE SHOULD TRY TO HANDLE THE SCENARIO WHERE NO INTERFACE RESET
+; HAS OCCURRED.
+;
 #IF (PPIDETRACE >= 3)
 	CALL	PPIDE_PRTPREFIX
 	PRTS(" PROBE$")			; LABEL FOR IO ADDRESS
 #ENDIF
 ;
+	; SELECT DEVICE (MASTER/SLAVE)
 	LD	A,(PPIDE_DRVHD)
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	PPIDE_OUT
@@ -1135,44 +1130,77 @@ PPIDE_PROBE:
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
-
 	CALL	DELAY			; DELAY ~16US
 ;
-	; BELOW TESTS FOR EXISTENCE OF AN IDE CONTROLLER ON THE
-	; PPIDE INTERFACE.  WE WRITE A VALUE OF ZERO FIRST SO THAT
-	; THE PPI BUS HOLD WILL RETURN A VALUE OF ZERO IF THERE IS
-	; NOTHING CONNECTED TO PPI PORT A.  THEN WE READ THE STATUS
-	; REGISTER.  IF AN IDE CONTROLLER IS THERE, IT SHOULD ALWAYS
-	; RETURN SOMETHING OTHER THAN ZERO.  IF AN IDE CONTROLLER IS
-	; THERE, THEN THE VALUE WRITTEN TO PPI PORT A IS IGNORED
-	; BECAUSE THE WRITE SIGNAL IS NEVER PULSED.
-	XOR	A
-	;OUT	(PPIDE_IO_DATALO),A
-	LD	C,(IY+PPIDE_DATALO)	; PPI PORT A, DATALO
-	OUT	(C),A
-;	IN	A,(PPIDE_REG_STAT)	; GET STATUS
+; IF WE GET HERE AND THE INTERFACE IS STILL INITIALIZING, WE NEED TO
+; WAIT UNTIL THE INTERFACE IS READY.  PER SPEC, THE STATUS REGISTER
+; WILL BE EXACTLY $80 IN THIS SCENARIO.  SINCE $80 IS UNLIKELY
+; FOR A FLOATING PORT VALUE, WE INTERPRET THIS VALUE TO MEAN HARDWARE
+; IS THERE AND INIT IS IN PROGRESS, SO IT WILL BE IMPOSSIBLE TO
+; INTERROGATE REGISTERS YET.  SINCE WE NOW BELIEVE THAT SOME HARDWARE
+; IS RESPONDING, IT IS SAFE (AND NECESSARY) TO WAIT FOR BUSY TO
+; CLEAR.
+;
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
 #IF (PPIDETRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
-	OR	A
-	JP	Z,PPIDE_NOMEDIA
+	CP	$80			; INIT IN PROGRESS?
+	CALL	Z,PPIDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
+;
+; TEST FOR PRESENCE OF IDE REGISTERS.  USE LBA0/1 TO SEE
+; IF VALUE CAN BE PERSISTED.  THE USE OF BOTH LBA0 AND LBA1
+; IS TO MAINTAIN CONSISTENCY WITH TGHE THE PPIDE DRIVER BECAUSE
+; PPI ITSELF WILL PERSIST THE LAST VALUE WRITTEN, SO WE USE
+; MULTIPLE REGISTERS TO WORK AROUND THIS FALSE POSITIVE.
+;
+	; $AA -> LBA0
+	LD	A,$AA
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_LBA0
+;	
+	; $55 => LBA1
+	LD	A,$55
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_LBA1
+;
+	; TEST LBA0 == $AA
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_LBA0
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	CP	$AA
+	JP	NZ,PPIDE_NOMEDIA
+;
+	; TEST LBA1 == $55
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_LBA1
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	CP	$55
+	JP	NZ,PPIDE_NOMEDIA
 ;
 #IF (PPIDETRACE >= 3)
 	CALL	PPIDE_REGDUMP
 #ENDIF
 ;
-	;JR	PPIDE_PROBE1		; *DEBUG*
-;
-PPIDE_PROBE0:
 	CALL	PPIDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
 	JP	NZ,PPIDE_NOMEDIA	; CONVERT TIMEOUT TO NO MEDIA AND RETURN
 ;
 #IF (PPIDETRACE >= 3)
 	CALL	PPIDE_REGDUMP
 #ENDIF
+;
+; IF THE INTERFACE HAS A MASTER AND NO SLAVE, THEN THE ABOVE CHECKS
+; MAY ALL SUCCEED WHEN PROBING FOR THE SLAVE.  HOWEVER, THE STATUS
+; BYTE FOR THE SLAVE WILL REMAIN $00, SO WE LOOK FOR THAT VALUE AS A
+; FINAL WAY TO DETECT NO MEDIA.
 ;
 	; CHECK STATUS
 ;	IN	A,(PPIDE_REG_STAT)	; GET STATUS
@@ -1185,54 +1213,7 @@ PPIDE_PROBE0:
 	OR	A			; SET FLAGS TO TEST FOR ZERO
 	JP	Z,PPIDE_NOMEDIA		; CONTINUE IF NON-ZERO
 ;
-	; CHECK SIGNATURE
-#IF (PPIDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(PPIDE_REG_COUNT)
-	CALL	PPIDE_IN
-	.DB	PPIDE_REG_COUNT
-#IF (PPIDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$01
-	JP	NZ,PPIDE_NOMEDIA
-#IF (PPIDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(PPIDE_REG_SECT)
-	CALL	PPIDE_IN
-	.DB	PPIDE_REG_SECT
-#IF (PPIDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$01
-	JP	NZ,PPIDE_NOMEDIA
-#IF (PPIDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(PPIDE_REG_CYLLO)
-	CALL	PPIDE_IN
-	.DB	PPIDE_REG_CYLLO
-#IF (PPIDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$00
-	JP	NZ,PPIDE_NOMEDIA
-#IF (PPIDETRACE >= 3)
-	CALL	PC_SPACE
-#ENDIF
-	;IN	A,(PPIDE_REG_CYLHI)
-	CALL	PPIDE_IN
-	.DB	PPIDE_REG_CYLHI
-#IF (PPIDETRACE >= 3)
-	CALL	PRTHEXBYTE
-#ENDIF
-	CP	$00
-	JP	NZ,PPIDE_NOMEDIA
-;
-PPIDE_PROBE1:
-	; SIGNATURE MATCHES ATA DEVICE, RECORD TYPE AND RETURN SUCCESS
+	; ASSUME ATA DEVICE FOR NOW, RECORD TYPE AND RETURN SUCCESS
 	LD	A,PPIDE_TYPEATA		; TYPE = ATA
 	LD	(IY+PPIDE_TYPE),A	; SET IT IN INSTANCE DATA
 	XOR	A			; SIGNAL SUCCESS
--- a/Source/HBIOS/sd.asm
+++ b/Source/HBIOS/sd.asm
@@ -333,6 +333,27 @@ SD_DDRVAL	.EQU	%00001101	; DATA DIRECTION REGISTER VALUE
 SD_INVCS	.EQU	FALSE		; INVERT CS
 #ENDIF
 ;
+#IF (SDMODE == SDMODE_Z80R)		; Z80 Retro
+;
+;	SPLIT OVER TWO REGISTERS TO DRIVE CLK. THE CS LINE IS ON THE GPIO
+;	WHICH IS THE SAME LATCHES THAT CONTROL MMU ON/OFF, SO DON;T GLITCH
+;	THEM WHEN UPDATING!
+;
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_OPRDEF	.EQU	%00000001	; OUTPUT PORT DEFAULT STATE
+SD_OPRMSK	.EQU	%00000101	; OUTPUT PORT MASK
+SD_OPRREG	.EQU	$64		; CS VIA GPIO
+SD_IOBASE	.EQU	$68		; 68/69 FOR OUTPUT
+SD_IOREG	.EQU	SD_IOBASE	; INPUT REGISTER
+SD_IOCLK	.EQU	SD_IOBASE+1	; CLOCK IS OFF A0
+SD_GPIO		.EQU	$64		; MISO IS ON THE GPIO
+SD_CS0		.EQU	%00000100	; SELECT
+SD_DI		.EQU	%00000001	; DATA IN (CARD <- CPU) MOSI
+SD_DO		.EQU	%00000001	; DATA OUT (CARD -> CPU) MISO
+SD_CINIT	.EQU	FALSE		; INITIALIZE OUTPUT PORT
+SD_INVCS	.EQU	FALSE		; INVERT CS
+#ENDIF
+;
 #IF (SD_DEVCNT > SD_DEVMAX)
 	.ECHO	"*** ERROR: SDCNT EXCEEDS MAXIMUM SUPPORTED BY INTERFACE!!!\n"
 	!!!	; FORCE AN ASSEMBLY ERROR
@@ -546,6 +567,15 @@ SD_INIT:
 	CALL	PRTHEXBYTE
 #ENDIF
 ;
+#IF (SDMODE == SDMODE_Z80R)
+	PRTS(" MODE=Z80R$")
+	PRTS(" IO=0x$")
+	LD	A,SD_IOBASE
+	CALL	PRTHEXBYTE
+	LD	A,SD_OPRDEF
+	LD	(SD_OPRVAL),A
+#ENDIF
+;
 #IF (SDMODE == SDMODE_USR)
 	PRTS(" MODE=USER$")
 	PRTS(" IO=0x$")
@@ -1910,7 +1940,7 @@ SD_DESELECT:
 	AND	~SD_CS0
 #ENDIF
 ; ADJUST BIT(S) FOR INTERFACES USING INVERTED CS BITS
-#IF ((SDMODE == SDMODE_PPI) | (SDMODE == SDMODE_UART) | (SDMODE == SDMODE_SC) | (SDMODE == SDMODE_PIO))
+#IF ((SDMODE == SDMODE_PPI) | (SDMODE == SDMODE_UART) | (SDMODE == SDMODE_SC) | (SDMODE == SDMODE_PIO) | (SDMODE == SDMODE_Z80R))
  #IF ((SDMODE == SDMODE_SC) & (SD_DEVCNT > 1))
 	XOR	SD_CS0 | SD_CS1
  #ELSE
@@ -1957,9 +1987,48 @@ SD_PUT:
 	SET	4,A			; SET TRANSMIT ENABLE
 	OUT0	(SD_CNTR),A
  #ELSE
-    #IF (SDMODE == SDMODE_UART)
+
+    #IF (SDMODE == SDMODE_Z80R)
+	; USE C - THE CALLING CODE FOR COMMAND SEND FAILS TO SAVE HL/DE
+	; WHILST THE OTHER PATHS DO ?
+        LD	C,A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	RL	C
+	RLA
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+    #ELSE
+
+      #IF (SDMODE == SDMODE_UART)
 	XOR	$FF			; DI IS INVERTED ON UART
-    #ENDIF
+      #ENDIF
 	LD	C,A			; C=BYTE TO SEND
 	LD	B,8			; SEND 8 BITS (LOOP 8 TIMES)
 	LD	A,(SD_OPRVAL)		; LOAD CURRENT OPR VALUE
@@ -1975,6 +2044,7 @@ SD_PUT1:
 	DJNZ	SD_PUT1			; REPEAT FOR ALL 8 BITS
 	LD	A,(SD_OPRVAL)		; LOAD CURRENT OPR VALUE
 	OUT	(SD_OPRREG),A		; LEAVE WITH CLOCK LOW
+    #ENDIF
  #ENDIF
 #ENDIF
 	RET				; DONE
@@ -1997,34 +2067,83 @@ SD_GET:
 	CALL	MIRROR			; MSB<-->LSB MIRROR BITS
 	LD	A,C			; KEEP RESULT
  #ELSE
+    #IF (SDMODE == SDMODE_Z80R)
+	; MUST PRESERVE HL,DE
+	PUSH	DE
+	LD	A,1
+	LD	C,SD_GPIO
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	OUT	(SD_IOREG),A
+	OUT	(SD_IOCLK),A
+	IN	B,(C)
+	RR	B
+	RL	E
+	LD	A,E
+	POP	DE
+    #ELSE
 	LD	B,8			; RECEIVE 8 BITS (LOOP 8 TIMES)
 	LD	A,(SD_OPRVAL)		; LOAD CURRENT OPR VALUE
 SD_GET1:
 	XOR	SD_CLK			; TOGGLE CLOCK
 	OUT	(SD_OPRREG),A		; UPDATE CLOCK
 	IN	A,(SD_INPREG)		; READ THE DATA WHILE CLOCK IS ACTIVE
-    #IF ((SDMODE == SDMODE_JUHA) | (SDMODE == SDMODE_PPI) | (SDMODE == SDMODE_PIO))
+      #IF ((SDMODE == SDMODE_JUHA) | (SDMODE == SDMODE_PPI) | (SDMODE == SDMODE_PIO))
 	RLA				; ROTATE INP:7 INTO CF
-    #ENDIF
-    #IF (SDMODE == SDMODE_N8)
+      #ENDIF
+      #IF (SDMODE == SDMODE_N8)
 	RLA				; ROTATE INP:6 INTO CF
 	RLA				; "
-    #ENDIF
-    #IF (SDMODE == SDMODE_UART)
+      #ENDIF
+      #IF (SDMODE == SDMODE_UART)
 	RLA				; ROTATE INP:5 INTO CF
 	RLA				; "
 	RLA				; "
-    #ENDIF
-    #IF (SDMODE == SDMODE_DSD)
+      #ENDIF
+      #IF (SDMODE == SDMODE_DSD)
 	RRA				; ROTATE INP:0 INTO CF
-    #ENDIF
+      #ENDIF
 	RL	C			; ROTATE CF INTO C:0
 	LD	A,(SD_OPRVAL)		; BACK TO INITIAL VALUES (TOGGLE CLOCK)
 	OUT	(SD_OPRREG),A		; DO IT
 	DJNZ	SD_GET1			; REPEAT FOR ALL 8 BITS
 	LD	A,C			; GET BYTE RECEIVED INTO A
-    #IF (SDMODE == SDMODE_UART)
+      #IF (SDMODE == SDMODE_UART)
 	XOR	$FF			; DO IS INVERTED ON UART
+      #ENDIF
    #ENDIF
  #ENDIF
 #ENDIF
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -92,6 +92,15 @@ FDM360		.EQU	2		; 5.25" FLOPPY, 360KB, 2 SIDES, 40 TRKS, 9 SECTORS
 FDM120		.EQU	3		; 5.25" FLOPPY, 1.2MB, 2 SIDES, 80 TRKS, 15 SECTORS
 FDM111		.EQU	4		; 8" FLOPPY, 1.11MB, 2 SIDES, 74 TRKS, 15 SECTORS
 ;
+; FLOPPY DISK TYPE
+;
+FDT_NONE	.EQU	0		; NONE
+FDT_3DD		.EQU	1		; 3.5" FLOPPY, DOUBLE DENSITY
+FDT_3HD		.EQU	2		; 3.5" FLOPPY, HIGH DENSITY
+FDT_5DD		.EQU	3		; 5.25" FLOPPY, DOUBLE DENSITY
+FDT_5HD		.EQU	4		; 5.25" FLOPPY, HIGH DNSITY
+FDT_8		.EQU	5		; 8" FLOPPY, DOUBLE DENSITY
+;
 ; ZILOG CTC MODE SELECTIONS
 ;
 CTCMODE_NONE	.EQU	0		; NO CTC
@@ -185,6 +194,7 @@ SDMODE_SC	.EQU	8		; SC (Steve Cousins)
 SDMODE_MT	.EQU	9		; MT (Shift register SPI WIZNET for RCBUS)
 SDMODE_USR	.EQU	10		; USER DEFINED (in sd.asm) (NOT COMPLETE)
 SDMODE_PIO	.EQU	11		; Z80 PIO bitbang
+SDMODE_Z80R	.EQU	12		; Z80 Retro
 ;
 ; AY SOUND CHIP MODE SELECTIONS
 ;
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,7 +2,7 @@
 #DEFINE	RMN	3
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.3.0-dev.2"
+#DEFINE BIOSVER	"3.3.0-dev.6"
 #define rmj	RMJ
 #define rmn	RMN
 #define rup	RUP
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	3
 rup	equ	0
 rtp	equ	0
 biosver	macro
-	db	"3.3.0-dev.2"
+	db	"3.3.0-dev.6"
 	endm
Author	SHA1	Message	Date
Wayne Warthen	ad3c533145	Fix IDE Detection on Spinning Disks Prior improvement to IDE device detection broke detection of spinning hard disks. IDE registers cannot be used prior to device init completion (spin up). Not a problem for CF, but special steps required to ensure devices are fully initialized before register testing.	2023-04-23 18:47:43 -07:00
Wayne Warthen	e43a939f54	Improve IDE Device Detection Per issue #343, some systems could initially detect a non-existent IDE device which would cause a long time-out. This should resolve the issue.	2023-04-21 17:08:18 -07:00
Wayne Warthen	e5b7409f44	Support Per-floppy Device Drive Types - Floppy devices are now configured per-device so that each floppy drive can be different (e.g., first floppy is 3.5" and second floppy is 5.25"). - Removed need to use termination signal on floppy sector I/O. Addresses issue #318	2023-04-20 16:24:14 -07:00
Wayne Warthen	9100f199b1	Z80-Retro SD Card Support (Alan Cox)	2023-04-18 11:40:22 -07:00