Support for MG014 RCBus Parallel Port Module

The LZSA2 decompressor invoked a known Z280 CPU bug.  A small modification to the code resolves this.

Doc/ChangeLog.txt

@@ -5,6 +5,8 @@ Version 3.3
 - A?C: Support for SD PIO
 - A?C: Support for Z80-Retro SD interface
 - WBW: Support per-drive floppy configuration
+- WBW: Support for Bill Shen's VGARC
+- WBW: Support for MG014 Parallel Port module + printer
 
 Version 3.2.1
 -------------

Source/Doc/UserGuide.md

@@ -3808,6 +3808,7 @@ the RomWBW HBIOS configuration.
    - WDC Floppy Disk Controller w/ 3.5" HD Drives
    - Onboard IDE Hard Disk Interface Module
    - PPIDE Hard Disk Interface Module
+   - VGARC Video & Keyboard Module
  - Serial baud rate is usually determined by hardware for ACIA and
    SIO interfaces
 
@@ -3831,6 +3832,7 @@ the RomWBW HBIOS configuration.
    - WDC Floppy Disk Controller w/ 3.5" HD Drives
    - Onboard IDE Hard Disk Interface Module
    - PPIDE Hard Disk Interface Module
+   - VGARC Video & Keyboard Module
  - Serial baud rate is usually determined by hardware for ACIA and
    SIO interfaces
 
@@ -3854,6 +3856,7 @@ the RomWBW HBIOS configuration.
    - WDC Floppy Disk Controller w/ 3.5" HD Drives
    - Onboard IDE Hard Disk Interface Module
    - PPIDE Hard Disk Interface Module
+   - VGARC Video & Keyboard Module
  - Serial baud rate is usually determined by hardware for ACIA and
    SIO interfaces
 
@@ -3923,6 +3926,6 @@ may be discovered by RomWBW in your system.
 | USB-FIFO  | Char     | FT232H-based ECB USB FIFO                              |
 | VDU       | Video    | MC6845 Family Video Display Controller                 |
 | VGA       | Video    | HD6445CP4-based Video Display Controller               |
-| VRC       | Video    | VGARC Video Display Controller                        s |
+| VRC       | Video    | VGARC Video Display Controller                         |
 | YM        | Audio    | YM2612 Programmable Sound Generator                    |
 | Z2U       | Char     | Zilog Z280 CPU Built-in Serial Ports                   |

Source/Fonts/Build.cmd

@@ -11,8 +11,8 @@ echo Preparing compressed font files...
 lzsa -f2 -r font8x8u.bin font8x8c.bin || exit /b
 lzsa -f2 -r font8x11u.bin font8x11c.bin || exit /b
 lzsa -f2 -r font8x16u.bin font8x16c.bin || exit /b
-
 lzsa -f2 -r fontcgau.bin fontcgac.bin || exit /b
+lzsa -f2 -r fontvgarcu.bin fontvgarcc.bin || exit /b
 
 fonttool font8x8u.bin > font8x8u.asm || exit /b
 fonttool font8x11u.bin > font8x11u.asm || exit /b
@@ -20,6 +20,7 @@ fonttool font8x16u.bin > font8x16u.asm || exit /b
 fonttool font8x8c.bin > font8x8c.asm || exit /b
 fonttool font8x11c.bin > font8x11c.asm || exit /b
 fonttool font8x16c.bin > font8x16c.asm || exit /b
-
 fonttool fontcgau.bin > fontcgau.asm || exit /b
 fonttool fontcgac.bin > fontcgac.asm || exit /b
+fonttool fontvgarcu.bin > fontvgarcu.asm || exit /b
+fonttool fontvgarcc.bin > fontvgarcc.asm || exit /b

Source/Fonts/Makefile

@@ -1,8 +1,8 @@
 OBJECTS = \
-	font8x8u.asm font8x11u.asm font8x16u.asm fontcgau.asm \
-	font8x8c.asm font8x11c.asm font8x16c.asm fontcgac.asm
+	font8x8u.asm font8x11u.asm font8x16u.asm fontcgau.asm fontvgarcu.asm \
+	font8x8c.asm font8x11c.asm font8x16c.asm fontcgac.asm fontvgarcc.asm
 
-OTHERS = font8x8c.bin font8x11c.bin font8x16c.bin fontcgac.bin
+OTHERS = font8x8c.bin font8x11c.bin font8x16c.bin fontcgac.bin fontvgarcc.bin
 
 TOOLS = ../../Tools
 
@@ -26,5 +26,8 @@ font8x16c.bin: font8x16u.bin
 fontcgac.bin: fontcgau.bin
 	$(BINDIR)/lzsa -f2 -r $< $@
 
+fontvgarcc.bin: fontvgarcu.bin
+	$(BINDIR)/lzsa -f2 -r $< $@
+
 %.asm: %.bin
 	$(BINDIR)/bin2asm $< > $@

Source/HBIOS/Config/MBC_std.asm

