Merge pull request #183 from wwarthen/dev

Dev

Doc/ChangeLog.txt

@@ -25,6 +25,8 @@ Version 3.1.1
 - WBW: CP/M 3 RTC support is now complete (reads and writes RTC date/time)
 - WBW: Add config to allow swapping logical order of MT011 SPI ports
 - WBW: COPY.COM updated from v1.72 -> v1.73 throughout distribution
+- D?M: CP/NET for CP/M 2.2 and CP/M 3 (requires MT011)
+- D?M: SD driver fixes for MT011
 
 Version 3.1
 -----------

Readme.unix

@@ -34,6 +34,18 @@ to build the "126" configuration of the "SCZ180" platform:
 
 	make ROM_PLATFORM=SCZ180 ROM_CONFIG=126
 
+Please be aware that the make-based build does have a couple of
+deficiencies.
+
+First, there are some build failures that will not stop the make 
+process.  Some of this is because real CP/M 2.2 tools are used in 
+places and CP/M 2.2 does not allow programs to return a result code.
+
+Second, not all dependencies are properly handled.  So, changes to some
+files will not cause things to rebuild as appropriate.  In general, I
+recommend doing a "make clean" before running "make" to ensure that
+everything is fully rebuilt.
+
 For macOS users, you may encounter a failure reading or writing files.
 This is caused by protection features in macOS (at least, in Catalina)
 that prevent programs built on your local system (unsigned) from

Source/HBIOS/Config/RCZ180_ext.asm

@@ -22,7 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE PLATFORM_NAME "RC2014 (EXT MMU)"
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_rcz180.asm"

Source/HBIOS/Config/RCZ180_nat.asm

@@ -22,7 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE PLATFORM_NAME "RC2014 (NATIVE MMU)"
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_rcz180.asm"

Source/HBIOS/cfg_rcz180.asm

@@ -200,7 +200,7 @@ 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]
-SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC ONLY
+SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC 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
 SDMTSWAP	.EQU	FALSE		; SD: SWAP THE LOGICAL ORDER OF THE SPI PORTS OF THE MT011

Source/HBIOS/cfg_rcz280.asm

@@ -216,7 +216,7 @@ 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]
-SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC ONLY
+SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC 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
 SDMTSWAP	.EQU	FALSE		; SD: SWAP THE LOGICAL ORDER OF THE SPI PORTS OF THE MT011

Source/HBIOS/cfg_rcz80.asm

@@ -205,7 +205,7 @@ 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]
-SDCNT		.EQU	1		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC ONLY
+SDCNT		.EQU	2		; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC 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
 SDMTSWAP	.EQU	FALSE		; SD: SWAP THE LOGICAL ORDER OF THE SPI PORTS OF THE MT011

Source/HBIOS/sd.asm

@@ -115,8 +115,10 @@
 ;
 SD_NOPULLUP	.EQU	TRUE		; ASSUME NO PULLUP
 ;
+SD_DEVCNT	.EQU	SDCNT		; SET SD_DEVCNT TO SDCNT CONFIG VAR
+;
 #IF (SDMODE == SDMODE_JUHA)		; JUHA MINI-BOARD
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	RTCIO		; USES RTC LATCHES FOR OPERATION
 SD_OPRDEF	.EQU	%00000001	; QUIESCENT STATE
 SD_OPRMSK	.EQU	%10000111	; MASK FOR BITS WE OWN IN RTC LATCH PORT
@@ -131,7 +133,7 @@ RTCDEF		.SET	SD_OPRDEF	; SET DEFAULT IN HBIOS MAINLINE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_N8)		; UNMODIFIED N8-2511
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	RTCIO		; USES RTC LATCHES FOR OPERATION
 SD_OPRDEF	.EQU	%00000001	; QUIESCENT STATE
 SD_OPRMSK	.EQU	%01000111	; MASK FOR BITS WE OWN IN RTC LATCH PORT
@@ -146,7 +148,7 @@ RTCDEF		.SET	SD_OPRDEF	; SET DEFAULT IN HBIOS MAINLINE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_CSIO)		; N8-2312
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	RTCIO		; USES RTC LATCHES FOR OPERATION
 SD_OPRDEF	.EQU	%00000000	; QUIESCENT STATE
 SD_OPRMSK	.EQU	%00000100	; MASK FOR BITS WE OWN IN RTC LATCH PORT
