Merge pull request #23 from wwarthen/master

update to master

Binary/RomList.txt

@@ -170,7 +170,7 @@ RCZ80 w/ KIO (RCZ80_kio.rom):
  - Requires KIO module
  - Console on KIO primary serial port at 115200 baud
  - Includes support for Compact Flash Module
- - Support for PPIDE Module may be enabled in config
+ - Includes support for PPIDE Module
  - Support for Scott Baker SIO board may be enabled in config
  - Support for Scott Baker floppy controllers (SMC & WDC) may
    be enabled in config
@@ -179,7 +179,7 @@ RCZ180 (RCZ180_nat.rom & RCZ180_ext.rom):
  - Assumes CPU oscillator of 18.432 MHz
  - Console on Z180 onboard primary ASCI serial port at 115200 baud
  - Includes support for Compact Flash Module
- - Support for PPIDE Module may be enabled in config
+ - Includes support for PPIDE Module
  - Support for alternative serial modules may be enabled in config
  - Support for Scott Baker floppy controllers (SMC & WDC) may
    be enabled in config
@@ -195,7 +195,7 @@ SCZ180 (SCZ180_126.rom, SCZ180_130.rom, SCZ180_131.rom):
  - Assumes CPU oscillator of 18.432 MHz
  - Console on Z180 onboard primary ASCI serial port at 115200 baud
  - Includes support for Compact Flash Module
- - Support for PPIDE Module may be enabled in config
+ - Includes support for PPIDE Module
  - Support for alternative serial modules may be enabled in config
  - Support for Scott Baker floppy controllers (SMC & WDC) may
    be enabled in config
@@ -207,7 +207,8 @@ EZZ80 (EZZ80_std.rom):
  - Assumes CPU oscillator of 10.000 MHz
  - Console on primary SIO serial port at 115200 baud
  - Includes support for on-board SIO
- - Includes support for IDE via RC bus
+ - Includes support for RC2014 Compact Flash Module
+ - Includes support for rc2014 PPIDE Module
 
 DYNO (DYNO_std.rom):
  - Assumes CPU oscillator of 18.432 MHz

Source/HBIOS/Config/EZZ80_std.asm

@@ -25,3 +25,7 @@
 #include "cfg_ezz80.asm"
 ;
 CPUOSC		.SET	10000000	; CPU OSC FREQ IN MHZ
+;
+IDEENABLE	.SET	TRUE		; IDE: ENABLE IDE DISK DRIVER (IDE.ASM)
+;
+PPIDEENABLE	.SET	TRUE		; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM)

Source/HBIOS/cfg_dyno.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_ezz80.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
@@ -122,7 +123,7 @@ FDMAUTO		.EQU	TRUE		; FD: AUTO SELECT DEFAULT/ALTERNATE MEDIA FORMATS
 ;
 RFENABLE	.EQU	FALSE		; RF: ENABLE RAM FLOPPY DRIVER
 ;
-IDEENABLE	.EQU	TRUE		; IDE: ENABLE IDE DISK DRIVER (IDE.ASM)
+IDEENABLE	.EQU	FALSE		; IDE: ENABLE IDE DISK DRIVER (IDE.ASM)
 IDETRACE	.EQU	1		; IDE: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 IDECNT		.EQU	1		; IDE: NUMBER OF IDE INTERFACES TO DETECT (1-3), 2 DRIVES EACH
 IDE0MODE	.EQU	IDEMODE_RC	; IDE 0: DRIVER MODE: IDEMODE_[DIO|DIDE|MK4|RC]

Source/HBIOS/cfg_master.asm

@@ -15,6 +15,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_mk4.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_n8.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_rcz180.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_rcz80.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_sbc.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_scz180.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_zeta.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU_[Z80|Z180]: CPU FAMILY
 BIOS		.EQU	BIOS_WBW	; BIOS_[WBW|UNA]: HARDWARE BIOS
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO] IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/cfg_zeta2.asm

@@ -18,6 +18,7 @@ CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
 HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
+USELZSA2	.EQU	TRUE		; ENABLE FONT COMPRESSION
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT

Source/HBIOS/std.asm

@@ -292,10 +292,6 @@ V80X24B		.EQU	4	; ECB-VDU
 V80X43		.EQU	5	; ECB-VGA3
 V80X60		.EQU	6	; ECB-VGA3
 ;