@@ -48,6 +48,8 @@ DSKYMODE	.SET	DSKYMODE_NG	; DSKY VERSION: DSKYMODE_[V1|NG]
 UARTINTS	.SET	FALSE		; UART: INCLUDE INTERRUPT SUPPORT UNDER IM1/2/3
 ;UARTCFG	.SET	UARTCFG | SER_RTS
 ;
+LPTENABLE	.SET	TRUE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+;
 CVDUMON		.SET	CVDUMON_CGA	; CVDU: CVDU MONITOR SETUP: CVDUMON_[NONE|CGA|EGA]
 ;
 FDENABLE	.SET	TRUE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)

Source/HBIOS/Config/RCZ280_zz80mb.asm

@@ -55,7 +55,7 @@ TMSENABLE	.SET	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSMODE		.SET	TMSMODE_MSX	; TMS: DRIVER MODE: TMSMODE_[SCG|N8|MBC|MSX|MSX9958|MSXKBD|COLECO]
 MKYENABLE	.SET	FALSE		; MSX 5255 PPI KEYBOARD COMPATIBLE DRIVER (REQUIRES TMS VDA DRIVER)
 VRCENABLE	.SET	TRUE		; VRC: ENABLE VGARC VIDEO/KBD DRIVER (VRC.ASM)
-VDAEMU_SERKBD	.SET	0		; VDA EMULATION: SERIAL KBD UNIT #, OR $FF FOR HW KBD
+VDAEMU_SERKBD	.SET	$FF		; VDA EMULATION: SERIAL KBD UNIT #, OR $FF FOR HW KBD
 ;
 AY38910ENABLE	.SET	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
 AYMODE		.SET	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG|N8|RCZ80|RCZ180|MSX|LINC]

Source/HBIOS/Config/RCZ280_zzrc.asm

@@ -63,7 +63,7 @@ TMSENABLE	.SET	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSMODE		.SET	TMSMODE_MSX	; TMS: DRIVER MODE: TMSMODE_[SCG|N8|MBC|MSX|MSX9958|MSXKBD|COLECO]
 MKYENABLE	.SET	FALSE		; MSX 5255 PPI KEYBOARD COMPATIBLE DRIVER (REQUIRES TMS VDA DRIVER)
 VRCENABLE	.SET	TRUE		; VRC: ENABLE VGARC VIDEO/KBD DRIVER (VRC.ASM)
-VDAEMU_SERKBD	.SET	0		; VDA EMULATION: SERIAL KBD UNIT #, OR $FF FOR HW KBD
+VDAEMU_SERKBD	.SET	$FF		; VDA EMULATION: SERIAL KBD UNIT #, OR $FF FOR HW KBD
 ;
 AY38910ENABLE	.SET	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
 AYMODE		.SET	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG|N8|RCZ80|RCZ180|MSX|LINC]

Source/HBIOS/Config/RCZ80_std.asm

@@ -40,6 +40,8 @@ ACIAENABLE	.SET	TRUE		; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM)
 SIOENABLE	.SET	TRUE		; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM)
 DUARTENABLE	.SET	FALSE		; DUART: ENABLE 2681/2692 SERIAL DRIVER (DUART.ASM)
 ;
+LPTENABLE	.SET	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+;
 TMSENABLE	.SET	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.SET	FALSE		; TMS: ENABLE TIMER INTERRUPTS (REQUIRES IM1)
 TMSMODE		.SET	TMSMODE_MSX	; TMS: DRIVER MODE: TMSMODE_[SCG|N8|MBC|MSX|MSX9958|MSXKBD|COLECO]

Source/HBIOS/Makefile

@@ -24,7 +24,8 @@ endif
 
 include $(TOOLS)/Makefile.inc
 
-FONTS := font8x11c.asm font8x11u.asm font8x16c.asm font8x16u.asm font8x8c.asm font8x8u.asm fontcgac.asm fontcgau.asm
+FONTS := font8x11c.asm font8x11u.asm font8x16c.asm font8x16u.asm font8x8c.asm font8x8u.asm \
+	fontcgac.asm fontcgau.asm fontvgarcc.asm fontvgarcu.asm
 
 ifeq ($(CPUFAM),2)
 	TASM=$(BINDIR)/uz80as -t hd64180

Source/HBIOS/ansi.asm

@@ -634,7 +634,6 @@ ANSI_BEL:
 ANSI_BS:
 	LD	A,(ANSI_COL)	; GET CURRENT COLUMN
 	DEC	A		; BACK IT UP BY ONE
-	;RET	C		; IF CARRY, MARGIN EXCEEDED, ABORT
 	RET	M		; IF CARRY, MARGIN EXCEEDED, ABORT
 	LD	(ANSI_COL),A	; SAVE NEW COLUMN
 	JP	ANSI_XY		; UDPATE CURSOR AND RETURN

Source/HBIOS/cfg_master.asm

