Continued cleanup of SD and IDE driver code

Source/HBIOS/Config/mk4_dsd.asm

@@ -50,38 +50,32 @@ IDEMODE		.EQU	IDEMODE_MK4	; IDEMODE_DIO, IDEMODE_DIDE, IDEMODE_MK4
 IDECNT		.EQU	1		; NUMBER OF IDE UNITS
 IDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
 IDE8BIT		.EQU	TRUE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
-IDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 ;
 PPIDEENABLE	.EQU	FALSE		; TRUE FOR PPIDE SUPPORT (DO NOT COMBINE WITH DSKYENABLE)
 PPIDEIOB	.EQU	$60		; PPIDE IOBASE
 PPIDECNT	.EQU	1		; NUMBER OF PPIDE UNITS
 PPIDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPIDEENABLE = TRUE)
 PPIDE8BIT	.EQU	FALSE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
-PPIDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 PPIDESLOW	.EQU	FALSE		; ADD DELAYS TO HELP PROBLEMATIC HARDWARE (TRY THIS IF PPIDE IS UNRELIABLE)
 ;
 SDENABLE	.EQU	TRUE		; TRUE FOR SD SUPPORT
 SDMODE		.EQU	SDMODE_DSD	; SDMODE_JUHA, SDMODE_CSIO, SDMODE_UART, SDMODE_PPI, SDMODE_DSD, SDMODE_MK4
 SDTRACE		.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
-SDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 SDCSIOFAST	.EQU	TRUE		; TABLE-DRIVEN BIT INVERTER
 ;
 PRPENABLE	.EQU	FALSE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
 PRPIOB		.EQU	$A8		; PORT IO ADDRESS BASE
 PRPSDENABLE	.EQU	TRUE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
 PRPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PRPSDENABLE = TRUE)
-PRPSDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 PRPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
 ;
 PPPENABLE	.EQU	FALSE		; TRUE FOR PARPORTPROP SUPPORT
 PPPSDENABLE	.EQU	TRUE		; TRUE FOR PARPORTPROP SD SUPPORT
 PPPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPPENABLE = TRUE)
-PPPSDCAPACITY	.EQU	64		; CAPACITY OF PPP SD DEVICE (IN MB)
 PPPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
 ;
 HDSKENABLE	.EQU	FALSE		; TRUE FOR SIMH HDSK SUPPORT
 HDSKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
-HDSKCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 ;
 PPKENABLE	.EQU	FALSE		; TRUE FOR PARALLEL PORT KEYBOARD
 PPKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPKENABLE = TRUE)

Source/HBIOS/Config/mk4_std.asm

@@ -47,41 +47,35 @@ RFCNT		.EQU	1		; NUMBER OF RAM FLOPPY UNITS
 ;
 IDEENABLE	.EQU	TRUE		; TRUE FOR IDE SUPPORT
 IDEMODE		.EQU	IDEMODE_MK4	; IDEMODE_DIO, IDEMODE_DIDE, IDEMODE_MK4
-IDECNT		.EQU	1		; NUMBER OF IDE UNITS
-IDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
+IDECNT		.EQU	2		; NUMBER OF IDE UNITS
+IDETRACE	.EQU	2		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
 IDE8BIT		.EQU	TRUE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
-IDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 ;
 PPIDEENABLE	.EQU	FALSE		; TRUE FOR PPIDE SUPPORT (DO NOT COMBINE WITH DSKYENABLE)
 PPIDEIOB	.EQU	$60		; PPIDE IOBASE
 PPIDECNT	.EQU	1		; NUMBER OF PPIDE UNITS
 PPIDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPIDEENABLE = TRUE)
 PPIDE8BIT	.EQU	FALSE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
-PPIDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 PPIDESLOW	.EQU	FALSE		; ADD DELAYS TO HELP PROBLEMATIC HARDWARE (TRY THIS IF PPIDE IS UNRELIABLE)
 ;
 SDENABLE	.EQU	TRUE		; TRUE FOR SD SUPPORT
 SDMODE		.EQU	SDMODE_MK4	; SDMODE_JUHA, SDMODE_CSIO, SDMODE_UART, SDMODE_PPI, SDMODE_DSD, SDMODE_MK4
-SDTRACE		.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
-SDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+SDTRACE		.EQU	2		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
 SDCSIOFAST	.EQU	TRUE		; TABLE-DRIVEN BIT INVERTER
 ;
 PRPENABLE	.EQU	FALSE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
 PRPIOB		.EQU	$A8		; PORT IO ADDRESS BASE
 PRPSDENABLE	.EQU	TRUE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
 PRPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PRPSDENABLE = TRUE)
-PRPSDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 PRPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
 ;
 PPPENABLE	.EQU	FALSE		; TRUE FOR PARPORTPROP SUPPORT
 PPPSDENABLE	.EQU	TRUE		; TRUE FOR PARPORTPROP SD SUPPORT
 PPPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPPENABLE = TRUE)
-PPPSDCAPACITY	.EQU	64		; CAPACITY OF PPP SD DEVICE (IN MB)
 PPPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
 ;
 HDSKENABLE	.EQU	FALSE		; TRUE FOR SIMH HDSK SUPPORT
 HDSKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
-HDSKCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 ;
 PPKENABLE	.EQU	FALSE		; TRUE FOR PARALLEL PORT KEYBOARD
 PPKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPKENABLE = TRUE)

Source/HBIOS/hdsk.asm

@@ -79,7 +79,7 @@ HDSK_CAP:
 	XOR	A			; SIGNAL SUCCESS
 	RET
 ;
-SD_GEOM:
+HDSK_GEOM:
 	; FOR LBA, WE SIMULATE CHS ACCESS USING 16 HEADS AND 16 SECTORS
 	; RETURN HS:CC -> DE:HL, SET HIGH BIT OF D TO INDICATE LBA CAPABLE
 	CALL	SD_CAP				; GET TOTAL BLOCKS IN DE:HL, BLOCK SIZE TO BC