From bbd1ce616833c4e28d0fcf793518321c033a8bbc Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sat, 14 Mar 2020 14:37:18 -0700
Subject: [PATCH] Config File Cleanups

---
 Source/HBIOS/Config/RCZ80_mt.asm   |  1 -
 Source/HBIOS/Config/RCZ80_wiz.asm  | 30 ------------------------------
 Source/HBIOS/Config/SBC_simh.asm   |  1 -
 Source/HBIOS/Config/SCZ180_126.asm |  1 +
 Source/HBIOS/Config/SCZ180_130.asm |  5 +++++
 Source/HBIOS/Makefile              |  1 -
 6 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 Source/HBIOS/Config/RCZ80_wiz.asm

diff --git a/Source/HBIOS/Config/RCZ80_mt.asm b/Source/HBIOS/Config/RCZ80_mt.asm
index 7006d750..bdd72e8d 100644
--- a/Source/HBIOS/Config/RCZ80_mt.asm
+++ b/Source/HBIOS/Config/RCZ80_mt.asm
@@ -28,4 +28,3 @@
 ;
 SDENABLE	.SET	TRUE		; SD: ENABLE SD CARD DISK DRIVER (SD.ASM)
 SDMODE		.SET	SDMODE_MT	; SD: DRIVER MODE: SDMODE_[JUHA|N8|CSIO|PPI|UART|DSD|MK4|SC|MT]
-
diff --git a/Source/HBIOS/Config/RCZ80_wiz.asm b/Source/HBIOS/Config/RCZ80_wiz.asm
deleted file mode 100644
index b61b2d0f..00000000
--- a/Source/HBIOS/Config/RCZ80_wiz.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-;
-;==================================================================================================
-;   RC2014 Z80 CONFIGURATION W/ WIZNET
-;==================================================================================================
-;
-; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
-; CFG_<PLT>.ASM INCLUDED FILE WHICH IS FOUND IN THE PARENT DIRECTORY.  THIS FILE CONTAINS
-; COMMON CONFIGURATION SETTINGS THAT OVERRIDE THE DEFAULTS.  IT IS INTENDED THAT YOU MAKE
-; YOUR CUSTOMIZATIONS IN THIS FILE AND JUST INHERIT ALL OTHER SETTINGS FROM THE DEFAULTS.
-; EVEN BETTER, YOU CAN MAKE A COPY OF THIS FILE WITH A NAME LIKE <PLT>_XXX.ASM AND SPECIFY
-; YOUR FILE IN THE BUILD PROCESS.
-;
-; THE SETTINGS BELOW ARE THE SETTINGS THAT ARE MOST COMMONLY MODIFIED FOR THIS PLATFORM.
-; MANY OF THEM ARE EQUAL TO THE SETTINGS IN THE INCLUDED FILE, SO THEY DON'T REALLY DO
-; ANYTHING AS IS.  THEY ARE LISTED HERE TO MAKE IT EASY FOR YOU TO ADJUST THE MOST COMMON
-; SETTINGS.
-;
-; N.B., SINCE THE SETTINGS BELOW ARE REDEFINING VALUES ALREADY SET IN THE INCLUDED FILE,
-; TASM INSISTS THAT YOU USE THE .SET OPERATOR AND NOT THE .EQU OPERATOR BELOW. ATTEMPTING
-; TO REDEFINE A VALUE WITH .EQU BELOW WILL CAUSE TASM ERRORS!
-;
-; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
-; DIRECTORIES ABOVE THIS ONE).
-;
-#DEFINE		PLATFORM_NAME	"RC2014 (wiz)"
-;
-#include "Config/RCZ80_std.asm"
-;
-SDENABLE	.SET	TRUE
-SDMODE		.SET	SDMODE_MT
diff --git a/Source/HBIOS/Config/SBC_simh.asm b/Source/HBIOS/Config/SBC_simh.asm
index dd7fad54..85600427 100644
--- a/Source/HBIOS/Config/SBC_simh.asm
+++ b/Source/HBIOS/Config/SBC_simh.asm
@@ -31,7 +31,6 @@ INTMODE		.SET	1		; INTERRUPTS: 0=NONE, 1=MODE 1, 2=MODE 2
 HTIMENABLE	.SET	TRUE		; ENABLE SIMH TIMER SUPPORT
 ;
 SIMRTCENABLE	.SET	TRUE		; ENABLE SIMH CLOCK DRIVER (SIMRTC.ASM)
-;
 DSRTCENABLE	.SET	FALSE		; DSRTC: ENABLE DS-1302 CLOCK DRIVER (DSRTC.ASM)
 ;
 HDSKENABLE	.SET	TRUE		; HDSK: ENABLE SIMH HDSK DISK DRIVER (HDSK.ASM)
diff --git a/Source/HBIOS/Config/SCZ180_126.asm b/Source/HBIOS/Config/SCZ180_126.asm
index 9bb78400..851f3476 100644
--- a/Source/HBIOS/Config/SCZ180_126.asm
+++ b/Source/HBIOS/Config/SCZ180_126.asm
@@ -37,6 +37,7 @@ HBIOS_MUTEX	.SET	FALSE		; ENABLE REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ASCIENABLE	.SET	TRUE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ;
 ACIAENABLE	.SET	FALSE		; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM)
+;
 SIOENABLE	.SET	FALSE		; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM)
 ;
 FDENABLE	.SET	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
diff --git a/Source/HBIOS/Config/SCZ180_130.asm b/Source/HBIOS/Config/SCZ180_130.asm
index 7ee6370d..b3f22265 100644
--- a/Source/HBIOS/Config/SCZ180_130.asm
+++ b/Source/HBIOS/Config/SCZ180_130.asm
@@ -36,9 +36,14 @@ HBIOS_MUTEX	.SET	FALSE		; ENABLE REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 LEDENABLE	.SET	TRUE		; ENABLE STATUS LED (SINGLE LED)
 ;
+DIAGENABLE	.SET	FALSE		; ENABLES OUTPUT TO 8 BIT LED DIAGNOSTIC PORT
+;
+DSRTCENABLE	.SET	FALSE		; DSRTC: ENABLE DS-1302 CLOCK DRIVER (DSRTC.ASM)
+;
 ASCIENABLE	.SET	TRUE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ;
 ACIAENABLE	.SET	FALSE		; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM)
+;
 SIOENABLE	.SET	FALSE		; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM)
 ;
 FDENABLE	.SET	FALSE		; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM)
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index 164d999a..6ee90216 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -10,7 +10,6 @@ OBJECTS += RCZ180_nat.rom RCZ180_nat.com
 OBJECTS += RCZ80_kio.rom RCZ80_kio.com
 OBJECTS += RCZ80_mt.rom RCZ80_mt.com
 OBJECTS += RCZ80_std.rom RCZ80_std.com
-OBJECTS += RCZ80_wiz.rom RCZ80_wiz.com
 OBJECTS += SBC_simh.rom SBC_simh.com
 OBJECTS += SBC_std.rom SBC_std.com 
 OBJECTS += SCZ180_126.rom SCZ180_126.com