@@ -311,7 +311,9 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_NONE	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
 LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 LPT0BASE	.EQU	$E8		; LPT 0: REGISTERS BASE ADR
 LPT1BASE	.EQU	$EC		; LPT 1: REGISTERS BASE ADR
 ;

Source/HBIOS/cfg_mbc.asm

@@ -234,8 +234,10 @@ PIOCNT		.EQU	2		; PIO: NUMBER OF CHIPS TO DETECT (1-2), 2 CHANNELS PER CHIP
 PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
-LPTENABLE	.EQU	TRUE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_IBM	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
 LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 LPT0BASE	.EQU	$E8		; LPT 0: REGISTERS BASE ADR
 LPT1BASE	.EQU	$EC		; LPT 1: REGISTERS BASE ADR
 ;

Source/HBIOS/cfg_mk4.asm

@@ -248,7 +248,9 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_NONE	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
 LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 LPT0BASE	.EQU	$E8		; LPT 0: REGISTERS BASE ADR
 LPT1BASE	.EQU	$EC		; LPT 1: REGISTERS BASE ADR
 ;

Source/HBIOS/cfg_rcz180.asm

@@ -257,6 +257,11 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_MG014	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
+LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
+LPT0BASE	.EQU	$18		; LPT 0: REGISTERS BASE ADR
+LPT1BASE	.EQU	$00		; LPT 1: REGISTERS BASE ADR
 ;
 PIO_4P		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB 4P BOARD
 PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS BOARD (PIO.ASM)

Source/HBIOS/cfg_rcz280.asm

@@ -261,6 +261,11 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_MG014	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
+LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
+LPT0BASE	.EQU	$18		; LPT 0: REGISTERS BASE ADR
+LPT1BASE	.EQU	$00		; LPT 1: REGISTERS BASE ADR
 ;
 PIO_4P		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB 4P BOARD
 PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS BOARD (PIO.ASM)

Source/HBIOS/cfg_rcz80.asm

@@ -255,6 +255,11 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_MG014	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
+LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
+LPT0BASE	.EQU	$18		; LPT 0: REGISTERS BASE ADR
+LPT1BASE	.EQU	$00		; LPT 1: REGISTERS BASE ADR
 ;
 PIO_4P		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB 4P BOARD
 PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS BOARD (PIO.ASM)

Source/HBIOS/cfg_sbc.asm

@@ -234,7 +234,9 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_NONE	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
 LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 LPT0BASE	.EQU	$E8		; LPT 0: REGISTERS BASE ADR
 LPT1BASE	.EQU	$EC		; LPT 1: REGISTERS BASE ADR
 ;

Source/HBIOS/cfg_scz180.asm

@@ -251,6 +251,11 @@ PIO0BASE	.EQU	$B8		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.EQU	$BC		; PIO 1: REGISTERS BASE ADR
 ;
 LPTENABLE	.EQU	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
+LPTMODE		.EQU	LPTMODE_MG014	; LPT: DRIVER MODE: LPTMODE_[NONE|IBM|MG014]
+LPTCNT		.EQU	1		; LPT: NUMBER OF CHIPS TO DETECT (1-2)
+LPTTRACE	.EQU	1		; LPT: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
+LPT0BASE	.EQU	$18		; LPT 0: REGISTERS BASE ADR
+LPT1BASE	.EQU	$00		; LPT 1: REGISTERS BASE ADR
 ;
 PIO_4P		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB 4P BOARD
 PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS BOARD (PIO.ASM)

Source/HBIOS/hbios.asm

@@ -6225,6 +6225,16 @@ FONTCGA:
 	.ECHO	" CGA"
 #ENDIF
 ;
+#IFDEF USEFONTVGARC
+FONTVGARC:
+  #IF USELZSA2
+    #INCLUDE "fontvgarcc.asm"
+  #ELSE
+    #INCLUDE "fontvgarcu.asm"
+  #ENDIF
+	.ECHO	" VGARC"
+#ENDIF
+;
 SIZ_FONTS	.EQU	$ - ORG_FONTS
 		.ECHO	" occupy "
 		.ECHO	SIZ_FONTS

Source/HBIOS/kbd.asm

@@ -70,17 +70,33 @@ KBD_INIT:
 	LD	(KBD_REPEAT),A		; SAVE IT
 	LD	A,KBD_DEFSTATE		; GET DEFAULT STATE
 	LD	(KBD_STATE),A		; SAVE IT
-
+;
+	LD	A,(IY+KBD_MODE)		; GET KBD MODE BYTE
+	CP	KBDMODE_VRC		; VRC?
+	JR	Z,KBD_INIT1		; IF SO, MUST ASSUME PRESENT
+;
 	LD	A,$AA			; CONTROLLER SELF TEST
 	CALL	KBD_PUTCMD		; SEND IT
 	CALL	KBD_GETDATA		; CONTROLLER SHOULD RESPOND WITH $55 (ACK)