@@ -159,7 +161,7 @@ RTCDEF		.SET	SD_OPRDEF	; SET DEFAULT IN HBIOS MAINLINE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_PPI)		; PPISD
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_PPIBASE	.EQU	PPIBASE		; BASE IO PORT FOR PPI
 SD_PPIB		.EQU	PPIBASE + 1	; PPI PORT B (INPUT: DOUT)
 SD_PPIC		.EQU	PPIBASE + 2	; PPI PORT C (OUTPUT: CS, CLK, DIN)
@@ -175,7 +177,7 @@ SD_IOBASE	.EQU	SD_PPIBASE	; IOBASE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_UART)
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	SIO_MCR		; UART MCR PORT (OUTPUT: CS, CLK, DIN)
 SD_OPRDEF	.EQU	%00001100	; QUIESCENT STATE
 SD_OPRMSK	.EQU	%00101101	; MASK FOR BITS WE OWN IN RTC LATCH PORT
@@ -188,7 +190,7 @@ SD_IOBASE	.EQU	UARTIOB		; IOBASE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_DSD)		; DUAL SD
-SD_DEVCNT	.EQU	SDCNT		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	2		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	$08		; DEDICATED OPERATIONS REGISTER
 SD_OPRDEF	.EQU	%00000001	; QUIESCENT STATE
 SD_INPREG	.EQU	SD_OPRREG	; INPUT REGISTER IS OPRREG
@@ -202,7 +204,7 @@ SD_IOBASE	.EQU	SD_OPRREG	; IOBASE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_MK4)		; MARK IV (CSIO STYLE INTERFACE)
-SD_DEVCNT	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	1		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	$89		; DEDICATED MK4 SDCARD REGISTER
 SD_OPRDEF	.EQU	%00000000	; QUIESCENT STATE
 SD_CS0		.EQU	%00000100	; SELECT ACTIVE
@@ -212,7 +214,7 @@ SD_IOBASE	.EQU	SD_OPRREG	; IOBASE
 #ENDIF
 ;
 #IF (SDMODE == SDMODE_SC)		; SC
-SD_DEVCNT	.EQU	SDCNT		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	2		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_OPRREG	.EQU	RTCIO		; USES RTC LATCHES FOR OPERATION
 SD_OPRDEF	.EQU	%00001100	; QUIESCENT STATE (/CS1 & /CS2 DEASSERTED)
 SD_OPRMSK	.EQU	%00001100	; MASK FOR BITS WE OWN IN RTC LATCH PORT
@@ -231,8 +233,17 @@ RTCDEF		.SET	SD_OPRDEF	; SET DEFAULT IN HBIOS MAINLINE
 ; WIZNET W5500 AND IS NOT USED HERE.  CHANNEL 1 (CD0 & CS0) & 2 (CD1 & CS1)
 ; ARE ASSUMED TO BE CONNECTED TO SD CARDS.
 ;
+; NOTE THAT DOING AN "IN RDTR" WILL RETURN THE *EXISTING* CONTENTS
+; OF THE SHIFT REGISTER, THEN INITIATE AN SPI READ.  SO THE "IN" WILL BE
+; RETURNING THE DATA RECEIVED FROM THE PRIOR "IN RDTR", OR "OUT WRTR".
+; "IN RDNTR" WILL RETURN THE EXISTING SHIFT REGISTER CONTENTS WITHOUT
+; INITIATING A NEW SPI READ.
+;
+; THANKS TO DOUGLAS MILLER FOR BRINGING THIS BEHAVIOR TO MY ATTENTION
+; AND SUPPLYING ASSOCIATED FIXES.
+;
 SD_BASE		.EQU	$5C		; Module base address
-SD_DEVCNT	.EQU	2		; NUMBER OF PHYSICAL UNITS (SOCKETS)
+SD_DEVMAX	.EQU	2		; NUMBER OF PHYSICAL UNITS (SOCKETS)
 SD_WRTR		.EQU	SD_BASE + 0	; Write data and transfer
 SD_RDTR		.EQU	SD_BASE + 1	; Read data and transfer
 SD_RDNTR	.EQU	SD_BASE	+ 0	; Read data and NO transfer