-; FONTS
-;
-USELZSA2	.EQU	FALSE	; USE COMPRESSED FONTS.
-;
 ; KEYBOARD LAYOUTS
 ;
 KBD_US		.EQU	0	; US ENGLISH

Source/Images/d_cpm22/u1/ZDE16A.PAT

@@ -0,0 +1,102 @@
+; This patch file modifies the officially-distributed .COM file
+; for ZDE Ver 1.6 (copyright by Carson Wilson) to:
+;   - Correct a bug which did not preserve create times when
+;	editing files > 1 extent.
+;   - Use an apparently 'dead' byte in the configuration area as
+;	a configuration flag to allow disabling the 'Auto-Indent'
+;	feature which was always 'on' in ZDE1.6.
+;
+; With the second change, you may configure the 'Auto-Indent'
+; feature to be active (as distributed) or disabled (as this patch
+; is configured) by altering the DB at label 'AIDflt' in the
+; second part of this patch file below.
+;
+; Assemble this file to a .HEX file (example uses ZMAC) as:
+;
+;	ZMAC ZDE16A.PAT /H
+;	
+; then overlay the resulting ZDE16.HEX onto ZDE16.COM with MYLOAD
+; (or equivalent) as:
+;
+;	MYLOAD ZDE.COM=ZDE.COM,ZDE16.HEX
+;
+; The resulting ZDE.COM will be identified as 'ZDE 1.6a' in the
+; text identification string near the beginning of the .COM file.
+;
+; Harold F. Bower, 18 July 2001.
+;
+; CP/M Standard Equates
+;
+BDOS	EQU	0005H
+FCB	EQU	005CH
+DMA	EQU	0080H
+TPA	EQU	0100H
+;
+SDMA	EQU	26		; CP/M Function to set DMA Address
+;
+; Needed locations within ZDE 1.6
+;
+Fill	EQU	TPA+0F8BH	; For Date Patch
+TimBuf	EQU	TPA+3B3FH	;  "    "    "
+;
+VTFlg	EQU	TPA+3ADAH	; For Auto-Ins Patch
+HCRFlg	EQU	TPA+3AE3H	;  "   "    "    "
+LfMarg	EQU	TPA+3AFDH	;  "   "    "    "
+;
+; ----------- Begin Patch File -----------
+;
+; --- Fix Create Time Stamp Preservation Error ---
+
+	  ORG  TPA+0029H
+				; was:
+	DB	'a,  (C)'	;  DB    ', Copr.'
+	  ORG  TPA+2461H
+				; was:
+	LD	(FCB+13),A	;  CALL  ClUsrF
+;
+	  ORG  TPA+2F10H
+				; was:
+	LD	B,4		;  CALL  ClUsrF
+	CALL	ClUsrF		;  LD    DE,TimBuf
+	LD	DE,TimBuf	;  LD    C,SDMA
+	CALL	SetDMA		;  CALL  BDOS
+;
+	  ORG  TPA+30AAH
+				; was:
+	LD	DE,DMA		;  LD    C,SDMA
+SetDMA:	LD	C,SDMA		;  LD    DE,DMA
+;
+	  ORG  TPA+30B4H
+				; was:
+ClUsrF:	XOR	A		;  XOR   A
+	EX	DE,HL		;  LD    (FCB+13),A
+	JP	Fill		;  RET
+;
+; --- Usurp Config Flag for Auto-Insert use, sense on startup ---
+;
+	  ORG  TPA+0057H
+				; was: 0FFH
+AIDflt:	DB	00H		; Set Desired default (0=Off, FF=On)
+;
+	  ORG  TPA+262AH
+				; was:
+	LD	(LfMarg),HL	;  LD    HL,0101H
+	XOR	A		;  LD    (LfMarg),HL
+	LD	(VTFlg),A	;  XOR   A
+	LD	(HCRFlg),A	;  LD    (VTFlg),A
+	NOP			;  LD    (HCRFlg),A
+	LD	A,(AIDflt)	;  DEC   A
+;
+	  ORG  TPA+2711H
+				; was:
+	NOP			;  LD    A,(0157H) {Unknown Use}
+	NOP			;  OR    A
+	NOP			;  JP    Z,Error2
+	NOP
+	NOP
+	NOP
+	NOP
+;
+;------------ End of Patch File ------------
+	END
+

Source/Images/d_zsdos/u1/ZDE16A.PAT