-
+;
 	CP	$55			; IS IT THERE?
 	JR	Z,KBD_INIT1		; IF SO, CONTINUE
 	PRTS(" NOT PRESENT$")		; DIAGNOSE PROBLEM
 	RET				; BAIL OUT
-
+;
 KBD_INIT1:
+	PRTS(" MODE=$")			; TAG
+	LD	A,(IY+KBD_MODE)		; GET MODE VALUE
+	LD	DE,KBD_STR_MODEPS2
+	CP	KBDMODE_PS2
+	JR	Z,KBD_INIT2
+	LD	DE,KBD_STR_MODEVRC
+	CP	KBDMODE_VRC
+	JR	Z,KBD_INIT2
+	LD	DE,KBD_STR_MODEUNK
+KBD_INIT2:
+	CALL	WRITESTR
+;
 	LD	A,$60			; SET COMMAND REGISTER
 	CALL	KBD_PUTCMD		; SEND IT
 ;	LD	A,$60			; XLAT ENABLED, MOUSE DISABLED, NO INTS
@@ -89,11 +105,6 @@ KBD_INIT1:
 	
 	CALL	KBD_GETDATA		; GOBBLE UP $AA FROM POWER UP, AS NEEDED
 	
-;	LD	A,$AE			; COMMAND = ENABLE KEYBOARD
-;	CALL	KBD_PUTCMD		; SEND IT
-;	LD	A,$A7			; COMMAND = DISABLE MOUSE
-;	CALL	KBD_PUTCMD		; SEND IT
-	
 	CALL 	KBD_RESET		; RESET THE KEYBOARD
 	CALL	KBD_SETLEDS		; UPDATE LEDS BASED ON CURRENT TOGGLE STATE BITS
 	CALL	KBD_SETRPT		; UPDATE REPEAT RATE BASED ON CURRENT SETTING
@@ -178,7 +189,7 @@ KBD_PUTCMD:
 ; PUT A CMD BYTE FROM A TO THE KEYBOARD INTERFACE WITH TIMEOUT
 ;
 	LD	E,A			; SAVE INCOMING VALUE IN E
-	LD	A,(KBD_MODE)		; GET MODE BYTE
+	LD	A,(IY+KBD_MODE)		; GET MODE BYTE
 	CP	KBDMODE_VRC		; VGARC KEYBOARD?
 	JR	Z,KBD_PUTCMD2		; BAIL OUT
 	LD	B,KBD_WAITTO		; SETUP TO LOOP
@@ -208,7 +219,7 @@ KBD_PUTDATA:
 ; PUT A DATA BYTE FROM A TO THE KEYBOARD INTERFACE WITH TIMEOUT
 ;
 	LD	E,A			; SAVE INCOMING VALUE IN E
-	LD	A,(KBD_MODE)		; GET MODE BYTE
+	LD	A,(IY+KBD_MODE)		; GET MODE BYTE
 	CP	KBDMODE_VRC		; VGARC KEYBOARD?
 	JR	Z,KBD_PUTDATA2		; BAIL OUT
 	LD	B,KBD_WAITTO		; SETUP TO LOOP
@@ -690,11 +701,21 @@ KBD_DECNEW:	; START NEW KEYPRESS (CLEAR ALL STATUS BITS)
 	LD	(KBD_STATUS),A		; CLEAR STATUS
 	JP	KBD_DEC1		; RESTART THE ENGINE
 ;
+; DRIVER DATA
+;
+KBD_STR_MODEPS2		.TEXT	"PS2$"
+KBD_STR_MODEVRC		.TEXT	"VRC$"
+KBD_STR_MODEUNK		.TEXT	"???$"
+;
+;
+;
 #IF (KBDKBLOUT == KBD_US)
+;
 ;__________________________________________________________________________________________________
 ;
 ; MAPPING TABLES US/ENGLISH
 ;__________________________________________________________________________________________________
+;
 KBD_MAPSTD:	; SCANCODE IS INDEX INTO TABLE TO RESULTANT LOOKUP KEYCODE
 	.DB	$FF,$E8,$FF,$E4,$E2,$E0,$E1,$EB,$FF,$E9,$E7,$E5,$E3,$09,'`',$FF
 	.DB	$FF,$B4,$B0,$FF,$B2,'q','1',$FF,$FF,$FF,'z','s','a','w','2',$FF
@@ -731,7 +752,9 @@ KBD_MAPNUMPAD:	; KEYCODE TRANSLATION FROM NUMPAD RANGE TO STD ASCII/KEYCODES
 	.DB	$F3,$F7,$F5,$F8,$FF,$F9,$F2,$F6,$F4,$F0,$F1,$2F,$2A,$2D,$2B,$0D
 	.DB	$31,$32,$33,$34,$35,$36,$37,$38,$39,$30,$2E,$2F,$2A,$2D,$2B,$0D
 #ENDIF
+;
 #IF (KBDKBLOUT == KBD_DE)
+;
 ;__________________________________________________________________________________________________
 ;
 ; MAPPING TABLES GERMAN

Source/HBIOS/lpt.asm

