Merge pull request #168 from wwarthen/dev

Resync

Source/HBIOS/Config/DYNO_std.asm

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

Source/HBIOS/Config/EZZ80_std.asm

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

Source/HBIOS/Config/MK4_std.asm

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

Source/HBIOS/Config/N8_std.asm

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

Source/HBIOS/Config/RCZ180_ext.asm

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   RC2014 Z180 STANDARD CONFIGURATION (EXTERNAL 512K RAM/ROM BANKED MEMORY MODULE)
+;   RC2014 Z180 STANDARD CONFIGURATION (EXTERNAL MMU ON 512K RAM/ROM BANKED MEMORY MODULE)
 ;==================================================================================================
 ;
 ; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
@@ -22,7 +22,8 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#define	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
+#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

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   RC2014 Z180 STANDARD CONFIGURATION (NATIVE Z180 LINEAR MEMORY)
+;   RC2014 Z180 STANDARD CONFIGURATION (NATIVE Z180 MMU W/ LINEAR MEMORY)
 ;==================================================================================================
 ;
 ; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
@@ -22,7 +22,8 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#define	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
+#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/Config/RCZ280_ext.asm

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   RC2014 Z280 STANDARD CONFIGURATION (EXTERNAL 512K RAM/ROM BANKED MEMORY MODULE)
+;   RC2014 Z280 STANDARD CONFIGURATION (EXTERNAL MMU ON 512K RAM/ROM BANKED MEMORY MODULE)
 ;==================================================================================================
 ;
 ; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
@@ -22,7 +22,8 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#define	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
+#DEFINE PLATFORM_NAME "RC2014 (EXT MMU)"
+#DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_rcz280.asm"
 ;

Source/HBIOS/Config/RCZ280_nat.asm

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   RC2014 Z280 STANDARD CONFIGURATION (EXTERNAL 512K RAM/ROM BANKED MEMORY MODULE)
+;   RC2014 Z280 STANDARD CONFIGURATION (NATIVE Z280 MMU W/ LINEAR MEMORY)
 ;==================================================================================================
 ;
 ; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
@@ -22,7 +22,8 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#define	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
+#DEFINE PLATFORM_NAME "RC2014 (NATIVE MMU)"
+#DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_rcz280.asm"
 ;
@@ -40,7 +41,7 @@ Z280_INTWAIT	.SET	0		; Z280: INT ACK WAIT STATUS (0-3)
 ;
 Z2UENABLE	.SET	TRUE		; Z2U: ENABLE Z280 UART SERIAL DRIVER (Z2U.ASM)
 UARTENABLE	.SET	TRUE		; UART: ENABLE 8250/16550-LIKE SERIAL DRIVER (UART.ASM)
-ACIAENABLE	.SET	FALSE		; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM)
+ACIAENABLE	.SET	TRUE		; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM)
 SIOENABLE	.SET	TRUE		; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM)
 ;
 IDEENABLE	.SET	TRUE		; IDE: ENABLE IDE DISK DRIVER (IDE.ASM)

Source/HBIOS/Config/RCZ80_duart.asm

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

Source/HBIOS/Config/RCZ80_kio.asm

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

Source/HBIOS/Config/RCZ80_mt.asm

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

Source/HBIOS/Config/RCZ80_std.asm

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

Source/HBIOS/Config/RCZ80_zrc.asm

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

Source/HBIOS/Config/SBC_max.asm

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

Source/HBIOS/Config/SBC_simh.asm

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

Source/HBIOS/Config/SBC_std.asm

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

Source/HBIOS/Config/SCZ180_126.asm

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

Source/HBIOS/Config/SCZ180_130.asm

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

Source/HBIOS/Config/SCZ180_131.asm

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

Source/HBIOS/Config/UNA_std.asm

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

Source/HBIOS/Config/ZETA2_std.asm

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

Source/HBIOS/Config/ZETA_std.asm

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

Source/HBIOS/acia.asm

@@ -57,11 +57,6 @@ ACIA_ACIA       .EQU    1
 ACIA_RTSON	.EQU	%00000000	; BIT MASK TO ASSERT RTS
 ACIA_RTSOFF	.EQU	%01000000	; BIT MASK TO DEASSERT RTS
 ;
