Clean-up of ATAPI Support

- Improved media handling and error reporting.

Doc/ChangeLog.txt

@@ -10,6 +10,7 @@ Version 3.3
 - WBW: Support for EMM Zip Drive on PPI interface (much inspiration from Alan Cox)
 - WBW: Support for PPA Zip Drive on PPI interface (much inspiration from Alan Cox)
 - WBW: Support for SyQuest SparQ Drive on PPI interface (much inspiration from Alan Cox)
+- WBW: Support for ATAPI Disk Drives (not CD-ROMs) on IDE and PPIDE interfaces
 
 Version 3.2.1
 -------------

ReadMe.md

@@ -3,7 +3,7 @@
 **RomWBW ReadMe** \
 Version 3.3 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-02 Jun 2023
+06 Jun 2023
 
 # Overview
 

ReadMe.txt

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-02 Jun 2023
+06 Jun 2023
 
 
 

Source/Doc/Applications.md

@@ -51,6 +51,7 @@ found:
 | INTTEST     | No       | Yes        | Yes      |
 | FAT         | No       | Yes        | Yes      |
 | TUNE        | No       | Yes        | Yes      |
+| WDATE       | No       | Yes        | Yes      |
 
 `\clearpage`{=latex}
 
@@ -1128,3 +1129,85 @@ can be used to reduce your processor speed.
 
 VGMPLAY is still under development. The source code is provided in the 
 RomWBW distribution.