@@ -3,12 +3,15 @@
 ; CENTRONICS (LPT) INTERFACE DRIVER
 ;==================================================================================================
 ;
-; CENTRONICS-STYLE PARALLEL PRINTER DRIVER.  ASSUMES IBM STYLE
-; HARDWARE INTERFACE AS DESCRIBED BELOW.
+; CENTRONICS-STYLE PARALLEL PRINTER DRIVER.
 ;
 ; IMPLEMENTED AS A ROMWBW CHARACTER DEVICE.  CURRENTLY HANDLES OUPUT
 ; ONLY.
 ;
+;==================================================================================================
+;
+;  IBM STYLE INTERFACE (USED BY NHYODYNE PRINT MODULE):
+;
 ;  PORT 0 (INPUT/OUTPUT):
 ;
 ;	D7	D6	D5	D4	D3	D2	D1	D0
@@ -20,7 +23,7 @@
 ;
 ;	D7	D6	D5	D4	D3	D2	D1	D0
 ;     +-------+-------+-------+-------+-------+-------+-------+-------+
-;     | BUSY  | ACK   | POUT  | SEL   | ERR   | 0     | 0     | 0     |
+;     | /BUSY | /ACK  | POUT  | SEL   | /ERR  | 0     | 0     | 0     |
 ;     +-------+-------+-------+-------+-------+-------+-------+-------+
 ;
 ;  PORT 2 (INPUT/OUTPUT):
@@ -30,16 +33,40 @@
 ;     | STAT1 | STAT0 | ENBL  | PINT  | SEL   | RES   | LF    | STB   |
 ;     +-------+-------+-------+-------+-------+-------+-------+-------+
 ;
-LPT_NONE	.EQU	0		; NOT PRESENT
-LPT_IBM		.EQU	1		; IBM PC STYLE INTERFACE
+;==================================================================================================
+;
+;  MG014 STYLE INTERFACE (USED BY RCBUS MG014 MODULE):
+;
+;  PORT 0 (INPUT/OUTPUT):
+;
+;	D7	D6	D5	D4	D3	D2	D1	D0
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;     | PD7   | PD6   | PD5   | PD4   | PD3   | PD2   | PD1   | PD0   |
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;
+;  PORT 1 (INPUT):
+;
+;	D7	D6	D5	D4	D3	D2	D1	D0
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;     |	      |	      |	      | /ERR  | SEL   | POUT  | BUSY  | /ACK  |
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;
+;  PORT 2 (INPUT/OUTPUT):
+;
+;	D7	D6	D5	D4	D3	D2	D1	D0
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;     | LED   |	      |	      |	      | /SEL  | /RES  | /LF   | /STB  |
+;     +-------+-------+-------+-------+-------+-------+-------+-------+
+;
+;==================================================================================================
 ;
 ; PRE-CONSOLE INITIALIZATION - DETECT AND INIT HARDWARE
 ;
 LPT_PREINIT:
 ;
 ; SETUP THE DISPATCH TABLE ENTRIES
-; NOTE: INTS WILL BE DISABLED WHEN PREINIT IS CALLED AND THEY MUST REMIAIN
-; DISABLED.
+; NOTE: INTS WILL BE DISABLED WHEN PREINIT IS CALLED AND THEY MUST
+; REMAIN DISABLED.
 ;
 	LD	B,LPT_CFGCNT		; LOOP CONTROL
 	XOR	A			; ZERO TO ACCUM
@@ -136,18 +163,26 @@ LPT_IN:
 LPT_OUT:
 	CALL	LPT_OST			; READY TO SEND?
 	JR	Z,LPT_OUT		; LOOP IF NOT
-	LD	A,(IY+3)
-	LD	C,A			; PORT 0 (DATA)
- 	OUT	(C),E			; OUTPUT DATA TO PORT
- 	CALL 	DELAY   		; IGNORE ANYTHING BACK AFTER A RESET
-        LD      A,%00001101             ; SELECT & STROBE, LEDS OFF
-	INC 	C 			; PUT CONTROL PORT IN C
-	INC 	C
-        OUT	(C),A			; OUTPUT DATA TO PORT
-  	CALL 	DELAY   		; IGNORE ANYTHING BACK AFTER A RESET
-        LD      A,%00001100             ; SELECT, LEDS OFF
-        OUT	(C),A			; OUTPUT DATA TO PORT
-
+	LD	C,(IY+3)		; PORT 0 (DATA)
+	OUT	(C),E			; OUTPUT DATA TO PORT
+#IF (LPTMODE == LPTMODE_IBM)
+	LD	A,%00001101		; SELECT & STROBE, LEDS OFF
+#ENDIF
+#IF (LPTMODE == LPTMODE_MG014)
+	LD	A,%00000100		; SELECT & STROBE, LED OFF
+#ENDIF
+	INC	C			; PUT CONTROL PORT IN C
+	INC	C
+	OUT	(C),A			; OUTPUT DATA TO PORT
+	CALL	DELAY
+#IF (LPTMODE == LPTMODE_IBM)
+	LD	A,%00001100		; SELECT, LEDS OFF
+#ENDIF
+#IF (LPTMODE == LPTMODE_MG014)
+	LD	A,%00000101		; SELECT, LED OFF
+#ENDIF
+	OUT	(C),A			; OUTPUT DATA TO PORT
+	CALL	DELAY
 	XOR	A			; SIGNAL SUCCESS
 	RET
 ;