-#IF (INTMODE > 1)
-        .ECHO   "*** ERROR: UNSUPPORTED INTMODE FOR ACIA DRIVER!!!\n"
-        !!!     ; FORCE AN ASSEMBLY ERROR
-#ENDIF
-;
 ;
 ;
 ACIA_PREINIT:
@@ -119,11 +114,6 @@ ACIA_INITUNIT:
         LD      H,(IY+9)		; ... INTO HL
         CALL    HB_ADDIM1               ; ADD TO IM1 CALL LIST
 #ENDIF
-;
-#IF (INTMODE > 1)
-	.ECHO	"*** ERROR: ACIA DEVICE DOES NOT SUPPORT INTMODE 2!!!\n"
-	!!!	; FORCE AN ASSEMBLY ERROR
-#ENDIF
 ;
 	; IT IS EASY TO SPECIFY A SERIAL CONFIG THAT CANNOT BE IMPLEMENTED
 	; DUE TO THE CONSTRAINTS OF THE ACIA.  HERE WE FORCE A GENERIC
@@ -158,7 +148,7 @@ ACIA_INIT1:
 ;
 ; INTERRUPT HANDLERS
 ;
-#IF (INTMODE == 0)
+#IF (INTMODE != 1)
 ;
 ; NO INTERRUPT HANDLERS UNDER INTMODE 0.  GENERATE A PANIC
 ; IF SOMETHING TRIES TO CALL THEM.
@@ -169,7 +159,7 @@ ACIA1_INT:
 ;
 #ENDIF
 ;
-#IF (INTMODE > 0)
+#IF (INTMODE == 1)
 ;
 ACIA0_INT:
 	LD	IY,ACIA0_CFG		; POINT TO ACIA0 CFG
@@ -263,7 +253,7 @@ ACIA_FNTBL:
 ;
 ;
 ;
-#IF (INTMODE == 0)
+#IF (INTMODE != 1)
 ;
 ACIA_IN:
         CALL    ACIA_IST                ; CHAR WAITING?
@@ -336,7 +326,7 @@ ACIA_OUT:
 ;
 ;
 ;
-#IF (INTMODE == 0)
+#IF (INTMODE != 1)
 ;
 ACIA_IST:
         LD      C,(IY+3)                ; STATUS PORT
@@ -510,7 +500,7 @@ ACIA_INITSAFE:
 ;
 ACIA_INITGO:
 ;
-#IF (INTMODE > 0)
+#IF (INTMODE == 1)
 	OR	%10000000		; ENABLE RCV INT
 #ENDIF
 ;
@@ -530,7 +520,7 @@ ACIA_INITGO:
 	LD	A,(ACIA_CMD)		; RESTORE CONFIG VALUE
         OUT     (C),A                   ; DO IT
 ;
-#IF (INTMODE > 0)
+#IF (INTMODE == 1)
 ;
         ; RESET THE RECEIVE BUFFER
         LD      E,(IY+6)
@@ -657,7 +647,7 @@ ACIA_STR_ACIA   .DB     "ACIA$"
 ACIA_DEV        .DB     0               ; DEVICE NUM USED DURING INIT
 ACIA_CMD	.DB	0		; COMMAND PORT SHADOW REGISTER
 ;
-#IF (INTMODE == 0)
+#IF (INTMODE != 1)
 ;
 ACIA0_RCVBUF    .EQU    0
 ACIA1_RCVBUF    .EQU    0

Source/HBIOS/cfg_rcz180.asm

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   ROMWBW 2.X CONFIGURATION DEFAULTS FOR RC2014
+;   ROMWBW 2.X CONFIGURATION DEFAULTS FOR RC2014 Z180 CPU
 ;==================================================================================================
 ;
 ; THIS FILE CONTAINS THE FULL SET OF DEFAULT CONFIGURATION SETTINGS FOR THE PLATFORM

Source/HBIOS/cfg_rcz280.asm

@@ -1,6 +1,6 @@
 ;
 ;==================================================================================================
-;   ROMWBW 2.X CONFIGURATION DEFAULTS FOR RC2014 Z280 (512K RAM/ROM CARD)
+;   ROMWBW 2.X CONFIGURATION DEFAULTS FOR RC2014 Z280 CPU
 ;==================================================================================================
 ;
 ; THIS FILE CONTAINS THE FULL SET OF DEFAULT CONFIGURATION SETTINGS FOR THE PLATFORM

Source/ver.inc

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

Source/ver.lib

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