@@ -261,6 +272,11 @@ SD_CS1		.EQU	%00010000	; IN/OUT:SD_OPREG:4 = CS1, SDCARD1 CS, IN=1 Card present
 SD_IOBASE	.EQU	SD_BASE		; IOBASE
 #ENDIF
 ;
+#IF (SD_DEVCNT > SD_DEVMAX)
+	.ECHO	"*** ERROR: SDCNT EXCEEDS MAXIMUM SUPPORTED BY INTERFACE!!!\n"
+	!!!	; FORCE AN ASSEMBLY ERROR
+#ENDIF
+;
 ; SD CARD COMMANDS
 ;
 SD_CMD_GO_IDLE_STATE	.EQU	$40 + 0		; $40, CMD0 -> R1
@@ -1421,6 +1437,10 @@ SD_EXECCMD1:
 ;
 	; GET RESULT
 	LD	E,0			; INIT TIMEOUT LOOP COUNTER
+#IF (SDMODE == SDMODE_MT)
+	CALL	SD_GET			; DISCARD STALE DATA FROM PUT
+#ENDIF
+;
 SD_EXECCMD2:
 	CALL	SD_GET			; GET A BYTE FROM THE CARD
 	OR	A			; SET FLAGS
@@ -1548,6 +1568,7 @@ SD_PUTDATA1:
 	OUT	(SD_WRTR),A		; SEND IT TWICE
 
 	LD	DE,$7FFF		; LOOP MAX (TIMEOUT)
+	IN	A,(SD_RDTR)		; DISCARD STALE DATA FROM OUT
 SD_PUTDATA2:
 	IN	A,(SD_RDTR)
 #ELSE
@@ -1597,6 +1618,9 @@ SD_PUTDATA3:
 ;
 SD_WAITRDY:
 	LD	DE,$FFFF		; LOOP MAX (TIMEOUT)
+#IF (SDMODE == SDMODE_MT)
+	CALL	SD_GET			; DISCARD STALE DATA - UNKNOWN CONTEXT
+#ENDIF
 SD_WAITRDY1:
 	CALL	SD_GET
 	INC	A			; $FF -> $00

Source/Images/d_cpm22/u4/readme.txt

@@ -0,0 +1,17 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory contains the CP/M 2.2 client tools for CP/NET.  These
+tools work only with the MT011 RC2014 module.
+
+All of these files come from Douglas Miller.  Please refer to
+https://github.com/durgadas311/cpnet-z80 for more information and
+the latest source code.
+
+In general, to use CP/NET on RomWBW, it is intended that you will
+copy all of these files into your user 0 directory.

Source/Images/d_cpm3/u4/readme.txt

@@ -0,0 +1,17 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory contains the CP/M 3 client tools for CP/NET.  These
+tools work only with the MT011 RC2014 module.
+
+All of these files come from Douglas Miller.  Please refer to
+https://github.com/durgadas311/cpnet-z80 for more information and
+the latest source code.
+
+In general, to use CP/NET on RomWBW, it is intended that you will
+copy all of these files into your user 0 directory.

Source/Images/d_zsdos/u4/readme.txt

@@ -0,0 +1,17 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory contains the CP/M 2.2 client tools for CP/NET.  These
+tools work only with the MT011 RC2014 module.
+
+All of these files come from Douglas Miller.  Please refer to
+https://github.com/durgadas311/cpnet-z80 for more information and
+the latest source code.
+
+In general, to use CP/NET on RomWBW, it is intended that you will
+copy all of these files into your user 0 directory.

Source/Prop/Spin/ParPortProp.spin

@@ -441,6 +441,7 @@ PRI KeyboardStatus
 
   dbg.Hex(ByteVal, 2)
   dbg.Str(string(" <done>"))
+  dbg.NewLine
 
   ExecFunction(FUNC_PUTBYTE)
 

Source/Prop/Spin/Parallax Serial Terminal.spin

@@ -273,6 +273,7 @@ PUB NewLine
 {{Send cursor to new line (carriage return plus line feed).}}
   
   Char(NL)
+  Char(LF)
   
 PUB LineFeed
 {{Send cursor down to next line.}}

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.72"
+#DEFINE BIOSVER	"3.1.1-pre.75"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.72"
+	db	"3.1.1-pre.75"
 	endm