@@ -161,11 +196,16 @@ LPT_IST:
 ; OUTPUT STATUS
 ;
 LPT_OST:
-	LD	A,(IY+3)
-	LD	C,A			; PORT 0 (DATA)
-	INC 	C			; SELECT STATUS PORT
- 	IN	A,(C)			; GET STATUS INFO
-    	AND	%10000000		; ONLY INTERESTED IN BUSY FLAG
+	LD	C,(IY+3)		; BASE PORT
+	INC	C			; SELECT STATUS PORT
+	IN	A,(C)			; GET STATUS INFO
+#IF (LPTMODE == LPTMODE_IBM)
+	AND	%10000000		; ISOLATE /BUSY
+#ENDIF
+#IF (LPTMODE == LPTMODE_MG014)
+	AND	%00000010		; ISOLATE BUSY
+	XOR	%00000010		; INVERT TO READY
+#ENDIF
 	RET				; DONE
 ;
 ; INITIALIZE DEVICE
@@ -180,20 +220,40 @@ LPT_INITDEV:
 ; PREINIT ABOVE.  PREINIT IS NOT ALLOWED TO ENABLE INTS!
 ;
 LPT_INITDEVX:
-	LD	A,(IY+3)
-	LD	C,A			; PORT 0 (DATA)
+;
+#IF (LPTMODE == LPTMODE_IBM)
+;
+	LD	C,(IY+3)		; PORT 0 (DATA)
 	XOR	A			; CLEAR ACCUM
 	OUT	(C),A			; SEND IT
 	INC	C			; BUMP TO
 	INC	C			; ... PORT 2
 	LD	A,%00001000		; SELECT AND ASSERT RESET, LEDS OFF
 	OUT	(C),A			; SEND IT
- 	CALL	LDELAY			; HALF SECOND DELAY
+	CALL	LDELAY			; HALF SECOND DELAY
 	LD	A,%00001100		; SELECT AND DEASSERT RESET, LEDS OFF
 	OUT	(C),A			; SEND IT
 	XOR	A			; SIGNAL SUCCESS
 	RET				; RETURN
 ;
+#ENDIF
+;
+#IF (LPTMODE == LPTMODE_MG014)
+	LD	A,(IY+3)		; BASE PORT
+	ADD	A,3			; BUMP TO CONTROL PORT
+	LD	C,A			; MOVE TO C FOR I/O
+	LD	A,$82			; CONFIG A OUT, B IN, C OUT
+	OUT	(C),A			; DO IT
+	DEC	C			; OUTPUT PORT
+	LD	A,$81			; STROBE OFF, SELECT ON, RES ON, LED ON
+	OUT	(C),A			; SEND IT
+	CALL	LDELAY			; HALF SECOND DELAY
+	LD	A,$05			; STROBE OFF, SELECT ON, RES OFF, LED OFF
+	OUT	(C),A			; SEND IT
+	XOR	A			; SIGNAL SUCCESS
+	RET				; RETURN
+#ENDIF
+;
 ;
 ;
 LPT_QUERY:
@@ -215,17 +275,26 @@ LPT_DEVICE:
 ;
 ; LPT DETECTION ROUTINE
 ;
+#IF (LPTMODE == LPTMODE_NONE)
+;
 LPT_DETECT:
-	LD	A,(IY+3)		; BASE PORT ADDRESS
-	LD	C,A			; PUT IN C FOR I/O
+	LD	A,LPTMODE_NONE		; NOTHING TO DETECT
+	RET
+;
+#ENDIF
+;
+#IF (LPTMODE == LPTMODE_IBM)
+;
+LPT_DETECT:
+	LD	C,(IY+3)		; BASE PORT ADDRESS
 	CALL	LPT_DETECT2		; CHECK IT
 	JR	Z,LPT_DETECT1		; FOUND IT, RECORD IT
-	LD	A,LPT_NONE		; NOTHING FOUND
+	LD	A,LPTMODE_NONE		; NOTHING FOUND
 	RET				; DONE
 ;
 LPT_DETECT1:
 	; LPT FOUND, RECORD IT
-	LD	A,LPT_IBM		; RETURN CHIP TYPE
+	LD	A,LPTMODE_IBM		; RETURN CHIP TYPE
 	RET				; DONE
 ;
 LPT_DETECT2:
@@ -253,6 +322,43 @@ LPT_DETECT2:
 	CP	$A5			; CORRECT?
 	RET				; RETURN (ZF SET CORRECTLY)
 ;