@@ -0,0 +1,102 @@
+; This patch file modifies the officially-distributed .COM file
+; for ZDE Ver 1.6 (copyright by Carson Wilson) to:
+;   - Correct a bug which did not preserve create times when
+;	editing files > 1 extent.
+;   - Use an apparently 'dead' byte in the configuration area as
+;	a configuration flag to allow disabling the 'Auto-Indent'
+;	feature which was always 'on' in ZDE1.6.
+;
+; With the second change, you may configure the 'Auto-Indent'
+; feature to be active (as distributed) or disabled (as this patch
+; is configured) by altering the DB at label 'AIDflt' in the
+; second part of this patch file below.
+;
+; Assemble this file to a .HEX file (example uses ZMAC) as:
+;
+;	ZMAC ZDE16A.PAT /H
+;	
+; then overlay the resulting ZDE16.HEX onto ZDE16.COM with MYLOAD
+; (or equivalent) as:
+;
+;	MYLOAD ZDE.COM=ZDE.COM,ZDE16.HEX
+;
+; The resulting ZDE.COM will be identified as 'ZDE 1.6a' in the
+; text identification string near the beginning of the .COM file.
+;
+; Harold F. Bower, 18 July 2001.
+;
+; CP/M Standard Equates
+;
+BDOS	EQU	0005H
+FCB	EQU	005CH
+DMA	EQU	0080H
+TPA	EQU	0100H
+;
+SDMA	EQU	26		; CP/M Function to set DMA Address
+;
+; Needed locations within ZDE 1.6
+;
+Fill	EQU	TPA+0F8BH	; For Date Patch
+TimBuf	EQU	TPA+3B3FH	;  "    "    "
+;
+VTFlg	EQU	TPA+3ADAH	; For Auto-Ins Patch
+HCRFlg	EQU	TPA+3AE3H	;  "   "    "    "
+LfMarg	EQU	TPA+3AFDH	;  "   "    "    "
+;
+; ----------- Begin Patch File -----------
+;
+; --- Fix Create Time Stamp Preservation Error ---
+
+	  ORG  TPA+0029H
+				; was:
+	DB	'a,  (C)'	;  DB    ', Copr.'
+	  ORG  TPA+2461H
+				; was:
+	LD	(FCB+13),A	;  CALL  ClUsrF
+;
+	  ORG  TPA+2F10H
+				; was:
+	LD	B,4		;  CALL  ClUsrF
+	CALL	ClUsrF		;  LD    DE,TimBuf
+	LD	DE,TimBuf	;  LD    C,SDMA
+	CALL	SetDMA		;  CALL  BDOS
+;
+	  ORG  TPA+30AAH
+				; was:
+	LD	DE,DMA		;  LD    C,SDMA
+SetDMA:	LD	C,SDMA		;  LD    DE,DMA
+;
+	  ORG  TPA+30B4H
+				; was:
+ClUsrF:	XOR	A		;  XOR   A
+	EX	DE,HL		;  LD    (FCB+13),A
+	JP	Fill		;  RET
+;
+; --- Usurp Config Flag for Auto-Insert use, sense on startup ---
+;
+	  ORG  TPA+0057H
+				; was: 0FFH
+AIDflt:	DB	00H		; Set Desired default (0=Off, FF=On)
+;
+	  ORG  TPA+262AH
+				; was:
+	LD	(LfMarg),HL	;  LD    HL,0101H
+	XOR	A		;  LD    (LfMarg),HL
+	LD	(VTFlg),A	;  XOR   A
+	LD	(HCRFlg),A	;  LD    (VTFlg),A
+	NOP			;  LD    (HCRFlg),A
+	LD	A,(AIDflt)	;  DEC   A
+;
+	  ORG  TPA+2711H
+				; was:
+	NOP			;  LD    A,(0157H) {Unknown Use}
+	NOP			;  OR    A
+	NOP			;  JP    Z,Error2
+	NOP
+	NOP
+	NOP
+	NOP
+;
+;------------ End of Patch File ------------
+	END
+

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	9
 #DEFINE	RUP	2
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.37"
+#DEFINE BIOSVER	"2.9.2-pre.38"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	9
 rup	equ	2
 rtp	equ	0
 biosver	macro
-	db	"2.9.2-pre.37"
+	db	"2.9.2-pre.38"
 	endm