+
+`\clearpage`{=latex}
+
+# WDATE
+
+`wdate` is a utility for CP/M systems that have Wayne Warthen's
+ROMWBW firmware. It reads or sets the real-time clock, using function
+calls in the BIOS. It should work on any RTC device that is supported by
+ROMWBW, including the internal interrupt-driven timer that is is available
+on some systems. 
+
+`wdate` differs from the `rtc.com` utility that is provided with the
+ROMWBW version of CP/M in that it only gets and sets the date/time. 
+`rtc.com` can also manipulate the nonvolatile RAM in certain clock
+devices, and modify the charge controller. However, `wdate` is (I would
+argue) easier to use, as it takes its input from the command line, which
+can be edited, and it's less fussy about the format. It doesn't require
+the date to be set if you only want to change the time, for example.
+ In addition, `wdate` has at least some error checking.
+
+`wdate` displays the day-of-week and month as English text, not 
+numbers. It calculates the day-of-week from the year, month, and day.
+RTC chips usually store a day-of-week value, but it's useless in this
+application for two reasons: first, the BIOS does not expose it. Second,
+there is no universally-accepted way to interpret it (which day does
+the week start on? Is '0' a valid day of the week?)
+
+## Syntax
+
+| `WDATE`
+| `WDATE ` *`<hr> <min>`*
+| `WDATE ` *`<hr> <min> <sec>`*
+| `WDATE ` *`<year> <month> <day> <hr> <min> <sec>`*
+
+## Usage
+
+    A> wdate
+    Saturday 27 May 13:14:39 2023
+
+With no arguments, displays the current date and time. 
+
+    A> wdate hr min
+
+With two arguments, sets the time in hours and minutes, without changing date
+or seconds
+
+    A> wdate hr min sec
+
+With three arguments, sets the time in hours, minutes, and seconds, without
+changing date
+
+    A> wdate year month day hr min sec
+
+With six arguments, sets date and time. All numbers are one or two digits.  The
+two-digit year starts at 2000. 
+
+    A> wdate /?
+
+Show a summary of the command-line usage.
+
+## Notes
+
+I've tested this utility with the DS1302 clock board designed by Ed 
+Brindly, and on the interrupt-driven timer built into my Z180 board. 
+However, it does not interact with hardware, only BIOS; I would expect 
+it to work with other hardware.
+
+wdate checks for the non-existence of ROMWBW, and also for failing 
+operations on the RTC. It will display the terse "No RTC" message in 
+both cases.
+
+The ROMWBW functions that manipulate the date and time operate on BCD 
+numbers, as RTC chips themselves usually do. wdate works in decimal, so 
+that it can check that the user input makes sense. A substantial part of
+the program's code is taken up by number format conversion and range 
+checking.
+
+## Etymology
+
+The `WDATE` application was written and contributed by Kevin Boone.
+The source code is available on GitHub at
+[https://github.com/kevinboone/wdate-cpm/blob/main/README.md](https://github.com/kevinboone/wdate-cpm/blob/main/README.md).

Source/HBIOS/hbios.asm

@@ -7583,6 +7583,52 @@ HB_HASFP	.DB	0		; NON-ZERO MEANS FP EXISTS
 ;
 HB_WRKBUF	.FILL	512,0		; INTERNAL DISK BUFFER
 ;
+;
+;
+#IFDEF MG014_MAP
+;
+	.FILL	32 - ($ & (32 - 1))	; ALIGN TO 32 BYTE BOUNDARY
+
+MG014_STATMAPLO:
+	; LOWER NIBBLE
+	.DB	$08	; 00
+	.DB	$0C	; 01
+	.DB	$00	; 02
+	.DB	$04	; 03
+	.DB	$0A	; 04
+	.DB	$0E	; 05
+	.DB	$02	; 06
+	.DB	$06	; 07
+	.DB	$09	; 08
+	.DB	$0D	; 09
+	.DB	$01	; 0A
+	.DB	$05	; 0B
+	.DB	$0B	; 0C
+	.DB	$0F	; 0D
+	.DB	$03	; 0E
+	.DB	$07	; 0F
+;
+MG014_STATMAPHI:
+	; UPPER NIBBLE
+	.DB	$80	; 00
+	.DB	$C0	; 01
+	.DB	$00	; 02
+	.DB	$40	; 03
+	.DB	$A0	; 04
+	.DB	$E0	; 05
+	.DB	$20	; 06
+	.DB	$60	; 07
+	.DB	$90	; 08
+	.DB	$D0	; 09
+	.DB	$10	; 0A
+	.DB	$50	; 0B
+	.DB	$B0	; 0C
+	.DB	$F0	; 0D
+	.DB	$30	; 0E
+	.DB	$70	; 0F
+;
+#ENDIF
+;
 HB_END		.EQU	$
 ;
 SLACK		.EQU	BNKTOP - $

Source/HBIOS/imm.asm

@@ -10,10 +10,13 @@
 ;
 ; CREATED BY WAYNE WARTHEN FOR ROMWBW HBIOS.
 ; MUCH OF THE CODE IS DERIVED FROM LINUX AND FUZIX (ALAN COX).
+; - https://github.com/EtchedPixels/FUZIX
+; - https://github.com/torvalds/linux
 ;
-; 5/23/2023 WBW - INITIAL RELEASE
-; 5/26/2023 WBW - CLEAN UP, LED ACTIVITY
-; 5/27/2023 WBW - ADDED SPP MODE
+; 05/23/2023 WBW - INITIAL RELEASE
+; 05/26/2023 WBW - CLEAN UP, LED ACTIVITY
+; 05/27/2023 WBW - ADDED SPP MODE
+; 06/06/2023 WBW - OPTIMIZE BLOCK READ AND WRITE
 ;
 ;=============================================================================
 ;
@@ -71,8 +74,6 @@
 ;
 ; TODO:
 ;
-; - OPTIMIZE READ/WRITE LOOPS
-;
 ; NOTES:
 ;
 ; - THIS DRIVER IS FOR THE ZIP DRIVE IMM INTERFACE.  IT WILL SIMPLY
@@ -80,13 +81,11 @@
 ;   THERE DOES NOT SEEM TO BE A WAY TO VISUALLY DETERMINE IF A ZIP
 ;   DRIVE IS PPA OR IMM.  SIGH.
 ;
-; - THERE ARE SOME HARD CODED TIMEOUT LOOPS IN THE CODE.  THEY ARE
-;   WORKING OK ON A 7 MHZ Z80.  THEY ARE LIKELY TO NEED TWEAKING ON
-;   FASTER CPUS.
-;
-; - THIS DRIVER OPERATES PURELY IN NIBBLE MODE.  I SUSPECT IT IS
-;   POSSIBLE TO USE FULL BYTE MODE (PS2 STYLE), BUT I HAVE NOT
-;   ATTEMPTED IT.
+; - THIS DRIVER OPERATES USES NIBBLE READ MODE.  ALTHOUGH THE 8255
+;   (MG014) CAN READ OR WRITE TO PORT A (DATA), IT "GLITCHES" WHEN
+;   THE MODE IS CHANGED CAUSING THE CONTROL LINES TO CHANGE AND
+;   BREAKS THE PROTOCOL.  I SUSPECT THE MBC SPP CAN SUPPORT FULL BYTE
+;   MODE, (PS2 STYLE), BUT I HAVE NOT ATTEMPTED IT.
 ;
 ; - RELATIVE TO ABOVE, THIS BEAST IS SLOW.  IN ADDITION TO THE
 ;   NIBBLE MODE READS, THE MG014 ASSIGNS SIGNALS DIFFERENTLY THAN
@@ -135,6 +134,12 @@ IMM_LBA		.EQU	8		; OFFSET OF LBA (DWORD)
 #DEFINE IMM_WCTL(VAL)	LD A,VAL \ CALL IMM_WRITECTRL
 #DEFINE IMM_WDATA(VAL)	LD A,VAL \ CALL IMM_WRITEDATA
 ;
+; INCLUDE MG014 NIBBLE MAP FOR MG014 MODE
+;
+#IF (IMMMODE == IMMMODE_MG014)
+  #DEFINE MG014_MAP
+#ENDIF
+;
 ;=============================================================================
 ; INITIALIZATION ENTRY POINT
 ;=============================================================================
@@ -190,7 +195,7 @@ IMM_INIT4:
 ;
 	CALL	IMM_RESET		; RESET/INIT THE INTERFACE
 #IF (IMMTRACE <= 1)
-	CALL	IMM_PRTSTAT
+	CALL	NZ,IMM_PRTSTAT
 #ENDIF
 	JR	NZ,IMM_INIT6
 ;
@@ -227,6 +232,8 @@ IMM_DETECT:
 #IF (IMMTRACE >= 3)
 	PRTS("\r\nDETECT:$")
 #ENDIF
+;
+#IF (IMMMODE == IMMMODE_MG014)
 	; INITIALIZE 8255
 	LD	A,(IY+IMM_IOBASE)	; BASE PORT
 	ADD	A,IMM_IOSETUP		; BUMP TO SETUP PORT
@@ -234,6 +241,7 @@ IMM_DETECT:
 	LD	A,$82			; CONFIG A OUT, B IN, C OUT
 	OUT	(C),A			; DO IT
 	CALL	DELAY			; BRIEF DELAY FOR GOOD MEASURE
+#ENDIF
 ;
 	; ATTEMPT TO ESTABLISH A CONNECTION TO THE IMM DEVICE AND
 	; ISSUE A SCSI BUS RESET.  WE DON'T KNOW IF DEVICE IS THERE
@@ -334,6 +342,13 @@ IMM_IO:
 	JR	NZ,IMM_IO3		; BAIL OUT ON ERROR
 ;
 	LD	(IMM_DSKBUF),HL		; SAVE DISK BUFFER ADDRESS
+;
+#IF (DSKYENABLE)
+	LD	A,IMM_LBA
+	CALL	LDHLIYA
+	CALL	HB_DSKACT		; SHOW ACTIVITY
+#ENDIF
+;
 	; SETUP LBA
 	; 3 BYTES, LITTLE ENDIAN -> BIG ENDIAN
 	LD	HL,IMM_CMD_RW+1		; START OF LBA FIELD IN CDB (MSB)
@@ -346,10 +361,9 @@ IMM_IO:
 	LD	A,(IY+IMM_LBA+0)
 	LD	(HL),A
 	INC	HL
-;
 	; DO SCSI IO
 	LD	DE,(IMM_DSKBUF)		; DISK BUFFER TO DE
-	LD	BC,512			; ONE SECTOR, 512 BYTES
+	LD	A,1			; BLOCK I/O, ONE SECTOR
 	LD	HL,IMM_CMD_RW		; POINT TO READ/WRITE CMD TEMPLATE
 	CALL	IMM_RUNCMD		; RUN THE SCSI ENGINE
 	CALL	Z,IMM_CHKCMD		; IF EXIT OK, CHECK SCSI RESULTS
@@ -631,8 +645,7 @@ IMM_SELECT:
 #ENDIF
 	IMM_WCTL($0C)
 ;
-	LD	HL,500			; TIMEOUT COUNTER
-;
+	LD	B,0			; TIMEOUT COUNTER
 IMM_SELECT1:
 	CALL	IMM_READSTATUS
 #IF (IMMTRACE >= 3)
@@ -641,11 +654,8 @@ IMM_SELECT1:
 #ENDIF
 	AND	$08
 	JR	Z,IMM_SELECT2		; IF CLEAR, MOVE ON
-	DEC	HL
-	LD	A,H
-	OR	L
-	JP	Z,IMM_CMD_TIMEOUT	; TIMEOUT
-	JR	IMM_SELECT1
+	DJNZ	IMM_SELECT1
+	JP	IMM_CMD_TIMEOUT		; TIMEOUT
 ;
 IMM_SELECT2:
 	IMM_WCTL($04)
@@ -655,8 +665,7 @@ IMM_SELECT2:
 	IMM_WCTL($0C)
 	IMM_WCTL($0D)
 ;
-	LD	HL,500			; TIMEOUT COUNTER
-;
+	LD	B,0			; TIMEOUT COUNTER
 IMM_SELECT3:
 	CALL	IMM_READSTATUS
 #IF (IMMTRACE >= 3)
@@ -665,11 +674,8 @@ IMM_SELECT3:
 #ENDIF
 	AND	$08
 	JR	NZ,IMM_SELECT4		; IF SET, MOVE ON
-	DEC	HL
-	LD	A,H
-	OR	L
-	JP	Z,IMM_CMD_TIMEOUT	; TIMEOUT
-	JR	IMM_SELECT3
+	DJNZ	IMM_SELECT3
+	JP	IMM_CMD_TIMEOUT		; TIMEOUT
 ;
 IMM_SELECT4:
 	IMM_WCTL($0C)
@@ -754,10 +760,13 @@ IMM_WAIT:
 	AND	$B8
 	RET				; RETURN W/ RESULT IN A
 ;
-; MAX OBSERVED IMM_WAITLOOP ITERATIONS IS $0116B3
+; MAX OBSERVED WAITLOOP ITERATIONS IS $0116B3 @ 7.3728 MHZ ON MG014
+; MAX OBSERVED WAITLOOP ITERATIONS IS $028EFE @ 8.000 MHZ ON MBC SPP
 ;
 IMM_LONGWAIT:
-	LD	B,3			; VALUE???
+	LD	A,(CB_CPUMHZ)		; LOAD CPU SPEED IN MHZ
+	SRL	A			; DIVIDE BY 2, GOOD ENOUGH
+	LD	B,A			; USE FOR OUTER LOOP COUNT
 	IMM_WCTL($0C)
 IMM_LONGWAIT1:
 	LD	HL,0
@@ -845,21 +854,20 @@ IMM_GETBYTE:
 	RET
 ;
 ; GET A CHUNK OF DATA FROM SCSI BUS.  THIS IS SPECIFICALLY FOR
-; READ PHASE.  IF A LENGTH IS SPECIFIED (NON-ZERO HL), THEN THE
-; DATA IS BURST READ.  IF NO LENGTH SPECIFIED, DATA IS READ AS
-; LONG AS SCSI DEVICE WANTS TO CONTINUE SENDING (NO OVERRUN
+; READ PHASE.  IF TRANSFER MODE IS NON-ZERO, THEN A BLOCK (512 BYTES)
+; OF DATA WILL BE READ.  OTHERWISE, DATA IS WRITTEN AS
+; LONG AS SCSI DEVICE WANTS TO CONTINUE RECEIVING (NO OVERRUN
 ; CHECK IN THIS CASE).
 ;
 ; THIS IS A NIBBLE READ.
 ;
 ; DE=BUFFER
-; HL=LENGTH (0 FOR VARIABLE)
+; A=TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 IMM_GETDATA:
 	; BRANCH TO CORRECT ROUTINE
-	LD	A,H
-	OR	L			; IF ZERO
-	JR	NZ,IMM_GETDATALEN	; DO BURST READ
+	OR	A
+	JR	NZ,IMM_GETBLOCK		; DO BLOCK READ
 ;
 #IF (IMMTRACE >= 3)
 	PRTS("\r\nGETDATA:$")
@@ -871,7 +879,6 @@ IMM_GETDATA1:
 	POP	HL			; RESTORE BYTE COUNTER
 	CP	$98			; CHECK FOR READ PHASE
 	JR	NZ,IMM_GETDATA2		; IF NOT, ASSUME WE ARE DONE
-	IMM_WCTL($04)
 	IMM_WCTL($06)
 	CALL	IMM_READSTATUS		; GET FIRST NIBBLE
 	AND	$F0			; ISOLATE BITS
@@ -889,7 +896,6 @@ IMM_GETDATA1:
 	INC	DE			; NEXT BUFFER POS
 	INC	HL			; INCREMENT BYTES COUNTER
 	IMM_WCTL($04)
-	IMM_WCTL($0C)
 	JR	IMM_GETDATA1		; LOOP TILL DONE
 ;
 IMM_GETDATA2:
@@ -900,57 +906,112 @@ IMM_GETDATA2:
 	PRTS(" BYTES$")
 #ENDIF
 ;
-	RET
-;
-IMM_GETDATALEN:
-;
-#IF (IMMTRACE >= 3)
-	PRTS("\r\nGETDLEN:$")
-	CALL	PC_SPACE
-	CALL	PRTHEXWORDHL
-	PRTS(" BYTES$")
-#ENDIF
-;
-	IMM_WCTL($04)
-IMM_GETDATALEN1:
-	IMM_WCTL($06)
-	CALL	IMM_READSTATUS		; GET FIRST NIBBLE
-	AND	$F0			; ISOLATE BITS
-	RRCA				; MOVE TO LOW NIBBLE
-	RRCA
-	RRCA
-	RRCA
-	PUSH 	AF			; SAVE WORKING VALUE
-	IMM_WCTL($05)
-	CALL	IMM_READSTATUS		; GET SECOND NIBBLE
-	AND	$F0			; ISOLATE BITS
-	POP	BC			; RECOVER FIRST NIBBLE
-	OR	B			; COMBINE
-	LD	(DE),A			; SAVE FINAL BYTE VALUE
-	INC	DE			; NEXT BUFFER POS
-	DEC	HL			; DEC LOOP COUNTER
-	IMM_WCTL($04)
-	LD	A,H			; CHECK LOOP COUNTER
-	OR	L
-	JR	NZ,IMM_GETDATALEN1	; LOOP IF NOT DONE
 	IMM_WCTL($0C)
 	RET
 ;
+IMM_GETBLOCK:
+;
+#IF (IMMTRACE >= 3)
+	PRTS("\r\nGETBLK:$")
+#ENDIF
+;
+	IMM_WCTL($04)
+	LD	B,0			; LOOP COUNTER
+	EXX				; SWITCH TO ALT REGS
+	EX	AF,AF'			; SWITCH TO ALT AF
+	; SAVE ALT REGS
+	PUSH	AF
+	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+	; C: PORT C	
+	LD	A,(IY+IMM_IOBASE)	; BASE PORT
+	INC	A			; STATUS PORT
+	LD	(IMM_GETBLOCK_A),A	; FILL IN
+	LD	(IMM_GETBLOCK_B),A	; ... DYNAMIC BITS OF CODE
+	INC	A			; CONTROL PORT
+	LD	C,A			; ... TO C
+#IF (IMMMODE == IMMMODE_MG014)
+	; DE: CLOCK VALUES
+	LD	D,$06 ^ ($0B | $80)
+	LD	E,$05 ^ ($0B | $80)
+	; HL: STATMAP
+	LD	H,MG014_STATMAPLO >> 8
+#ENDIF
+#IF (IMMMODE == IMMMODE_SPP)
+	; DE: CLOCK VALUES
+	LD	D,$06
+	LD	E,$05
+#ENDIF
+	EXX				; SWITCH TO PRI REGS
+	EX	AF,AF'			; SWITCH TO PRI AF
+	CALL	IMM_GETBLOCK1		; LOOP TWICE
+	CALL	IMM_GETBLOCK1		; ... FOR 512 BYTES
+	; RESTORE ALT REGS
+	EXX				; SWITCH TO ALT REGS
+	EX	AF,AF'			; SWITCH TO ALT AF
+	POP	HL
+	POP	DE
+	POP	BC
+	POP	AF
+	EXX				; SWITCH TO PRI REGS
+	EX	AF,AF'			; SWITCH TO PRI AF
+	IMM_WCTL($0C)
+	RET
+;
+IMM_GETBLOCK1:
+	EXX				; ALT REGS
+	OUT	(C),D			; SEND FIRST CLOCK
+IMM_GETBLOCK_A	.EQU	$+1
+	IN	A,($FF)			; GET LOW NIBBLE
+#IF (IMMMODE == IMMMODE_MG014)
+	AND	$0F			; RELEVANT BITS ONLY
+	ADD	A,MG014_STATMAPLO & $FF	; LOW BYTE OF MAP PTR
+	LD	L,A			; PUT IN L
+	LD	A,(HL)			; LOOKUP LOW NIBBLE VALUE
+	EX	AF,AF'			; ALT AF, SAVE NIBBLE
+#ENDIF
+#IF (IMMMODE == IMMMODE_SPP)
+	AND	$F0			; RELEVANT BITS ONLY
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	LD	L,A			; SAVE NIBBLE IN L
+#ENDIF
+	OUT	(C),E			; SEND SECOND CLOCK
+IMM_GETBLOCK_B	.EQU	$+1
+	IN	A,($FF)			; GET HIGH NIBBLE
+#IF (IMMMODE == IMMMODE_MG014)
+	AND	$0F			; RELEVANT BITS ONLY
+	ADD	A,MG014_STATMAPHI & $FF	; HIGH BYTE OF MAP PTR
+	LD	L,A			; PUT IN L
+	EX	AF,AF'			; PRI AF, RECOVER LOW NIBBLE VALUE
+	OR	(HL)			; COMBINE WITH HIGH NIB VALUE
+#ENDIF
+#IF (IMMMODE == IMMMODE_SPP)
+	AND	$F0			; RELEVANT BITS ONLY
+	OR	L			; COMBINE WITH HIGH NIB VALUE
+#ENDIF
+	EXX				; SWITCH TO PRI REGS
+	LD	(DE),A			; SAVE BYTE
+	INC	DE			; BUMP BUF PTR
+	DJNZ	IMM_GETBLOCK1		; LOOP
+	RET				; DONE
+;
 ; PUT A CHUNK OF DATA TO THE SCSI BUS.  THIS IS SPECIFICALLY FOR
-; WRITE PHASE.  IF A LENGTH IS SPECIFIED (NON-ZERO HL), THEN THE
-; DATA IS BURST WRITTEN.  IF NO LENGTH SPECIFIED, DATA IS WRITTEN AS
+; WRITE PHASE.  IF TRANSFER MODE IS NON-ZERO, THEN A BLOCK (512 BYTES)
+; OF DATA WILL BE WRITTEN.  OTHERWISE, DATA IS WRITTEN AS
 ; LONG AS SCSI DEVICE WANTS TO CONTINUE RECEIVING (NO OVERRUN
 ; CHECK IN THIS CASE).
 ;
-; READS ARE DONE AS BYTE PAIRS.  EACH LOOP READS 2 BYTES.
-;
 ; DE=BUFFER
-; HL=LENGTH (0 FOR VARIABLE)
+; A=TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 IMM_PUTDATA:
-	LD	A,H
-	OR	L
-	JR	NZ,IMM_PUTDATALEN
+	; BRANCH TO CORRECT ROUTINE
+	OR	A
+	JR	NZ,IMM_PUTBLOCK		; DO BLOCK WRITE
 ;
 #IF (IMMTRACE >= 3)
 	PRTS("\r\nPUTDATA:$")
@@ -962,7 +1023,7 @@ IMM_PUTDATA1:
 	POP	HL			; RESTORE BYTE COUNTER
 	CP	$88			; CHECK FOR WRITE PHASE
 	JR	NZ,IMM_PUTDATA2		; IF NOT, ASSUME WE ARE DONE
-	IMM_WCTL($04)
+	;IMM_WCTL($04)
 	LD	A,(DE)			; GET NEXT BYTE TO WRITE (FIRST OF PAIR)
 	CALL	IMM_WRITEDATA		; PUT ON BUS
 	INC	DE			; BUMP TO NEXT BUF POS
@@ -986,33 +1047,47 @@ IMM_PUTDATA2:
 ;
 	RET
 ;
-IMM_PUTDATALEN:
+IMM_PUTBLOCK:
 ;
 #IF (IMMTRACE >= 3)
-	PRTS("\r\nPUTDLEN:$")
-	CALL	PC_SPACE
-	CALL	PRTHEXWORDHL
-	PRTS(" BYTES$")
+	PRTS("\r\nPUTBLK:$")
 #ENDIF
 ;
 	IMM_WCTL($04)
-IMM_PUTDATALEN1:
-	LD	A,(DE)			; GET NEXT BYTE (FIRST OF PAIR)
-	CALL	IMM_WRITEDATA		; PUT ON BUS
-	INC	DE			; INCREMENT BUF POS
-	DEC	HL			; DEC LOOP COUNTER
-	IMM_WCTL($05)
-	LD	A,(DE)			; GET NEXT BYTE (SECOND OF PAIR)
-	CALL	IMM_WRITEDATA		; PUT ON BUS
-	INC	DE			; INCREMENT BUF POS
-	DEC	HL			; DEC LOOP COUNTER
-	IMM_WCTL($00)
-	LD	A,H			; CHECK LOOP COUNTER
-	OR	L
-	JR	NZ,IMM_PUTDATALEN1	; LOOP TILL DONE
+	LD	B,0			; LOOP COUNTER
+	LD	A,(IY+IMM_IOBASE)	; GET BASE IO ADR
+	LD	(IMM_PUTBLOCK_A),A	; FILL IN
+	LD	(IMM_PUTBLOCK_B),A	; ... DYNAMIC BITS OF CODE
+	INC	A			; STATUS PORT
+	INC	A			; CONTROL PORT
+	LD	C,A			; ... TO C
+	; HL: CLOCK VALUES
+#IF (IMMMODE == IMMMODE_MG014)
+	LD	H,$05 ^ ($0B | $80)
+	LD	L,$00 ^ ($0B | $80)
+#ENDIF
+#IF (IMMMODE == IMMMODE_SPP)
+	LD	H,$05
+	LD	L,$00
+#ENDIF
+	CALL	IMM_PUTBLOCK1		; ONE LOOP CUZ BYTE PAIRS
 	IMM_WCTL($04)
 	RET
 ;
+IMM_PUTBLOCK1:
+	LD	A,(DE)			; GET NEXT BYTE
+IMM_PUTBLOCK_A	.EQU	$+1
+	OUT	($FF),A			; PUT ON BUS
+	INC	DE			; INCREMENT BUF POS
+	OUT	(C),H			; FIRST CLOCK
+	LD	A,(DE)			; GET NEXT BYTE
+IMM_PUTBLOCK_B	.EQU	$+1
+	OUT	($FF),A			; PUT ON BUS
+	INC	DE			; INCREMENT BUF POS
+	OUT	(C),L			; SECOND CLOCK
+	DJNZ	IMM_PUTBLOCK1		; LOOP
+	RET				; DONE
+;
 ; READ SCSI COMMAND STATUS
 ;
 IMM_GETSTATUS:
@@ -1056,7 +1131,7 @@ IMM_ENDREAD:
 ;
 ; HL: COMMAND BUFFER
 ; DE: TRANSFER BUFFER
-; BC: TRANSFER LENGTH (0=VARIABLE)
+; A: TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 IMM_RUNCMD:
 	; THERE ARE MANY PLACES NESTED WITHIN THE ROUTINES THAT
@@ -1065,7 +1140,7 @@ IMM_RUNCMD:
 	; SEE IMM_CMD_ERR BELOW.
 	LD	(IMM_CMDSTK),SP		; FOR ERROR ABORTS
 	LD	(IMM_DSKBUF),DE		; SAVE BUF PTR
-	LD	(IMM_XFRLEN),BC		; SAVE XFER LEN
+	LD	(IMM_XFRMODE),A		; SAVE XFER LEN
 	PUSH	HL
 	CALL	IMM_CONNECT		; PARALLEL PORT BUS CONNECT
 	CALL	IMM_SELECT		; SELECT TARGET DEVICE
@@ -1096,7 +1171,7 @@ IMM_RUNCMD_PHASE:
 ;
 IMM_RUNCMD_WRITE:
 	LD	DE,(IMM_DSKBUF)		; XFER BUFFER
-	LD	HL,(IMM_XFRLEN)		; XFER LENGTH
+	LD	A,(IMM_XFRMODE)		; XFER MODE
 	CALL	IMM_PUTDATA		; SEND DATA NOW
 	JR	IMM_RUNCMD_PHASE	; BACK TO DISPATCH
 ;
@@ -1105,7 +1180,7 @@ IMM_RUNCMD_READ:
 	CALL	IMM_WAIT		; WAIT TILL READY
 	; CHECK FOR STATUS $98???
 	LD	DE,(IMM_DSKBUF)		; XFER BUFFER
-	LD	HL,(IMM_XFRLEN)		; XFER LENGTH
+	LD	A,(IMM_XFRMODE)		; XFER MODE
 	CALL	IMM_GETDATA		; GET THE DATA NOW
 	CALL	IMM_ENDREAD		; TERMINATE THE READ
 	JR	IMM_RUNCMD_PHASE	; BACK TO DISPATCH
@@ -1162,7 +1237,7 @@ IMM_CHKCMD:
 IMM_CHKCMD1:
 	; USE REQUEST SENSE CMD TO GET ERROR DETAILS
 	LD	DE,HB_WRKBUF		; PUT DATA IN WORK BUF
-	LD	BC,0			; VARIABLE LENGTH REQUEST
+	LD	A,0			; VARIABLE LENGTH REQUEST
 	LD	HL,IMM_CMD_SENSE	; REQUEST SENSE CMD
 	CALL	IMM_RUNCMD		; DO IT
 	JP	NZ,IMM_IOERR		; BAIL IF ERROR IN CMD
@@ -1199,6 +1274,8 @@ IMM_CHKERR:
 ; (RE)INITIALIZE DEVICE
 ;
 IMM_INITDEV:
+;
+#IF (IMMMODE == IMMMODE_MG014)
 	; INITIALIZE 8255
 	LD	A,(IY+IMM_IOBASE)	; BASE PORT
 	ADD	A,IMM_IOSETUP		; BUMP TO SETUP PORT
@@ -1206,6 +1283,7 @@ IMM_INITDEV:
 	LD	A,$82			; CONFIG A OUT, B IN, C OUT
 	OUT	(C),A			; DO IT
 	CALL	DELAY			; SHORT DELAY FOR BUS SETTLE
+#ENDIF
 ;
 	CALL	IMM_DISCONNECT		; DISCONNECT FIRST JUST IN CASE
 	CALL	IMM_CONNECT		; NOW CONNECT TO BUS
@@ -1227,7 +1305,7 @@ IMM_INITDEV1:
 ;
 	; REQUEST SENSE COMMAND
 	LD	DE,HB_WRKBUF		; BUFFER FOR SENSE DATA
-	LD	BC,0			; READ WHATEVER IS SENT
+	LD	A,0			; READ WHATEVER IS SENT
 	LD	HL,IMM_CMD_SENSE	; POINT TO CMD BUFFER
 	CALL	IMM_RUNCMD		; RUN THE SCSI ENGINE
 	JR	NZ,IMM_INITDEV2		; CMD PROC ERROR
@@ -1257,7 +1335,7 @@ IMM_INITDEV2:
 IMM_INITDEV3:
 	; READ & RECORD DEVICE CAPACITY
 	LD	DE,HB_WRKBUF		; BUFFER TO CAPACITY RESPONSE
-	LD	BC,0			; READ WHATEVER IS SENT
+	LD	A,0			; READ WHATEVER IS SENT
 	LD	HL,IMM_CMD_RDCAP	; POINT TO READ CAPACITY CMD
 	CALL	IMM_RUNCMD		; RUN THE SCSI ENGINE
 	CALL	Z,IMM_CHKCMD		; CHECK AND RECORD ANY ERRORS
@@ -1420,7 +1498,7 @@ IMM_STR_NOHW		.TEXT	"NOT PRESENT$"
 IMM_DEVNUM	.DB	0		; TEMP DEVICE NUM USED DURING INIT
 IMM_CMDSTK	.DW	0		; STACK PTR FOR CMD ABORTING
 IMM_DSKBUF	.DW	0		; WORKING DISK BUFFER POINTER
-IMM_XFRLEN	.DW	0		; WORKING TRANSFER LENGTH
+IMM_XFRMODE	.DB	0		; 0=VARIABLE, 1=BLOCK (512 BYTES)
 IMM_CMDSTAT	.DB	0, 0		; CMD RESULT STATUS
 ;
 ; SCSI COMMAND TEMPLATES (LENGTH PREFIXED)

Source/HBIOS/ppa.asm

@@ -10,10 +10,13 @@
 ;
 ; CREATED BY WAYNE WARTHEN FOR ROMWBW HBIOS.
 ; MUCH OF THE CODE IS DERIVED FROM LINUX AND FUZIX (ALAN COX).
+; - https://github.com/EtchedPixels/FUZIX
+; - https://github.com/torvalds/linux
 ;
-; 5/23/2023 WBW - INITIAL RELEASE
-; 5/26/3023 WBW - CLEAN UP, LED ACTIVITY
-; 5/27/2023 WBW - ADDED SPP MODE
+; 05/23/2023 WBW - INITIAL RELEASE
+; 05/26/3023 WBW - CLEAN UP, LED ACTIVITY
+; 05/27/2023 WBW - ADDED SPP MODE
+; 06/06/2023 WBW - OPTIMIZE BLOCK READ AND WRITE
 ;
 ;=============================================================================
 ;
@@ -71,8 +74,6 @@
 ;
 ; TODO:
 ;
-; - OPTIMIZE READ/WRITE LOOPS
-;
 ; NOTES:
 ;
 ; - THIS DRIVER IS FOR THE ZIP DRIVE PPA INTERFACE.  IT WILL SIMPLY
@@ -80,13 +81,11 @@
 ;   THERE DOES NOT SEEM TO BE A WAY TO VISUALLY DETERMINE IF A ZIP
 ;   DRIVE IS PPA OR IMM.  SIGH.
 ;
-; - THERE ARE SOME HARD CODED TIMEOUT LOOPS IN THE CODE.  THEY ARE
-;   WORKING OK ON A 7 MHZ Z80.  THEY ARE LIKELY TO NEED TWEAKING ON
-;   FASTER CPUS.
-;
-; - THIS DRIVER OPERATES PURELY IN NIBBLE MODE.  I SUSPECT IT IS
-;   POSSIBLE TO USE FULL BYTE MODE (PS2 STYLE), BUT I HAVE NOT
-;   ATTEMPTED IT.
+; - THIS DRIVER OPERATES USES NIBBLE READ MODE.  ALTHOUGH THE 8255
+;   (MG014) CAN READ OR WRITE TO PORT A (DATA), IT "GLITCHES" WHEN
+;   THE MODE IS CHANGED CAUSING THE CONTROL LINES TO CHANGE AND
+;   BREAKS THE PROTOCOL.  I SUSPECT THE MBC SPP CAN SUPPORT FULL BYTE
+;   MODE, (PS2 STYLE), BUT I HAVE NOT ATTEMPTED IT.
 ;
 ; - RELATIVE TO ABOVE, THIS BEAST IS SLOW.  IN ADDITION TO THE
 ;   NIBBLE MODE READS, THE MG014 ASSIGNS SIGNALS DIFFERENTLY THAN
@@ -138,6 +137,12 @@ PPA_LBA		.EQU	8		; OFFSET OF LBA (DWORD)
 #DEFINE PPA_DPUL(VAL)	LD A,VAL \ CALL PPA_DPULSE
 #DEFINE PPA_CPUL(VAL)	LD A,VAL \ CALL PPA_CPULSE
 ;
+; INCLUDE MG014 NIBBLE MAP FOR MG014 MODE
+;
+#IF (IMMMODE == IMMMODE_MG014)
+  #DEFINE MG014_MAP
+#ENDIF
+;
 ;=============================================================================
 ; INITIALIZATION ENTRY POINT
 ;=============================================================================
@@ -194,7 +199,7 @@ PPA_INIT4:
 ;
 	CALL	PPA_RESET		; RESET/INIT THE INTERFACE
 #IF (PPATRACE <= 1)
-	CALL	PPA_PRTSTAT
+	CALL	NZ,PPA_PRTSTAT
 #ENDIF
 	JR	NZ,PPA_INIT6
 ;
@@ -231,6 +236,8 @@ PPA_DETECT:
 #IF (PPATRACE >= 3)
 	PRTS("\r\nDETECT:$")
 #ENDIF
+;
+#IF (PPAMODE == PPAMODE_MG014)
 	; INITIALIZE 8255
 	LD	A,(IY+PPA_IOBASE)	; BASE PORT
 	ADD	A,PPA_IOSETUP		; BUMP TO SETUP PORT
@@ -238,6 +245,7 @@ PPA_DETECT:
 	LD	A,$82			; CONFIG A OUT, B IN, C OUT
 	OUT	(C),A			; DO IT
 	CALL	DELAY			; BRIEF DELAY FOR GOOD MEASURE
+#ENDIF
 ;
 	PPA_WDATA($AA)
 	CALL	PPA_DISCONNECT
@@ -330,6 +338,13 @@ PPA_IO:
 	JR	NZ,PPA_IO3		; BAIL OUT ON ERROR
 ;
 	LD	(PPA_DSKBUF),HL		; SAVE DISK BUFFER ADDRESS
+;
+#IF (DSKYENABLE)
+	LD	A,PPA_LBA
+	CALL	LDHLIYA
+	CALL	HB_DSKACT		; SHOW ACTIVITY
+#ENDIF
+;
 	; SETUP LBA
 	; 3 BYTES, LITTLE ENDIAN -> BIG ENDIAN
 	LD	HL,PPA_CMD_RW+1		; START OF LBA FIELD IN CDB (MSB)
@@ -345,7 +360,7 @@ PPA_IO:
 ;
 	; DO SCSI IO
 	LD	DE,(PPA_DSKBUF)		; DISK BUFFER TO DE
-	LD	BC,512			; ONE SECTOR, 512 BYTES
+	LD	A,1			; BLOCK I/O, ONE SECTOR
 	LD	HL,PPA_CMD_RW		; POINT TO READ/WRITE CMD TEMPLATE
 	CALL	PPA_RUNCMD		; RUN THE SCSI ENGINE
 	CALL	Z,PPA_CHKCMD		; IF EXIT OK, CHECK SCSI RESULTS
@@ -599,21 +614,17 @@ PPA_SELECT:
 	CALL	PPA_WRITEDATA
 	PPA_WCTL($08)
 ;
-	LD	HL,500			; TIMEOUT COUNTER
-;
+	LD	B,0			; TIMEOUT COUNTER
 PPA_SELECT1:
-#IF (PPATRACE >= 3)
 	CALL	PPA_READSTATUS
+#IF (PPATRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
 	AND	$40
 	CP	$40
 	RET	Z
-	DEC	HL
-	LD	A,H
-	OR	L
-	JR	NZ,PPA_SELECT1
+	DJNZ	PPA_SELECT1
 	JP	PPA_CMD_TIMEOUT
 ;
 ; SEND SCSI CMD BYTE STRING.  AT ENTRY, HL POINTS TO START OF
@@ -659,8 +670,6 @@ PPA_SENDCMD1:
 	RET
 ;
 ;
-;
-;
 ; WAIT FOR SCSI BUS TO BECOME READY WITH A TIMEOUT.
 ;
 PPA_WAITLOOP:
@@ -677,31 +686,26 @@ PPA_WAIT:
 	LD	HL,500			; GOOD VALUE???
 	PPA_WCTL($0C)
 	CALL	PPA_WAITLOOP
-
-	;CALL	PC_SPACE
-	;CALL	PRTHEXBYTE
-
 	JP	Z,PPA_CMD_TIMEOUT	; HANDLE TIMEOUT
 	;PUSH	AF
-	;PPA_WCTL($04)
+	;IMM_WCTL($04)
 	;POP	AF
 	AND	$F0
 	RET				; RETURN W/ RESULT IN A
 ;
-; MAX OBSERVED PPA_WAITLOOP ITERATIONS IS $0116B3
+; MAX OBSERVED WAITLOOP ITERATIONS IS $0116B3 @ 7.372 MHZ ON MG014
+; MAX OBSERVED WAITLOOP ITERATIONS IS $028EFE @ 8.000 MHZ ON MBC SPP
 ;
 PPA_LONGWAIT:
-	LD	B,3			; VALUE???
+	LD	A,(CB_CPUMHZ)		; LOAD CPU SPEED IN MHZ
+	SRL	A			; DIVIDE BY 2, GOOD ENOUGH
+	LD	B,A			; USE FOR OUTER LOOP COUNT
 	PPA_WCTL($0C)
 PPA_LONGWAIT1:
 	LD	HL,0
 	CALL	PPA_WAITLOOP
 	JR	NZ,PPA_LONGWAIT2	; HANDLE SUCCESS
 	DJNZ	PPA_LONGWAIT1		; LOOP TILL COUNTER EXHAUSTED
-
-	;CALL	PC_SPACE
-	;CALL	PRTHEXBYTE
-
 	JP	PPA_CMD_TIMEOUT		; HANDLE TIMEOUT
 ;
 PPA_LONGWAIT2:
@@ -719,10 +723,6 @@ PPA_LONGWAIT2:
 #ENDIF
 ;
 	;POP	AF
-
-	;CALL	PC_SPACE
-	;CALL	PRTHEXBYTE
-
 	AND	$F0
 	RET				; RETURN W/ RESULT IN A
 ;
@@ -750,21 +750,20 @@ PPA_GETBYTE:
 	RET
 ;
 ; GET A CHUNK OF DATA FROM SCSI BUS.  THIS IS SPECIFICALLY FOR
-; READ PHASE.  IF A LENGTH IS SPECIFIED (NON-ZERO HL), THEN THE
-; DATA IS BURST READ.  IF NO LENGTH SPECIFIED, DATA IS READ AS
-; LONG AS SCSI DEVICE WANTS TO CONTINUE SENDING (NO OVERRUN
+; READ PHASE.  IF TRANSFER MODE IS NON-ZERO, THEN A BLOCK (512 BYTES)
+; OF DATA WILL BE READ.  OTHERWISE, DATA IS WRITTEN AS
+; LONG AS SCSI DEVICE WANTS TO CONTINUE RECEIVING (NO OVERRUN
 ; CHECK IN THIS CASE).
 ;
 ; THIS IS A NIBBLE READ.
 ;
 ; DE=BUFFER
-; HL=LENGTH (0 FOR VARIABLE)
+; A=TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 PPA_GETDATA:
 	; BRANCH TO CORRECT ROUTINE
-	LD	A,H
-	OR	L			; IF ZERO
-	JR	NZ,PPA_GETDATALEN	; DO BURST READ
+	OR	A
+	JR	NZ,PPA_GETBLOCK		; DO BLOCK READ
 ;
 #IF (PPATRACE >= 3)
 	PRTS("\r\nGETDATA:$")
@@ -805,53 +804,106 @@ PPA_GETDATA2:
 	PPA_WCTL($0C)
 	RET
 ;
-PPA_GETDATALEN:
+PPA_GETBLOCK:
 ;
 #IF (PPATRACE >= 3)
-	PRTS("\r\nGETDLEN:$")
-	CALL	PC_SPACE
-	CALL	PRTHEXWORDHL
-	PRTS(" BYTES$")
+	PRTS("\r\nGETBLK:$")
 #ENDIF
-;
-PPA_GETDATALEN1:
-	PPA_WCTL($04)
-	CALL	PPA_READSTATUS		; GET FIRST NIBBLE
-	AND	$F0			; ISOLATE BITS
-	PUSH 	AF			; SAVE WORKING VALUE
-	PPA_WCTL($06)
-	CALL	PPA_READSTATUS		; GET SECOND NIBBLE
-	AND	$F0			; ISOLATE BITS
-	RRCA				; MOVE TO LOW NIBBLE
-	RRCA
-	RRCA
-	RRCA
-	POP	BC			; RECOVER FIRST NIBBLE
-	OR	B			; COMBINE
-	LD	(DE),A			; SAVE FINAL BYTE VALUE
-	INC	DE			; NEXT BUFFER POS
-	DEC	HL			; DEC LOOP COUNTER
-	LD	A,H			; CHECK LOOP COUNTER
-	OR	L
-	JR	NZ,PPA_GETDATALEN1	; LOOP IF NOT DONE
-	PPA_WCTL($0C)
+	LD	B,0			; LOOP COUNTER
+	EXX				; SWITCH TO ALT
+	EX	AF,AF'			; SWITCH TO ALT AF
+	; SAVE ALT REGS
+	PUSH	AF
+	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+	; C: PORT C	
+	LD	A,(IY+PPA_IOBASE)	; BASE PORT
+	INC	A			; STATUS PORT
+	LD	(PPA_GETBLOCK_A),A	; FILL IN
+	LD	(PPA_GETBLOCK_B),A	; ... DYNAMIC BITS OF CODE
+	INC	A			; CONTROL PORT
+	LD	C,A			; ... TO C
+#IF (PPAMODE == PPAMODE_MG014)
+	; DE: CLOCK VALUES
+	LD	D,$04 ^ ($0B | $80)
+	LD	E,$06 ^ ($0B | $80)
+	; HL: STATMAP
+	LD	H,MG014_STATMAPLO >> 8
+#ENDIF
+#IF (PPAMODE == PPAMODE_SPP)
+	; DE: CLOCK VALUES
+	LD	D,$04
+	LD	E,$06
+#ENDIF
+	EXX				; SWITCH TO PRI
+	CALL	PPA_GETBLOCK1		; LOOP TWICE
+	CALL	PPA_GETBLOCK1		; ... FOR 512 BYTES
+	; RESTORE ALT REGS
+	EXX				; SWITCH TO ALT REGS
+	EX	AF,AF'			; SWITCH TO ALT AF
+	POP	HL
+	POP	DE
+	POP	BC
+	POP	AF
+	EXX				; SWITCH TO PRI REGS
+	EX	AF,AF'			; SWITCH TO PRI AF
 	RET
 ;
+;
+PPA_GETBLOCK1:
+	EXX				; ALT REGS
+	OUT	(C),D			; SEND FIRST CLOCK
+PPA_GETBLOCK_A	.EQU	$+1
+	IN	A,($FF)			; GET HIGH NIBBLE
+#IF (PPAMODE == PPAMODE_MG014)
+	AND	$0F			; RELEVANT BITS ONLY
+	ADD	A,MG014_STATMAPHI & $FF	; HIGH BYTE OF MAP PTR
+	LD	L,A			; PUT IN L
+	LD	A,(HL)			; LOOKUP HIGH NIBBLE VALUE
+	EX	AF,AF'			; SAVE NIBBLE
+#ENDIF
+#IF (PPAMODE == PPAMODE_SPP)
+	AND	$F0			; RELEVANT BITS ONLY
+	LD	L,A			; SAVE NIBBLE IN L
+#ENDIF
+	OUT	(C),E			; SEND SECOND CLOCK
+PPA_GETBLOCK_B	.EQU	$+1
+	IN	A,($FF)			; GET LOW NIBBLE
+#IF (PPAMODE == PPAMODE_MG014)
+	AND	$0F			; RELEVANT BITS ONLY
+	ADD	A,MG014_STATMAPLO & $FF	; LOW BYTE OF MAP PTR
+	LD	L,A			; PUT IN L
+	EX	AF,AF'			; RECOVER HIGH NIBBLE VALUE
+	OR	(HL)			; COMBINE WITH LOW NIB VALUE
+#ENDIF
+#IF (PPAMODE == PPAMODE_SPP)
+	AND	$F0			; RELEVANT BITS ONLY
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	RLCA				; MOVE TO LOW NIBBLE
+	OR	L			; COMBINE WITH HIGH NIB VALUE
+#ENDIF
+	EXX				; SWITCH TO PRI
+	LD	(DE),A			; SAVE BYTE
+	INC	DE			; BUMP BUF PTR
+	DJNZ	PPA_GETBLOCK1		; LOOP
+	RET				; DONE
+;
 ; PUT A CHUNK OF DATA TO THE SCSI BUS.  THIS IS SPECIFICALLY FOR
-; WRITE PHASE.  IF A LENGTH IS SPECIFIED (NON-ZERO HL), THEN THE
-; DATA IS BURST WRITTEN.  IF NO LENGTH SPECIFIED, DATA IS WRITTEN AS
+; WRITE PHASE.  IF TRANSFER MODE IS NON-ZERO, THEN A BLOCK (512 BYTES)
+; OF DATA WILL BE WRITTEN.  OTHERWISE, DATA IS WRITTEN AS
 ; LONG AS SCSI DEVICE WANTS TO CONTINUE RECEIVING (NO OVERRUN
 ; CHECK IN THIS CASE).
 ;
-; READS ARE DONE AS BYTE PAIRS.  EACH LOOP READS 2 BYTES.
-;
 ; DE=BUFFER
-; HL=LENGTH (0 FOR VARIABLE)
+; A=TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 PPA_PUTDATA:
-	LD	A,H
-	OR	L
-	JR	NZ,PPA_PUTDATALEN
+	; BRANCH TO CORRECT ROUTINE
+	OR	A
+	JR	NZ,PPA_PUTBLOCK		; DO BLOCK WRITE
 ;
 #IF (PPATRACE >= 3)
 	PRTS("\r\nPUTDATA:$")
@@ -882,27 +934,41 @@ PPA_PUTDATA2:
 ;
 	RET
 ;
-PPA_PUTDATALEN:
+PPA_PUTBLOCK:
 ;
 #IF (PPATRACE >= 3)
-	PRTS("\r\nPUTDLEN:$")
-	CALL	PC_SPACE
-	CALL	PRTHEXWORDHL
-	PRTS(" BYTES$")
+	PRTS("\r\nPUTBLK:$")
 #ENDIF
 ;
-PPA_PUTDATALEN1:
-	LD	A,(DE)			; GET NEXT BYTE (FIRST OF PAIR)
-	CALL	PPA_WRITEDATA		; PUT ON BUS
-	INC	DE			; INCREMENT BUF POS
-	DEC	HL			; DEC LOOP COUNTER
-	PPA_WCTL($0E)
-	PPA_WCTL($0C)
-	LD	A,H			; CHECK LOOP COUNTER
-	OR	L
-	JR	NZ,PPA_PUTDATALEN1	; LOOP TILL DONE
+	LD	B,0			; LOOP COUNTER
+	LD	A,(IY+PPA_IOBASE)	; GET BASE IO ADR
+	LD	(PPA_PUTBLOCK_A),A	; FILL IN
+	INC	A			; STATUS PORT
+	INC	A			; CONTROL PORT
+	LD	C,A			; ... TO C
+	; HL: CLOCK VALUES
+#IF (PPAMODE == PPAMODE_MG014)
+	LD	H,$0E ^ ($0B | $80)
+	LD	L,$0C ^ ($0B | $80)
+#ENDIF
+#IF (PPAMODE == PPAMODE_SPP)
+	LD	H,$0E
+	LD	L,$0C
+#ENDIF
+	CALL	PPA_PUTBLOCK1		; DO BELOW TWICE
+	CALL	PPA_PUTBLOCK1		; ... FOR 512 BYTES
 	RET
 ;
+PPA_PUTBLOCK1:
+	LD	A,(DE)			; GET NEXT BYTE
+PPA_PUTBLOCK_A	.EQU	$+1
+	OUT	($FF),A			; PUT ON BUS
+	INC	DE			; INCREMENT BUF POS
+	OUT	(C),H			; FIRST CLOCK
+	OUT	(C),L			; SECOND CLOCK
+	DJNZ	PPA_PUTBLOCK1		; LOOP
+	RET				; DONE
+;
 ; READ SCSI COMMAND STATUS
 ;
 PPA_GETSTATUS:
@@ -937,7 +1003,7 @@ PPA_GETSTATUS:
 ;
 ; HL: COMMAND BUFFER
 ; DE: TRANSFER BUFFER
-; BC: TRANSFER LENGTH (0=VARIABLE)
+; A: TRANSFER MODE (0=VARIABLE, 1=BLOCK)
 ;
 PPA_RUNCMD:
 	; THERE ARE MANY PLACES NESTED WITHIN THE ROUTINES THAT
@@ -946,7 +1012,7 @@ PPA_RUNCMD:
 	; SEE PPA_CMD_ERR BELOW.
 	LD	(PPA_CMDSTK),SP		; FOR ERROR ABORTS
 	LD	(PPA_DSKBUF),DE		; SAVE BUF PTR
-	LD	(PPA_XFRLEN),BC		; SAVE XFER LEN
+	LD	(PPA_XFRMODE),A		; SAVE XFER LEN
 	PUSH	HL
 	CALL	PPA_CONNECT		; PARALLEL PORT BUS CONNECT
 	CALL	PPA_SELECT		; SELECT TARGET DEVICE
@@ -977,24 +1043,18 @@ PPA_RUNCMD_PHASE:
 ;
 PPA_RUNCMD_WRITE:
 	LD	DE,(PPA_DSKBUF)		; XFER BUFFER
-	LD	HL,(PPA_XFRLEN)		; XFER LENGTH
+	LD	A,(PPA_XFRMODE)		; XFER MODE
 	CALL	PPA_PUTDATA		; SEND DATA NOW
 	JR	PPA_RUNCMD_PHASE	; BACK TO DISPATCH
 ;
 PPA_RUNCMD_READ:
-	;CALL	PPA_NEGOTIATE		; NEGOTIATE FOR READ
-	;CALL	PPA_WAIT		; WAIT TILL READY
 	LD	DE,(PPA_DSKBUF)		; XFER BUFFER
-	LD	HL,(PPA_XFRLEN)		; XFER LENGTH
+	LD	A,(PPA_XFRMODE)		; XFER MODE
 	CALL	PPA_GETDATA		; GET THE DATA NOW
-	;CALL	PPA_ENDREAD		; TERMINATE THE READ
 	JR	PPA_RUNCMD_PHASE	; BACK TO DISPATCH
 ;
 PPA_RUNCMD_END:
-	;CALL	PPA_NEGOTIATE		; NEGOTIATE FOR READ (STATUS)
-	;CALL	PPA_WAIT		; WAIT TILL READY
 	CALL	PPA_GETSTATUS		; READ STATUS BYTES
-	;CALL	PPA_ENDREAD		; TERMINATE THE READ
 	CALL	PPA_DISCONNECT		; PARALLEL PORT BUS DISCONNECT
 	XOR	A			; SIGNAL SUCCESS
 	RET
@@ -1041,7 +1101,7 @@ PPA_CHKCMD:
 PPA_CHKCMD1:
 	; USE REQUEST SENSE CMD TO GET ERROR DETAILS
 	LD	DE,HB_WRKBUF		; PUT DATA IN WORK BUF
-	LD	BC,0			; VARIABLE LENGTH REQUEST
+	LD	A,0			; VARIABLE LENGTH READ
 	LD	HL,PPA_CMD_SENSE	; REQUEST SENSE CMD
 	CALL	PPA_RUNCMD		; DO IT
 	JP	NZ,PPA_IOERR		; BAIL IF ERROR IN CMD
@@ -1078,6 +1138,8 @@ PPA_CHKERR:
 ; (RE)INITIALIZE DEVICE
 ;
 PPA_INITDEV:
+;
+#IF (PPAMODE == PPAMODE_MG014)
 	; INITIALIZE 8255
 	LD	A,(IY+PPA_IOBASE)	; BASE PORT
 	ADD	A,PPA_IOSETUP		; BUMP TO SETUP PORT
@@ -1085,6 +1147,7 @@ PPA_INITDEV:
 	LD	A,$82			; CONFIG A OUT, B IN, C OUT
 	OUT	(C),A			; DO IT
 	CALL	DELAY			; SHORT DELAY FOR BUS SETTLE
+#ENDIF
 ;
 	; BUS RESET
 	CALL	PPA_CONNECT
@@ -1106,7 +1169,7 @@ PPA_INITDEV1:
 ;
 	; REQUEST SENSE COMMAND
 	LD	DE,HB_WRKBUF		; BUFFER FOR SENSE DATA
-	LD	BC,0			; READ WHATEVER IS SENT
+	LD	A,0			; READ WHATEVER IS SENT
 	LD	HL,PPA_CMD_SENSE	; POINT TO CMD BUFFER
 	CALL	PPA_RUNCMD		; RUN THE SCSI ENGINE
 	JR	NZ,PPA_INITDEV2		; CMD PROC ERROR
@@ -1131,7 +1194,7 @@ PPA_INITDEV2:
 PPA_INITDEV3:
 	; READ & RECORD DEVICE CAPACITY
 	LD	DE,HB_WRKBUF		; BUFFER TO CAPACITY RESPONSE
-	LD	BC,0			; READ WHATEVER IS SENT
+	LD	A,0			; READ WHATEVER IS SENT
 	LD	HL,PPA_CMD_RDCAP	; POINT TO READ CAPACITY CMD
 	CALL	PPA_RUNCMD		; RUN THE SCSI ENGINE
 	CALL	Z,PPA_CHKCMD		; CHECK AND RECORD ANY ERRORS
@@ -1295,7 +1358,7 @@ PPA_STR_NOHW		.TEXT	"NOT PRESENT$"
 PPA_DEVNUM	.DB	0		; TEMP DEVICE NUM USED DURING INIT
 PPA_CMDSTK	.DW	0		; STACK PTR FOR CMD ABORTING
 PPA_DSKBUF	.DW	0		; WORKING DISK BUFFER POINTER
-PPA_XFRLEN	.DW	0		; WORKING TRANSFER LENGTH
+PPA_XFRMODE	.DB	0		; 0=VARIABLE, 1=BLOCK (512 BYTES)
 PPA_CMDSTAT	.DB	0, 0		; CMD RESULT STATUS
 ;
 ; SCSI COMMAND TEMPLATES (LENGTH PREFIXED)

Source/HBIOS/ppide.asm

@@ -5,6 +5,7 @@
 ;
 ; TODO:
 ; - GOPARTNER NEEDS TO HANDLE "NO PARTNER" CONDITION
+; - DATA TRANSFERS LIMITED TO 512 BYTES WHICH IS INSUFFICIENT FOR CD=ROM MEDIA
 ;
 ; NOTES:
 ;  - WELL KNOWN PPIDE PORT ADDRESSES:
@@ -135,6 +136,8 @@ PPIDE_REG_LBA0		.EQU	PPIDE_CTL_CS1 | $03	; LBA BYTE 0 (BITS 0-7) (R/W)
 PPIDE_REG_LBA1		.EQU	PPIDE_CTL_CS1 | $04	; LBA BYTE 1 (BITS 8-15) (R/W)
 PPIDE_REG_LBA2		.EQU	PPIDE_CTL_CS1 | $05	; LBA BYTE 2 (BITS 16-23) (R/W)
 PPIDE_REG_LBA3		.EQU	PPIDE_CTL_CS1 | $06	; LBA BYTE 3 (BITS 24-27) (R/W)
+PPIDE_REG_BCL		.EQU	PPIDE_CTL_CS1 | $04	; PKT BYTE COUNT LOW (BITS 0-7) (R/W)
+PPIDE_REG_BCH		.EQU	PPIDE_CTL_CS1 | $05	; PKT BYTE COUNT HIGH (BITS 8-15) (R/W)
 PPIDE_REG_STAT		.EQU	PPIDE_CTL_CS1 | $07	; STATUS REGISTER (R)
 PPIDE_REG_CMD		.EQU	PPIDE_CTL_CS1 | $07	; COMMAND REGISTER (EXECUTE) (W)
 PPIDE_REG_ALTSTAT	.EQU	PPIDE_CTL_CS3 | $06	; ALTERNATE STATUS REGISTER (R)
@@ -143,13 +146,14 @@ PPIDE_REG_DRVADR	.EQU	PPIDE_CTL_CS3 | $07	; DRIVE ADDRESS REGISTER (R)
 ;
 ; COMMAND BYTES
 ;
-PPIDE_CIDE_NOP		.EQU	$00
-PPIDE_CIDE_DEVRES	.EQU	$08
+PPIDE_CMD_NOP		.EQU	$00
+PPIDE_CMD_DEVRES	.EQU	$08
 PPIDE_CMD_RECAL		.EQU	$10
 PPIDE_CMD_READ		.EQU	$20
 PPIDE_CMD_WRITE		.EQU	$30
-PPIDE_CIDE_DEVDIAG	.EQU	$90
-PPIDE_CIDE_IDPKTDEV	.EQU	$A1
+PPIDE_CMD_DEVDIAG	.EQU	$90
+PPIDE_CMD_PACKET	.EQU	$A0
+PPIDE_CMD_IDPKTDEV	.EQU	$A1
 PPIDE_CMD_IDDEV		.EQU	$EC
 PPIDE_CMD_SETFEAT	.EQU	$EF
 ;
@@ -175,6 +179,7 @@ PPIDE_STRDYTO	.EQU	-5
 PPIDE_STDRQTO	.EQU	-6
 PPIDE_STBSYTO	.EQU	-7
 PPIDE_STNOTSUP	.EQU	-8
+PPIDE_STNOTRDY	.EQU	-9
 ;
 ; DRIVE SELECTION BYTES (FOR USE IN DRIVE/HEAD REGISTER)
 ;
@@ -407,10 +412,6 @@ PPIDE_INIT5:
 	JP	NZ,PPIDE_PRTSTATSTR	; EXIT VIA PRINT STATUS STRING
 ;
 PPIDE_INIT6:
-	LD	A,(IY+PPIDE_TYPE)	; GET DEVICE TYPE
-	CP	PPIDE_TYPEATA		; ATA?
-	RET	NZ			; IF NOT, THEN DONE
-;
 	LD	DE,PPIDE_STR_8BIT
 	BIT	1,(IY+PPIDE_ACC)	; 8 BIT ACCESS?
 	CALL	NZ,WRITESTR
@@ -526,12 +527,12 @@ PPIDE_IO:
 	PUSH	HL			; ... TO FILTER ALL EXITS
 #ENDIF
 	PUSH	BC			; SAVE COUNTERS
-	CALL	PPIDE_SELUNIT		; HARDWARE SELECTION OF TARGET UNIT
 	CALL	PPIDE_CHKERR		; CHECK FOR ERR STATUS AND RESET IF SO
 	POP	BC			; RESTORE COUNTERS
 	JR	NZ,PPIDE_IO3		; BAIL OUT ON ERROR
 PPIDE_IO1:
 	PUSH	BC			; SAVE COUNTERS
+	CALL	PPIDE_SELUNIT		; HARDWARE SELECTION OF TARGET UNIT
 	LD	HL,(PPIDE_IOFNADR)	; GET PENDING IO FUNCTION ADDRESS
 	CALL	JPHL			; ... AND CALL IT
 	JR	NZ,PPIDE_IO2		; IF ERROR, SKIP INCREMENT
@@ -644,8 +645,6 @@ PPIDE_GEOM:
 ; FUNCTION SUPPORT ROUTINES
 ;=============================================================================
 ;
-;
-;
 PPIDE_SETFEAT:
 	PUSH	AF
 #IF (PPIDETRACE >= 3)
@@ -674,32 +673,6 @@ PPIDE_SETFEAT:
 ;
 ;
 ;
-PPIDE_NOP:
-#IF (PPIDETRACE >= 3)
-	CALL	PPIDE_PRTPREFIX
-	PRTS(" NOP$")
-#ENDIF
-	LD	A,(PPIDE_DRVHD)
-	;OUT	(PPIDE_IO_DRVHD),A
-	CALL	PPIDE_OUT
-	.DB	PPIDE_REG_DRVHD
-#IF (PPIDETRACE >= 3)
-	CALL	PC_SPACE
-	CALL	PRTHEXBYTE
-#ENDIF
-;
-	; EXECUTE THE NOP COMMAND, BUT DON'T WAIT FOR DRDY, JUST
-	; MAKE SURE BUSY IS CLEAR.  THIS COMMAND IS USED DURING
-	; DEVICE DETECTION/INITIALIZATION AND ATAPI DEVICES WILL
-	; NOT ASSERT DRDY AFTER RESET.
-	LD	A,PPIDE_CIDE_NOP	; CMD = NOP
-	LD	(PPIDE_CMD),A		; SAVE IT
-	CALL	PPIDE_WAITBSY
-	RET	NZ
-	JP	PPIDE_RUNCMD1		; RUN COMMAND AND EXIT
-;
-;
-;
 PPIDE_IDENTIFY:
 #IF (PPIDETRACE >= 3)
 	CALL	PPIDE_PRTPREFIX
@@ -715,8 +688,13 @@ PPIDE_IDENTIFY:
 #ENDIF
 	LD	A,PPIDE_CMD_IDDEV
 	LD	(PPIDE_CMD),A
-	CALL	PPIDE_RUNCMD
+	CALL	PPIDE_RUNCMD_ND
 	RET	NZ
+;
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_STAT
+	BIT	3,A			; IS DRQ SET?
+	JP	Z,PPIDE_NOMEDIA
 ;
 	LD	HL,HB_WRKBUF
 	JP	PPIDE_GETBUF		; EXIT THRU BUFRD
@@ -729,21 +707,21 @@ PPIDE_IDENTIFYPACKET:
 	PRTS(" IDPKTDEV$")
 #ENDIF
 	LD	A,(PPIDE_DRVHD)
-	;OUT	(PPIDE_IO_DRVHD),A
+	;OUT	(PPIDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
 #IF (PPIDETRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
 #ENDIF
-	LD	A,PPIDE_CIDE_IDPKTDEV
+	LD	A,PPIDE_CMD_IDPKTDEV
 	LD	(PPIDE_CMD),A
-	CALL	PPIDE_RUNCMD
+	CALL	PPIDE_RUNCMD_ND
 	RET	NZ
 ;
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
-	BIT	6,A			; IS DRQ SET?
+	BIT	3,A			; IS DRQ SET?
 	JP	Z,PPIDE_NOMEDIA
 ;
 	LD	HL,HB_WRKBUF
@@ -751,6 +729,33 @@ PPIDE_IDENTIFYPACKET:
 ;
 ;
 ;
+PPIDE_PACKET:
+#IF (PPIDETRACE >= 3)
+	CALL	PPIDE_PRTPREFIX
+	PRTS(" PACKET$")
+#ENDIF
+	LD	A,(PPIDE_DRVHD)
+	;OUT	(PPIDE_REG_DRVHD),A
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_DRVHD
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	XOR	A			; ZERO
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_FEAT		; FEATURE REG = 0
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_BCL
+	LD	A,8
+	CALL	PPIDE_OUT
+	.DB	PPIDE_REG_BCH		; BYTE COUNT = 512????
+	LD	A,PPIDE_CMD_PACKET
+	LD	(PPIDE_CMD),A
+	JP	PPIDE_RUNCMD_ND
+;
+;
+;
 PPIDE_RDSEC:
 ;
 #IF (PPIDETRACE >= 3)
@@ -764,6 +769,17 @@ PPIDE_RDSEC:
 #IF (PPIDETRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
+#ENDIF
+	LD	A,(IY+PPIDE_TYPE)
+	CP	PPIDE_TYPEATA
+	JR	Z,PPIDE_ATA_RDSEC
+	CP	PPIDE_TYPEATAPI
+	JR	Z,PPIDE_PKT_RDSEC
+	JP	PPIDE_CMDERR
+;
+PPIDE_ATA_RDSEC:
+#IF (PPIDETRACE >= 3)
+	PRTS(" ATA$")
 #ENDIF
 	CALL	PPIDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,PPIDE_CMD_READ
@@ -773,6 +789,31 @@ PPIDE_RDSEC:
 	LD	HL,(PPIDE_DSKBUF)
 	JP	PPIDE_GETBUF
 ;
+PPIDE_PKT_RDSEC:
+#IF (PPIDETRACE >= 3)
+	PRTS(" PKT$")
+#ENDIF
+	; SETUP LBA
+	; 3 BYTES, LITTLE ENDIAN -> BIG ENDIAN
+	LD	HL,PPIDE_PKTCMD_RW10+3	; START OF LBA FIELD IN CDB (MSB)
+	LD	A,(IY+PPIDE_LBA+2)	; THIRD BYTE OF LBA FIELD IN CFG (MSB)
+	LD	(HL),A
+	INC	HL
+	LD	A,(IY+PPIDE_LBA+1)
+	LD	(HL),A
+	INC	HL
+	LD	A,(IY+PPIDE_LBA+0)
+	LD	(HL),A
+	INC	HL
+	LD	HL,PPIDE_PKTCMD_RW10
+	LD	A,SCSI_CMD_READ10
+	LD	(HL),A
+	XOR	A			; READ DIRECTION
+	LD	(PPIDE_XFRDIR),A	; SAVE IT
+	CALL	PPIDE_RUNPCMD
+	JP	NZ,PPIDE_CHKPCMD
+	RET
+;
 ;
 ;
 PPIDE_WRSEC:
@@ -788,6 +829,17 @@ PPIDE_WRSEC:
 #IF (PPIDETRACE >= 3)
 	CALL	PC_SPACE
 	CALL	PRTHEXBYTE
+#ENDIF
+	LD	A,(IY+PPIDE_TYPE)
+	CP	PPIDE_TYPEATA
+	JR	Z,PPIDE_ATA_WRSEC
+	CP	PPIDE_TYPEATAPI
+	JR	Z,PPIDE_PKT_WRSEC
+	JP	PPIDE_CMDERR
+;
+PPIDE_ATA_WRSEC:
+#IF (PPIDETRACE >= 3)
+	PRTS(" ATA$")
 #ENDIF
 	CALL	PPIDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,PPIDE_CMD_WRITE
@@ -797,6 +849,31 @@ PPIDE_WRSEC:
 	LD	HL,(PPIDE_DSKBUF)
 	JP	PPIDE_PUTBUF
 ;
+PPIDE_PKT_WRSEC:
+#IF (PPIDETRACE >= 3)
+	PRTS(" PKT$")
+#ENDIF
+	; SETUP LBA
+	; 3 BYTES, LITTLE ENDIAN -> BIG ENDIAN
+	LD	HL,PPIDE_PKTCMD_RW10+3	; START OF LBA FIELD IN CDB (MSB)
+	LD	A,(IY+PPIDE_LBA+2)	; THIRD BYTE OF LBA FIELD IN CFG (MSB)
+	LD	(HL),A
+	INC	HL
+	LD	A,(IY+PPIDE_LBA+1)
+	LD	(HL),A
+	INC	HL
+	LD	A,(IY+PPIDE_LBA+0)
+	LD	(HL),A
+	INC	HL
+	LD	HL,PPIDE_PKTCMD_RW10
+	LD	A,SCSI_CMD_WRITE10
+	LD	(HL),A
+	OR	$FF			; WRITE DIRECTION
+	LD	(PPIDE_XFRDIR),A	; SAVE IT
+	CALL	PPIDE_RUNPCMD
+	JP	NZ,PPIDE_CHKPCMD
+	RET
+;
 ;
 ;
 PPIDE_SETADDR:
@@ -807,8 +884,8 @@ PPIDE_SETADDR:
 	CALL	HB_DSKACT		; SHOW ACTIVITY
 #ENDIF
 	; SEND 3 LOWEST BYTES OF LBA IN REVERSE ORDER
-	; IDE_IO_LBA3 HAS ALREADY BEEN SET
-	; HSTLBA2-0 --> IDE_IO_LBA2-0
+	; IDE_REG_LBA3 HAS ALREADY BEEN SET
+	; HSTLBA2-0 --> IDE_REG_LBA2-0
 	LD	A,(IY+PPIDE_LBA+2)
 #IF (PPIDETRACE >= 3)
 	CALL	PC_SPACE
@@ -847,6 +924,16 @@ PPIDE_SETADDR:
 ; COMMAND PROCESSING
 ;=============================================================================
 ;
+; RUN AN ATA COMMAND.  THERE ARE TWO ENTRY POINTS.  THE NORMAL ENTRY
+; POINT WILL WAIT FOR DRIVE READY.  THE _ND ENTRY POINT ONLY WAITS
+; FOR THE DEVICE TO BE NOT BUSY.  THE CORRECT ENTRY POINT DEPENDS ON
+; THE COMMAND.
+;
+PPIDE_RUNCMD_ND:
+	CALL	PPIDE_WAITBSY		; WAIT WHILE DEVICE BUSY
+	RET	NZ			; BAIL OUT ON TIMEOUT
+	JR	PPIDE_RUNCMD1		; CONTINUE
+
 PPIDE_RUNCMD:
 	CALL	PPIDE_WAITRDY		; WAIT FOR DRIVE READY
 	RET	NZ			; BAIL OUT ON TIMEOUT
@@ -871,54 +958,153 @@ PPIDE_RUNCMD1:
 	JP	NZ,PPIDE_CMDERR
 	RET
 ;
+; PACKET COMMAND PROCESSOR
+; HL: ADDRESS OF PACKET COMMAND BUFFER
 ;
+PPIDE_RUNPCMD:
+	PUSH	HL
+	CALL	PPIDE_PACKET
+	POP	HL
+	RET	NZ			; BAIL OUT ON ERROR
+;
+#IF (PPIDETRACE >= 3)
+	PRTS("\r\nPKTCMD:$")
+	PUSH	HL
+	POP	DE
+	LD	A,12
+	CALL	PRTHEXBUF
+#ENDIF
+;
+	; IF ZIP DRIVE HAS FALLEN ASLEEP, THEN IT WILL NEED EXTRA
+	; TIME HERE TO WAKE UP BEFORE ACCEPTING THE COMMAND.  USE
+	; LONG TIMEOUT TO ACCOMMODATE THIS.
+	LD	DE,(PPIDE_TIMEOUT)	; GET CURRENT TIMEOUT
+	PUSH	DE			; SAVE IT
+	LD	DE,PPIDE_TOSLOW		; SLOW TIMEOUT FOR THIS
+	LD	(PPIDE_TIMEOUT),DE	; SET IT
+	LD	B,6			; 6 WORDS ALWAYS
+	CALL	PPIDE_PUT
+	POP	DE			; RECOVER TIMEOUT
+	LD	(PPIDE_TIMEOUT),DE	; SET IT
+	RET	NZ
+;
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_STAT
+	BIT	3,A			; IS DRQ SET?
+	RET	Z			; IF NOT, ALL DONE
+;
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_BCL
+	LD	C,A
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_BCH
+	LD	B,A
+;
+	; BELOW ASSUMES MAX TRANSFER OF 512 BYTES!!!
+	PUSH	BC			; SAVE BYTE COUNT
+	SRL	B			; CONVERT
+	RR	C			; ... TO WORDS
+	LD	B,C
+	;LD	HL,HB_WRKBUF		; SET XFR BUFFER
+	LD	HL,(PPIDE_DSKBUF)	; SET XFR BUFFER
+	
+	LD	A,(PPIDE_XFRDIR)
+	OR	A
+	JR	NZ,PPIDE_RUNPCMD2	; NZ = WRITE
+	CALL	PPIDE_GET		; GET SOME DATA
+	JR	PPIDE_RUNPCMD3
+PPIDE_RUNPCMD2:
+	CALL	PPIDE_PUT		; PUT SOME DATA
+PPIDE_RUNPCMD3:
+	POP	BC			; RESTORE BYTE COUNT
+	RET	NZ			; BAIL OUT ON ERRORS
+;
+	XOR	A
+	RET
+;
+; THE FOLLOWING IS USED TO ASSESS ANY ERROR THAT OCCURS DURING
+; RUNCMD AND SET AN APPROPRIATE ERROR CODE.
+;
+PPIDE_CHKPCMD:
+;
+	LD	HL,HB_WRKBUF
+	LD	(PPIDE_DSKBUF),HL
+	LD	HL,PPIDE_PKTCMD_SENSE
+	CALL	PPIDE_RUNPCMD
+	RET	NZ
+;
+	CALL	PPIDE_IN
+	.DB	PPIDE_REG_BCL
+;
+#IF (PPIDETRACE >= 3)
+	CALL	NEWLINE
+	LD	DE,HB_WRKBUF
+	CALL	PRTHEXBUF
+#ENDIF
+;
+	; ASSESS SENSE DATA AND SET APPROPRIATE ERROR
+	LD	A,(HB_WRKBUF+12)
+	CP	$3A
+	JP	Z,PPIDE_NOMEDIA
+	CP	$04
+	JP	Z,PPIDE_NOTRDY
+;
+	JP	PPIDE_CMDERR
+;
+; HL=BUFFER
 ;
 PPIDE_GETBUF:
+	LD	B,0
+	; FALL THRU!!!
+;
+; HL=BUFFER
+; B=WORD COUNT, 0=256
+;
+PPIDE_GET:
 #IF (PPIDETRACE >= 3)
-	PRTS(" GETBUF$")
+	PRTS(" GET$")
 #ENDIF
 ;
 	; WAIT FOR BUFFER
+	PUSH	BC
+	PUSH	HL
 	CALL	PPIDE_WAITDRQ		; WAIT FOR BUFFER READY
+	POP	HL
+	POP	BC
 	RET	NZ			; BAIL OUT IF TIMEOUT
 ;
 	; SETUP PPI TO READ
 	LD	A,PPIDE_DIR_READ	; SET DATA BUS DIRECTION TO READ
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD
 	OUT	(C),A			; WRITE IT
 ;
 	; SELECT READ/WRITE IDE REGISTER
 	LD	A,PPIDE_REG_DATA	; DATA REGISTER
-	;OUT	(PPIDE_IO_CTL),A	; DO IT
+	;OUT	(PPIDE_REG_CTL),A	; DO IT
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
 	OUT	(C),A			; DO IT
 	LD	E,A			; E := READ UNASSERTED
 	XOR	PPIDE_CTL_DIOR		; SWAP THE READ LINE BIT
 	LD	D,A			; D := READ ASSERTED
 ;
-	; LOOP SETUP
-	XOR	A			; IMPORTANT, NEEDED FOR LOOP END COMPARISON
-	LD	B,0			; 256 ITERATIONS
+	LD	A,B			; LOOP COUNTER IN A
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
-;
 	BIT	1,(IY+PPIDE_ACC)	; 8 BIT?
-	JR	Z,PPIDE_GETBUF1		; IF NOT, DO 16 BIT
-	CALL	PPIDE_GETBUF8		; FIRST PASS (FIRST 256 BYTES)
-	CALL	PPIDE_GETBUF8		; SECOND PASS (LAST 256 BYTES)
-	JR	PPIDE_GETBUF2		; CONTINUE
-PPIDE_GETBUF1:
-	CALL	PPIDE_GETBUF16		; FIRST PASS (FIRST 256 BYTES)
-	CALL	PPIDE_GETBUF16		; SECOND PASS (LAST 256 BYTES)
-PPIDE_GETBUF2:
+	JR	Z,PPIDE_GET1		; IF NOT, DO 16 BIT
+	CALL	PPIDE_GET8		; 8-BIT READ
+	JR	PPIDE_GET2		; CONTINUE
+PPIDE_GET1:
+	CALL	PPIDE_GET16		; 16-0BIT READ
+PPIDE_GET2:
 	CALL	PPIDE_WAITRDY		; PROBLEMS IF THIS IS REMOVED!
 	RET	NZ
 	CALL	PPIDE_GETRES
 	JP	NZ,PPIDE_IOERR
 	RET
 ;
-PPIDE_GETBUF8:	; 8 BIT WIDE READ LOOP
-	; ENTER W/ C = PPIDE_IO_CTL
+PPIDE_GET8:	; 8 BIT WIDE READ LOOP
+	; ENTER W/ C = PPIDE_REG_CTL
 	OUT	(C),D			; ASSERT READ
 	DEC	C			; CTL -> MSB
 	DEC	C			; MSB -> LSB
@@ -926,12 +1112,19 @@ PPIDE_GETBUF8:	; 8 BIT WIDE READ LOOP
 	INC	C			; LSB -> MSB
 	INC	C			; MSB -> CTL
 	OUT	(C),E			; DEASSERT READ
-	CP	B			; B == A == 0?
-	JR	NZ,PPIDE_GETBUF8	; LOOP UNTIL DONE
+	OUT	(C),D			; ASSERT READ
+	DEC	C			; CTL -> MSB
+	DEC	C			; MSB -> LSB
+	INI				; READ FROM LSB
+	INC	C			; LSB -> MSB
+	INC	C			; MSB -> CTL
+	OUT	(C),E			; DEASSERT READ
+	DEC	A
+	JR	NZ,PPIDE_GET8		; LOOP UNTIL DONE
 	RET
 ;
-PPIDE_GETBUF16:	; 16 BIT WIDE READ LOOP
-	; ENTER W/ C = PPIDE_IO_CTL
+PPIDE_GET16:	; 16 BIT WIDE READ LOOP
+	; ENTER W/ C = PPIDE_REG_CTL
 	OUT	(C),D			; ASSERT READ
 	DEC	C			; CTL -> MSB
 	DEC	C			; MSB -> LSB
@@ -940,30 +1133,41 @@ PPIDE_GETBUF16:	; 16 BIT WIDE READ LOOP
 	INI				; READ MSB FOR 16 BIT
 	INC	C			; MSB -> CTL
 	OUT	(C),E			; DEASSERT READ
-	CP	B			; B == A == 0?
-	JR	NZ,PPIDE_GETBUF16	; LOOP UNTIL DONE
+	DEC	A
+	JR	NZ,PPIDE_GET16		; LOOP UNTIL DONE
 	RET
 ;
-;
+; HL=BUFFER
 ;
 PPIDE_PUTBUF:
+	LD	B,0
+	; FALL THRU!!!
+;
+; HL=BUFFER
+; B=WORD COUNT, 0=256
+;
+PPIDE_PUT:
 #IF (PPIDETRACE >= 3)
-	PRTS(" PUTBUF$")
+	PRTS(" PUT$")
 #ENDIF
 ;
 	; WAIT FOR BUFFER
+	PUSH	BC
+	PUSH	HL
 	CALL	PPIDE_WAITDRQ		; WAIT FOR BUFFER READY
+	POP	HL
+	POP	BC
 	RET	NZ			; BAIL OUT IF TIMEOUT
 ;
 	; SETUP PPI TO WRITE
 	LD	A,PPIDE_DIR_WRITE	; SET DATA BUS DIRECTION TO WRITE
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD
 	OUT	(C),A			; WRITE IT
 ;
 	; SELECT READ/WRITE IDE REGISTER
 	LD	A,PPIDE_REG_DATA	; DATA REGISTER
-	;OUT	(PPIDE_IO_CTL),A	; DO IT
+	;OUT	(PPIDE_REG_CTL),A	; DO IT
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
 	OUT	(C),A			; DO IT
 	LD	E,A			; E := WRITE UNASSERTED
@@ -971,26 +1175,22 @@ PPIDE_PUTBUF:
 	LD	D,A			; D := WRITE ASSERTED
 ;
 	; LOOP SETUP
-	XOR	A			; IMPORTANT, NEEDED FOR LOOP END COMPARISON
-	LD	B,0			; 256 ITERATIONS
+	LD	A,B			; LOOP COUNTER IN A
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
-;
 	BIT	1,(IY+PPIDE_ACC)	; 8 BIT?
-	JR	Z,PPIDE_PUTBUF1		; IF NOT, DO 16 BIT
-	CALL	PPIDE_PUTBUF8		; FIRST PASS (FIRST 256 BYTES)
-	CALL	PPIDE_PUTBUF8		; SECOND PASS (LAST 256 BYTES)
-	JR	PPIDE_PUTBUF2		; CONTINUE
-PPIDE_PUTBUF1:
-	CALL	PPIDE_PUTBUF16		; FIRST PASS (FIRST 256 BYTES)
-	CALL	PPIDE_PUTBUF16		; SECOND PASS (LAST 256 BYTES)
-PPIDE_PUTBUF2:
+	JR	Z,PPIDE_PUT1		; IF NOT, DO 16 BIT
+	CALL	PPIDE_PUT8		; SECOND PASS (LAST 256 BYTES)
+	JR	PPIDE_PUT2		; CONTINUE
+PPIDE_PUT1:
+	CALL	PPIDE_PUT16		; FIRST PASS (FIRST 256 BYTES)
+PPIDE_PUT2:
 	CALL	PPIDE_WAITRDY		; PROBLEMS IF THIS IS REMOVED!
 	RET	NZ
 	CALL	PPIDE_GETRES
 	JP	NZ,PPIDE_IOERR
 	RET
 ;
-PPIDE_PUTBUF8:	; 8 BIT WIDE WRITE LOOP
+PPIDE_PUT8:	; 8 BIT WIDE WRITE LOOP
 	DEC	C			; CTL -> MSB
 	DEC	C			; MSB -> LSB
 	OUTI				; WRITE NEXT BYTE (LSB)
@@ -998,11 +1198,18 @@ PPIDE_PUTBUF8:	; 8 BIT WIDE WRITE LOOP
 	INC	C			; MSB -> CTL
 	OUT	(C),D			; ASSERT WRITE
 	OUT	(C),E			; DEASSERT WRITE
-	CP	B			; B == A == 0?
-	JR	NZ,PPIDE_PUTBUF8	; LOOP UNTIL DONE
+	DEC	C			; CTL -> MSB
+	DEC	C			; MSB -> LSB
+	OUTI				; WRITE NEXT BYTE (LSB)
+	INC	C			; LSB -> MSB
+	INC	C			; MSB -> CTL
+	OUT	(C),D			; ASSERT WRITE
+	OUT	(C),E			; DEASSERT WRITE
+	DEC	A
+	JR	NZ,PPIDE_PUT8		; LOOP UNTIL DONE
 	RET
 ;
-PPIDE_PUTBUF16:	; 16 BIT WIDE WRITE LOOP
+PPIDE_PUT16:	; 16 BIT WIDE WRITE LOOP
 	DEC	C			; CTL -> MSB
 	DEC	C			; MSB -> LSB
 	OUTI				; WRITE NEXT BYTE (LSB)
@@ -1011,8 +1218,8 @@ PPIDE_PUTBUF16:	; 16 BIT WIDE WRITE LOOP
 	INC	C			; MSB -> CTL
 	OUT	(C),D			; ASSERT WRITE
 	OUT	(C),E			; DEASSERT WRITE
-	CP	B			; B == A == 0?
-	JR	NZ,PPIDE_PUTBUF16	; LOOP UNTIL DONE
+	DEC	A
+	JR	NZ,PPIDE_PUT16		; LOOP UNTIL DONE
 	RET
 ;
 ;
@@ -1057,7 +1264,7 @@ PPIDE_RESET:
 ;
 	; SETUP PPI TO READ
 	LD	A,PPIDE_DIR_READ	; SET DATA BUS DIRECTION TO READ
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD
 	OUT	(C),A			; WRITE IT
 ;
@@ -1082,13 +1289,13 @@ PPIDE_RESET:
 	PRTS(" HARD$")
 #ENDIF
 	LD	A,PPIDE_CTL_RESET
-	;OUT	(PPIDE_IO_CTL),A
+	;OUT	(PPIDE_REG_CTL),A
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
 	OUT	(C),A
 	LD	DE,20			; DELAY 320US (SPEC IS >= 25US)
 	CALL	VDELAY
 	XOR	A
-	;OUT	(PPIDE_IO_CTL),A
+	;OUT	(PPIDE_REG_CTL),A
 	OUT	(C),A
 	LD	DE,20
 	CALL	VDELAY
@@ -1125,7 +1332,7 @@ PPIDE_RESET2:
 	PRTS(" SOFT$")
 #ENDIF
 	LD	A,%00001110		; ASSERT RESET, NO INTERRUPTS
-	;OUT	(PPIDE_IO_CTRL),A
+	;OUT	(PPIDE_REG_CTRL),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_CTRL
 	LD	DE,20			; DELAY 320US (SPEC IS >= 25US)
@@ -1224,7 +1431,7 @@ PPIDE_PROBE:
 ;
 	; SELECT DEVICE (MASTER/SLAVE)
 	LD	A,(PPIDE_DRVHD)
-	;OUT	(IDE_IO_DRVHD),A
+	;OUT	(IDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
 #IF (PPIDETRACE >= 3)
@@ -1275,7 +1482,7 @@ PPIDE_PROBE:
 ;
 ; 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
+; 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 FALSE POSITIVE.
 ;
@@ -1326,22 +1533,26 @@ PPIDE_INITDEV:
 	PRTS(" INITDEV$")		; LABEL FOR IO ADDRESS
 #ENDIF
 ;
-; IF THE IDE STATUS BYTE IS $00, WE HAVE EITHER A NON-PRESENT SLAVE
-; OR AN ATAPI DEVICE.  TO DIFFERENTIATE THESE POSSIBILITIES, WE RUN
-; A NOP COMMAND.  IF WE HAVE AN ATAPI DEVICE, THIS WILL CAUSE THE
-; STATUS BYTE TO BE "NORMAL" (NON-ZERO).  IF THE STATUS IS STILL
-; ZERO, WE ABORT WITH A NO MEDIA STATUS.  NOTE THAT THE NOP COMMAND
-; RETURNS A COMMAND ERROR BY DESIGN.  WE JUST IGNORE THE ERROR.
+#IF (PPIDETRACE >= 3)
+	CALL	PPIDE_REGDUMP
+#ENDIF
+;
+; ON ENTRY, WE HAVE ALREADY CHECKED THAT THE BUSY BIT IS CLEARED AND
+; DRDY SHOULD BE SET.  IF DRDY IS NOT SET, IF COULD MEAN EITHER A
+; NON-EXISTENT SLAVE DEVICE OR AN ATAPI DEVICE.  TO AVOID UNNECESSARY
+; TIMEOUTS, WE CHECK FOR DRDY.  IF IT IS NOT SET, THEN WE ASSUME THIS
+; MUST BE AN ATAPI DEVICE AND GO TRY TO DO THE ATAPI INITIALIZATION.
+; IF THIS WAS ACTUALLY A NON-EXISTENT SLAVE, THE ATAPI INITIALIZATION
+; WILL HANDLE THIS PRETTY WELL.
 ;
-	CALL	PPIDE_NOP
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
-	OR	A
-	JP	Z,PPIDE_NOMEDIA
+	BIT	6,A			; DRDY?
+	JR	Z,PPIDE_INITPDEV	; ODD, MIGHT BE ATAPI
+	
 ;
 ; WE NEED TO SETUP 8-BIT MODE BEFORE DOING ANYTHING ELSE
 ;
-PPIDE_INITDEV0A:
 	BIT	1,(IY+PPIDE_ACC)	; 8 BIT ACCESS?
 	JR	Z,PPIDE_INITDEV0	; NO, DO 16 BIT INIT
 	LD	A,PPIDE_FEAT_ENABLE8BIT	; FEATURE VALUE = ENABLE 8-BIT PIO
@@ -1358,8 +1569,12 @@ PPIDE_INITDEV0:
 ;
 PPIDE_INITDEV00:
 ;
+	; WE NOW USE AN IDENTIFY DEVICE COMMAND TO CONFIRM THE
+	; DEVICE IS REALLY THERE AND GET SOME ATTRIBUTES.  IF THE
+	; COMMAND FAILS, IT MAY BE THAT WE HAVE AN ATAPI DEVICE AND
+	; SO WE GO TO THE ATAPI INITIALIZATION ON FAILURE.
 	CALL	PPIDE_IDENTIFY		; EXECUTE PPIDENTIFY COMMAND
-	JR	NZ,PPIDE_INITDEVP	; ON ERROR, TRY PACKET DEVICE
+	JR	NZ,PPIDE_INITPDEV	; TRY ATAPI ON FAILURE
 ;
 	; DECLARE WE ARE ATA
 	LD	A,PPIDE_TYPEATA		; OTHERWISE TYPE=ATA
@@ -1371,13 +1586,6 @@ PPIDE_INITDEV00:
 #ENDIF
 ;
 	LD	(IY+PPIDE_MED),0	; CLEAR MEDIA FLAGS
-;
-	; DETERMINE IF CF DEVICE BY TESTING FOR CF CARD SIGNATURES
-	; IN THEORY, THERE ARE SOME OTHER POSSIBLE VARIATIONS, BUT
-	; THEY ARE NOT RECOMMENDED BY THE CF CARD SPEC AND MIGHT
-	; OVERLAP WITH "REAL" HARD DISK SIGNATURES.  I HAVE NEVER
-	; SEEN A CF CARD THAT DID NOT USE ONE OF THE BELOW.
-	; CREDIT TO LASZLO SZOLNOKI
 ;
 #IF (PPIDETRACE >= 3)
 	CALL	PPIDE_PRTPREFIX
@@ -1417,9 +1625,15 @@ PPIDE_INITDEV2:
 ;
 	RET				; RETURN, A=0, Z SET
 ;
+; (RE)INITIALIZE PACKET DEVICE
 ;
+PPIDE_INITPDEV:
+;
+#IF (PPIDETRACE >= 3)
+	CALL	PPIDE_PRTPREFIX
+	PRTS(" INITPDEV$")		; LABEL FOR IO ADDRESS
+#ENDIF
 ;
-PPIDE_INITDEVP:
 	CALL	PPIDE_IDENTIFYPACKET	; EXECUTE IDENTIFY COMMAND
 	RET	NZ			; BAIL OUT ON ERROR
 ;
@@ -1432,17 +1646,98 @@ PPIDE_INITDEVP:
 	CALL	DUMP_BUFFER		; DUMP IT IF DEBUGGING
 #ENDIF
 ;
-	LD	(IY+PPIDE_MED),0		; CLEAR FLAGS
+	LD	(IY+PPIDE_MED),0	; CLEAR FLAGS
+	SET	1,(IY+PPIDE_MED)	; SET FLAGS BIT FOR LBA (ASSUMED)
 ;
-	; DONE FOR NOW, ATAPI NOT INPLEMENTED
+	; WAIT FOR UNIT READY
+	LD	B,0			; MAX LOOPS
+	LD	C,4			; MAX ERRORS
+PPIDE_INITPDEV1:
+	DEC	B			; CHECK LOOP COUNTER EXCEEDED
+	JP	Z,PPIDE_NOMEDIA		; TREAT AS NO MEDIA
+	PUSH	BC			; SAVE LOOP CONTROL
+	LD	HL,PPIDE_PKTCMD_TSTRDY	; TEST UNIT READY
+	XOR	A			; READ DIRECTION
+	LD	(PPIDE_XFRDIR),A	; SAVE IT
+	CALL	PPIDE_RUNPCMD		; ISSUE PACKET COMMAND
+	CALL	NZ,PPIDE_CHKPCMD	; IF ERROR, DIAGNOSE IT
+	POP	BC			; RESTORE LOOP CONTROL
+	JR	Z,PPIDE_INITPDEV2	; IF NO ERROR, CONTINUE
+	CP	PPIDE_STNOMEDIA		; EXPLICIT NO MEDIA RESULT?
+	RET	Z			; EXIT REPORTING NO MEDIA
+	CP	PPIDE_STNOTRDY		; BECOMING READY?
+	JR	Z,PPIDE_INITDEVP1A	; IF SO, NOT AN ERROR, LOOP
+	DEC	C			; DEC ERROR LIMIT
+	RET	Z			; BAIL OUT, ERR LIMIT EXCEEDED
+	JR	PPIDE_INITPDEV1		; LOOP
+PPIDE_INITDEVP1A:
+	LD	DE,100000/16		; WAIT 1/10 SECOND
+	CALL	VDELAY			; DO IT
+	JR	PPIDE_INITPDEV1		; AND LOOP
 ;
-	; RETURN NOT SUPPORTED STATUS
-	JP	PPIDE_NOTSUP		; NOT SUPPORTED
+PPIDE_INITPDEV2:
+#IF (PPIDETRACE >= 3)
+	LD	A,B
+	NEG
+	PRTS("\r\nLOOPS=$")
+	CALL	PRTHEXBYTE
+#ENDIF
 ;
-;	; RECORD STATUS OK
-;	XOR	A			; A := 0 (STATUS = OK)
-;	LD	(IY+PPIDE_STAT),A	; SAVE IT
-;	RET
+	; GET AND RECORD CAPACITY
+	LD	HL,HB_WRKBUF
+	LD	(PPIDE_DSKBUF),HL
+	LD	HL,PPIDE_PKTCMD_RDCAP
+	XOR	A			; READ DIRECTION
+	LD	(PPIDE_XFRDIR),A	; SAVE IT
+	CALL	PPIDE_RUNPCMD
+	JP	NZ,PPIDE_CHKPCMD
+;
+#IF (PPIDETRACE >= 3)
+	PRTS("\r\nRDCAP:$")
+	LD	A,8
+	LD	DE,HB_WRKBUF
+	CALL	PRTHEXBUF
+#ENDIF
+;
+	; CAPACITY IS RETURNED IN A 4 BYTE, BIG ENDIAN FIELD AND
+	; INDICATES THE LAST LBA VALUE.  WE NEED TO CONVERT THIS TO
+	; LITTLE ENDIAN AND INCREMENT THE VALUE TO MAKE IT A CAPACITY
+	; COUNT INSTEAD OF A LAST LBA VALUE.
+	LD	A,PPIDE_MEDCAP		; OFFSET IN CFG FOR CAPACITY
+	CALL	LDHLIYA			; POINTER TO HL
+	PUSH	HL			; SAVE IT
+	LD	HL,HB_WRKBUF		; POINT TO VALUE IN CMD RESULT
+	CALL	LD32			; LOAD IT TO DE:HL
+	LD	A,L			; FLIP BYTES
+	LD	L,D			; ... BIG ENDIAN
+	LD	D,A			; ... TO LITTLE ENDIAN
+	LD	A,H
+	LD	H,E
+	LD	E,A
+	CALL	INC32			; INCREMENT TO FINAL VALUE
+	POP	BC			; RECOVER SAVE LOCATION
+	CALL	ST32			; STORE VALUE
+;
+	; CHECK BLOCK LENGTH.  WE CURRENTLY ONLY SUPPORT 512 BYTE
+	; BLOCKS.  CD-ROM DEVICES (WHICH USE 2k BLOCKS) WILL FAIL
+	; HERE AS NOT SUPPORTED.
+	LD	HL,HB_WRKBUF+4		; POINT TO BLK SIZE IN RESULT
+	CALL	LD32			; LOAD IT TO DE:HL
+	; VALUE IS BIG ENDIAN, SO LH:ED MUST BE EXACTLY 0000:0200
+	LD	A,L			; CHECK THAT LH
+	OR	H			; ... IS ZERO
+	JP	NZ,PPIDE_NOTSUP		; IF NOT, FAIL AS NOT SUP
+	LD	A,D			; LOAD D
+	OR	A			; SET FLAGS
+	JP	NZ,PPIDE_NOTSUP		; IF NOT ZERO, FAIL AS NOT SUP
+	LD	A,E			; LOAD E
+	CP	2			; CHECK IT IF IS 2
+	JP	NZ,PPIDE_NOTSUP		; IF NOT, FAIL AS NOT SUP
+;
+	; RECORD STATUS OK
+	XOR	A			; A := 0 (STATUS = OK)
+	LD	(IY+PPIDE_STAT),A	; SAVE IT
+	RET
 ;
 ; SWITCH IY POINTER FROM CURRENT UNIT CFG TO PARTNER UNIT CFG
 ;
@@ -1535,19 +1830,19 @@ PPIDE_IN:
 	EX	(SP),HL			; GET PARM POINTER			; 19TS
 	PUSH	BC			; SAVE INCOMING BC			; 11TS
 	LD	A,PPIDE_DIR_READ	; SET DATA BUS DIRECTION TO READ	; 7TS
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD			; 19TS
 	OUT	(C),A			; WRITE IT				; 12TS
 ;
 	LD	B,(HL)			; GET CTL PORT VALUE			; 7TS
-	;LD	C,PPIDE_IO_CTL		; SETUP PORT TO WRITE
+	;LD	C,PPIDE_REG_CTL		; SETUP PORT TO WRITE
 	;LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
 	DEC	C			; SET IDE ADDRESS			; 4TS
 	OUT	(C),B			; SET ADDRESS LINES			; 12TS
 	SET	6,B			; TURN ON READ BIT			; 8TS
 	OUT	(C),B			; ASSERT READ LINE			; 12TS
 ;
-	;IN	A,(PPIDE_IO_DATALO)	; GET DATA VALUE FROM DEVICE
+	;IN	A,(PPIDE_REG_DATALO)	; GET DATA VALUE FROM DEVICE
 	DEC	C								; 4TS
 	DEC	C								; 4TS
 	IN	A,(C)			; GET DATA VALUE FROM DEVICE		; 12
@@ -1569,13 +1864,13 @@ PPIDE_OUT:
 	PUSH	BC			; SAVE INCOMING BC
 	PUSH	AF			; PRESERVE INCOMING VALUE
 	LD	A,PPIDE_DIR_WRITE	; SET DATA BUS DIRECTION TO WRITE
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD
 	OUT	(C),A			; WRITE IT
 	POP	AF			; RECOVER VALUE TO WRITE
 ;
 	LD	B,(HL)			; GET IDE ADDRESS VALUE
-	;LD	C,PPIDE_IO_CTL		; SETUP PORT TO WRITE
+	;LD	C,PPIDE_REG_CTL		; SETUP PORT TO WRITE
 	;LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
 	DEC	C			; SET IDE ADDRESS
 	OUT	(C),B			; SET ADDRESS LINES
@@ -1584,7 +1879,7 @@ PPIDE_OUT:
 ;
 	DEC	C
 	DEC	C
-	;OUT	(PPIDE_IO_DATALO),A	; SEND DATA VALUE TO DEVICE
+	;OUT	(PPIDE_REG_DATALO),A	; SEND DATA VALUE TO DEVICE
 	OUT	(C),A			; SEND DATA VALUE TO DEVICE
 	INC	C
 	INC	C
@@ -1634,6 +1929,10 @@ PPIDE_NOTSUP:
 	LD	A,PPIDE_STNOTSUP
 	JR	PPIDE_ERR
 ;
+PPIDE_NOTRDY:
+	LD	A,PPIDE_STNOTRDY
+	JR	PPIDE_ERR
+;
 PPIDE_ERR:
 	LD	(IY+PPIDE_STAT),A	; SAVE NEW STATUS
 ;
@@ -1706,6 +2005,9 @@ PPIDE_PRTSTATSTR:
 	INC	A
 	LD	DE,PPIDE_STR_STNOTSUP
 	JR	Z,PPIDE_PRTSTATSTR1
+	INC	A
+	LD	DE,PPIDE_STR_STNOTRDY
+	JR	Z,PPIDE_PRTSTATSTR1
 	LD	DE,PPIDE_STR_STUNK
 PPIDE_PRTSTATSTR1:
 	CALL	WRITESTR
@@ -1723,7 +2025,7 @@ PPIDE_REGDUMP:
 	CALL	PC_SPACE
 	CALL	PC_LBKT
 	LD	A,PPIDE_DIR_READ	; SET DATA BUS DIRECTION TO READ
-	;OUT	(PPIDE_IO_PPI),A	; DO IT
+	;OUT	(PPIDE_REG_PPI),A	; DO IT
 	LD	C,(IY+PPIDE_PPI)	; PPI CONTROL WORD
 	OUT	(C),A			; WRITE IT
 	LD	C,(IY+PPIDE_CTL)	; SET IDE ADDRESS
@@ -1731,12 +2033,12 @@ PPIDE_REGDUMP:
 	LD	B,7
 PPIDE_REGDUMP1:
 	LD	A,E			; REGISTER ADDRESS
-	;OUT	(PPIDE_IO_CTL),A	; SET IT
+	;OUT	(PPIDE_REG_CTL),A	; SET IT
 	OUT	(C),A			; REGISTER ADDRESS
 	XOR	PPIDE_CTL_DIOR		; SET BIT TO ASSERT READ LINE
-	;OUT	(PPIDE_IO_CTL),A	; ASSERT READ
+	;OUT	(PPIDE_REG_CTL),A	; ASSERT READ
 	OUT	(C),A			; ASSERT READ
-	;IN	A,(PPIDE_IO_DATALO)	; GET VALUE
+	;IN	A,(PPIDE_REG_DATALO)	; GET VALUE
 	DEC	C			; CTL -> MSB
 	DEC	C			; MSB -> LSB
 	IN	A,(C)			; GET VALUE
@@ -1744,7 +2046,7 @@ PPIDE_REGDUMP1:
 	INC	C			; MSB -> CTL
 	CALL	PRTHEXBYTE		; DISPLAY IT
 	;LD	A,C			; RELOAD ADDRESS W/ READ UNASSERTED
-	;OUT	(PPIDE_IO_CTL),A	; AND SET IT
+	;OUT	(PPIDE_REG_CTL),A	; AND SET IT
 	OUT	(C),E			; RELOAD ADDRESS W/ READ UNASSERTED
 	;DEC	C			; NEXT LOWER REGISTER
 	DEC	E			; NEXT LOWER REGISTER
@@ -1785,6 +2087,7 @@ PPIDE_STR_STRDYTO	.TEXT	"READY TIMEOUT$"
 PPIDE_STR_STDRQTO	.TEXT	"DRQ TIMEOUT$"
 PPIDE_STR_STBSYTO	.TEXT	"BUSY TIMEOUT$"
 PPIDE_STR_STNOTSUP	.TEXT	"NOT SUPPORTED$"
+PPIDE_STR_STNOTRDY	.TEXT	"NOT READY$"
 PPIDE_STR_STUNK		.TEXT	"UNKNOWN ERROR$"
 ;
 PPIDE_STR_NO		.TEXT	"NO$"
@@ -1806,5 +2109,14 @@ PPIDE_IOFNADR	.DW	0		; PENDING IO FUNCTION ADDRESS
 PPIDE_DRVHD	.DB	0		; CURRENT DRIVE/HEAD MASK
 ;
 PPIDE_DSKBUF	.DW	0		; ACTIVE DISK BUFFER
+PPIDE_XFRDIR	.DB	0		; 0=READ, NON-0=WRITE
 ;
 PPIDE_DEVNUM	.DB	0		; TEMP DEVICE NUM USED DURING INIT
+;
+; SCSI COMMAND TEMPLATES (ALWAYS 12 BYTES FOR ATAPI)
+;
+PPIDE_PKTCMD_RW		.DB	$00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00	; READ/WRITE SECTOR
+PPIDE_PKTCMD_SENSE	.DB	$03, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $00, $00	; REQUEST SENSE DATA
+PPIDE_PKTCMD_RDCAP	.DB	$25, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00	; READ CAPACITY
+PPIDE_PKTCMD_RW10	.DB	$28, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00	; READ/WRITE SECTOR
+PPIDE_PKTCMD_TSTRDY	.DB	$00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00	; TEST UNIT READY

Source/HBIOS/std.asm

@@ -457,13 +457,15 @@ SPD_LOW		.EQU	2		; PLATFORM CAN CHANGE SPEED, STARTS LOW
 ;
 ; SCSI COMMAND CODES (SHOULD BE IT IT'S OWN FILE)
 ;
-SCSI_CMD_READ	.EQU	$08
-SCSI_CMD_INQ	.EQU	$12
-SCSI_CMD_TEST	.EQU	$00
-SCSI_CMD_START	.EQU	$1B
-SCSI_CMD_SENSE	.EQU	$03
-SCSI_CMD_WRITE	.EQU	$0A
-SCSI_CMD_RDCAP	.EQU	$25
+SCSI_CMD_TSTRDY		.EQU	$00
+SCSI_CMD_SENSE		.EQU	$03
+SCSI_CMD_READ		.EQU	$08
+SCSI_CMD_WRITE		.EQU	$0A
+SCSI_CMD_INQ		.EQU	$12
+SCSI_CMD_START		.EQU	$1B
+SCSI_CMD_RDCAP		.EQU	$25
+SCSI_CMD_READ10		.EQU	$28
+SCSI_CMD_WRITE10	.EQU	$2A
 ;
 #INCLUDE "build.inc"		; INCLUDE USER CONFIG, ADD VARIANT, TIMESTAMP, & ROMSIZE
 ;

Source/ver.inc

@@ -2,7 +2,7 @@
 #DEFINE	RMN	3
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.3.0-dev.20"
+#DEFINE BIOSVER	"3.3.0-dev.24"
 #define rmj	RMJ
 #define rmn	RMN
 #define rup	RUP

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	3
 rup	equ	0
 rtp	equ	0
 biosver	macro
-	db	"3.3.0-dev.20"
+	db	"3.3.0-dev.24"
 	endm