+#ENDIF
+;
+#IF (LPTMODE == LPTMODE_MG014)
+LPT_DETECT:
+;
+	; TEST FOR PPI EXISTENCE
+	; WE SETUP THE PPI TO WRITE, THEN WRITE A VALUE OF $A5
+	; TO PORT A (DATALO), THEN READ IT BACK.  IF THE PPI IS THERE
+	; THEN THE BUS HOLD CIRCUITRY WILL READ BACK THE $A5. SINCE
+	; WE ARE IN WRITE MODE, AN IDE CONTROLLER WILL NOT BE ABLE TO
+	; INTERFERE WITH THE VALUE BEING READ.
+;
+	LD	A,(IY+3)		; BASE IO ADDRESS
+	ADD	A,3			; BUMP TO CONTROL PORT
+	LD	C,A			; PUT IN C
+	LD	A,$80			; SET PORT A TO WRITE
+	OUT	(C),A			; WRITE IT
+;
+	LD	C,(IY+3)		; PPI PORT A
+	LD	A,$A5			; TEST VALUE
+	OUT	(C),A			; PUSH VALUE TO PORT
+	IN	A,(C)			; GET PORT VALUE
+#IF (LPTTRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
+	CP	$A5			; CHECK FOR TEST VALUE
+	JR	Z,LPT_DETECT1		; FOUND IT
+	LD	A,LPTMODE_NONE		; NOT FOUND
+	RET
+;
+LPT_DETECT1:
+	; LPT FOUND, RECORD IT
+	LD	A,LPTMODE_MG014		; RETURN CHIP TYPE
+	RET				; DONE
+#ENDIF
+;
 ;
 ;
 LPT_PRTCFG:
@@ -291,9 +397,11 @@ LPT_PRTCFG:
 LPT_TYPE_MAP:
 		.DW	LPT_STR_NONE
 		.DW	LPT_STR_IBM
+		.DW	LPT_STR_MG014
 ;
 LPT_STR_NONE	.DB	"<NOT PRESENT>$"
 LPT_STR_IBM	.DB	"IBM$"
+LPT_STR_MG014	.DB	"MG014$"
 ;
 ; WORKING VARIABLES
 ;

Source/HBIOS/std.asm

@@ -242,6 +242,12 @@ GDCMODE_NONE	.EQU	0
 GDCMODE_ECB	.EQU	1		; ECB GDC
 GDCMODE_RPH	.EQU	2		; RPH GDC
 ;
+; LPT DRIVER MODE SELECTIONS
+;
+LPTMODE_NONE	.EQU	0		; NONE
+LPTMODE_IBM	.EQU	1		; IBM STYLE INTERFACE
+LPTMODE_MG014	.EQU	2		; RCBUS MG014 STYLE INTERFACE
+;
 ; GDC MONITOR SELECTIONS
 ;
 GDCMON_NONE	.EQU	0

Source/HBIOS/unlzsa2s.asm

@@ -1,3 +1,4 @@
+;  WARNING: This code does not seem to be working on Z280.  WBW - 5/3/2023
 ;
 ;  Size-optimized LZSA2 decompressor by spke & uniabis (134 bytes)
 ;
@@ -59,8 +60,8 @@
 ;  3. This notice may not be removed or altered from any source distribution.
 ;
 
-;	#DEFINE	BACKWARD_DECOMPRESS						; uncomment for data compressed with option -b (+5 bytes, -3% speed)
-;	#DEFINE	AVOID_SELFMODIFYING_CODE					; uncomment to disallow self-modifying code (-1 byte, -4% speed)
+;	#DEFINE	BACKWARD_DECOMPRESS		; uncomment for data compressed with option -b (+5 bytes, -3% speed)
+;	#DEFINE	AVOID_SELFMODIFYING_CODE	; uncomment to disallow self-modifying code (-1 byte, -4% speed)
 
 	#IFNDEF	BACKWARD_DECOMPRESS
 
@@ -78,7 +79,7 @@
 
 		#DEFINE ADD_OFFSET \
 		#DEFCONT \ ld a,e \ sub l \ ld l,a
-		#DEFCONT \ ld a,d \ sbc h \ ld h,a						; 6*4 = 24t / 6 bytes
+		#DEFCONT \ ld a,d \ sbc h \ ld h,a	; 6*4 = 24t / 6 bytes
 
 		#DEFINE BLOCKCOPY \
 		#DEFCONT \ lddr
@@ -117,7 +118,7 @@ MatchLen:		and %00000111 \ add a,2 \ cp 9
 			call z,ExtendedCode
 
 CopyMatch:		ld c,a
-			push hl						; BC = len, DE = dest, HL = -offset, SP -> [src]
+			push hl		; BC = len, DE = dest, HL = -offset, SP -> [src]
 
 	#IFNDEF	AVOID_SELFMODIFYING_CODE
 PrevOffset		.EQU $+1 \ ld hl,0
@@ -125,8 +126,8 @@ PrevOffset		.EQU $+1 \ ld hl,0
 			push ix \ pop hl
 	#ENDIF
 			ADD_OFFSET
-			BLOCKCOPY					; BC = 0, DE = dest
-			pop hl						; HL = src
+			BLOCKCOPY	; BC = 0, DE = dest
+			pop hl		; HL = src
 
 ReadToken:	ld a,(hl) \ NEXT_HL \ push af
 		and %00011000 \ jr z,NoLiterals
@@ -162,12 +163,16 @@ ExtendedCode:	call ReadNibble \ inc a \ jr z,ExtraByte
 ExtraByte	ld a,15 \ add a,c \ add a,(hl) \ NEXT_HL \ ret nc
 		ld a,(hl) \ NEXT_HL
 		ld b,(hl) \ NEXT_HL \ ret nz
-		pop bc								; RET is not needed, because RET from ReadNibble is sufficient
+		pop bc			; RET is not needed, because RET from ReadNibble is sufficient
 
 
 ReadNibble:	ld c,a
-skipLDCA	xor a \ ex af,af' \ ret m
+skipLDCA	xor a \ nop \ ex af,af' \ ret m		; NOP for Z280 bug
 		ld a,(hl) \ or $F0 \ ex af,af'
 		ld a,(hl) \ NEXT_HL \ or $0F
 		rrca \ rrca \ rrca \ rrca \ ret
 
+; The extraneous NOP instruction above is to workaround a bug in the
+; Z280 processor where ex af,af' can copy rather than swap the flags
+; register.
+; See https://www.retrobrewcomputers.org/forum/index.php?t=msg&goto=10183&

Source/HBIOS/vrc.asm

@@ -21,8 +21,8 @@ VRC_KBDST	.EQU	$F5
 VRC_ROWS	.EQU	48
 VRC_COLS	.EQU	64
 ;
-#DEFINE USEFONT8X8
-#DEFINE	VRC_FONT FONT8X8
+#DEFINE USEFONTVGARC
+#DEFINE	VRC_FONT FONTVGARC
 ;
 TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 ;
@@ -63,7 +63,7 @@ VRC_INIT1:
 	CALL 	VRC_CRTINIT		; SETUP THE VGARC CHIP REGISTERS
 	CALL	VRC_LOADFONT		; LOAD FONT DATA FROM ROM TO VGARC STORAGE
 	CALL	VRC_VDARES		; RESET
-	;CALL	KBD_INIT		; INITIALIZE KEYBOARD DRIVER
+	CALL	KBD_INIT		; INITIALIZE KEYBOARD DRIVER
 
 	; ADD OURSELVES TO VDA DISPATCH TABLE
 	LD	BC,VRC_FNTBL		; BC := FUNCTION TABLE ADDRESS
@@ -283,9 +283,14 @@ VRC_LOADFONT:
 	LD	HL,VRC_FONT		; START OF FONT DATA
 #ENDIF
 ;
+#IF 0
+	; THIS APPROACH TO LOADING FONTS IS BEST (FASTEST), BUT IS
+	; CAUSING ARTIFACTS ON THE DISPLAYED FONTS WHEN RUN ON A
+	; Z280.  IT IS NOT CLEAR WHAT THE PROBLEM IS (POSSIBLY
+	; Z280 BUG), BUT FOR NOW WE AVOID THIS AND USE AN
+	; ALTERNATIVE APPROACH BELOW.
 	LD	DE,0+(128*8)-1		; LENGTH OF FONT DATA - 1
 	ADD	HL,DE			; ADD TO HL
-;	LD	HL,ENDFONT-1
 	LD	BC,VRC_FONTBASE+3	; WORK BACKWARDS
 	OTDR				; DO 4 PAGES
 	DEC	C
@@ -295,6 +300,24 @@ VRC_LOADFONT:
 	DEC	C
 	OTDR
 	DEC	C
+#ENDIF
+;
+#IF 1
+	; ALTERNATIVE APPROACH TO LOADING FONTS.  THIS ONE AVOIDS
+	; THE USE OF OTDR WHICH SEEMS TO CAUSE PROBLEMS ON Z280.
+	LD	B,0
+	LD	C,VRC_FONTBASE
+VRC_LOADFONT1:
+	LD	A,(HL)
+	OUT	(C),A
+	INC	HL
+	INC	B
+	JR	NZ,VRC_LOADFONT1
+	INC	C
+	LD	A,C
+	CP	VRC_FONTBASE + 4
+	JR	NZ,VRC_LOADFONT1
+#ENDIF
 ;
 #IF USELZSA2
 	LD	HL,(VRC_STACK)		; ERASE DECOMPRESS BUFFER

Source/ver.inc

@@ -2,7 +2,7 @@
 #DEFINE	RMN	3
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.3.0-dev.9"
+#DEFINE BIOSVER	"3.3.0-dev.13"
 #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.9"
+	db	"3.3.0-dev.13"
 	endm