Reintegrate wbw -> trunk

Apps/Source/applvers.h

@@ -5,10 +5,10 @@
 #define A_RMJ	2
 #define A_RMN	5
 #define A_RUP	0
-#define A_RTP	15
+#define A_RTP	16
 
 #define A_MONTH	6
-#define A_DAY	16
+#define A_DAY	23
 #define A_YEAR	2013
 #define A_YR	13
 

Apps/Source/applvers.lib

@@ -3,14 +3,14 @@
 A$RMJ	equ	2
 A$RMN	equ	5
 A$RUP	equ	0
-A$RTP	equ	15
+A$RTP	equ	16
 
 A$MONTH	equ	6
-A$DAY	equ	16
+A$DAY	equ	23
 A$YEAR	equ	2013
 
 date	macro
-dat	db	'  6/16/2013$'
+dat	db	'  6/23/2013$'
 	endm
 
 serial	macro

ReadMe.txt

@@ -8,7 +8,7 @@ Builders: Wayne Warthen (wwarthen@gmail.com)
           Douglas Goodall (douglas_goodall@mac.com)
           David Giles (vk5dg@internode.on.net)
 
-Updated: 2013-06-16
+Updated: 2013-06-23
 Version: 2.5
 
 This is an adaptation of CP/M-80 2.2 and ZSDOS/ZCPR

Source/config_n8_2312.asm

@@ -22,7 +22,7 @@ DSKMAP		.EQU	DM_RAM		; DM_ROM, DM_RAM, DM_FD, DM_IDE, DM_PPIDE, DM_SD, DM_PRPSD,
 ;
 DSKYENABLE	.EQU	FALSE		; TRUE FOR DSKY SUPPORT (DO NOT COMBINE WITH PPIDE)
 ;
-UARTENABLE	.EQU	FALSE		; TRUE FOR UART SUPPORT (ALMOST ALWAYS WANT THIS TO BE TRUE)
+UARTENABLE	.EQU	FALSE		; TRUE FOR UART SUPPORT (N8 USES ASCI DRIVER)
 UARTCNT		.EQU	0		; NUMBER OF UARTS
 ;
 ASCIENABLE	.EQU	TRUE		; TRUE FOR Z180 ASCI SUPPORT

Source/config_n8_2511.asm

@@ -22,7 +22,7 @@ DSKMAP		.EQU	DM_RAM		; DM_ROM, DM_RAM, DM_FD, DM_IDE, DM_PPIDE, DM_SD, DM_PRPSD,
 ;
 DSKYENABLE	.EQU	FALSE		; TRUE FOR DSKY SUPPORT (DO NOT COMBINE WITH PPIDE)
 ;
-UARTENABLE	.EQU	FALSE		; TRUE FOR UART SUPPORT (ALMOST ALWAYS WANT THIS TO BE TRUE)
+UARTENABLE	.EQU	FALSE		; TRUE FOR UART SUPPORT (N8 USES ASCI DRIVER)
 UARTCNT		.EQU	0		; NUMBER OF UARTS
 ;
 ASCIENABLE	.EQU	TRUE		; TRUE FOR Z180 ASCI SUPPORT

Source/config_n8vem_diskio3+cvdu.asm

@@ -0,0 +1,101 @@
+;
+;==================================================================================================
+;   ROMWBW 2.X CONFIGURATION FOR N8VEM SBC W/ COLOR VDU
+;==================================================================================================
+;
+; BUILD CONFIGURATION OPTIONS
+;
+CPUFREQ		.EQU	8		; IN MHZ, USED TO COMPUTE DELAY FACTORS
+;
+BOOTCON		.EQU	CIODEV_UART	; CONSOLE DEVICE FOR BOOT MESSAGES (MUST BE PRIMARY SERIAL PORT FOR PLATFORM)
+DEFCON		.EQU	CIODEV_UART	; DEFAULT CONSOLE DEVICE (LOADER AND MONITOR): CIODEV_UART, CIODEV_CRT, CIODEV_PRPCON, CIODEV_PPPCON
+ALTCON		.EQU	DEFCON		; ALT CONSOLE DEVICE (USED WHEN CONFIG JUMPER SHORTED)
+CONBAUD		.EQU	38400		; BAUDRATE FOR CONSOLE DURING HARDWARE INIT
+DEFVDA		.EQU	VDADEV_CVDU	; DEFAULT VDA DEVICE (VDADEV_NONE, VDADEV_VDU, VDADEV_CVDU, VDADEV_N8V, VDADEV_UPD7220)
+DEFEMU		.EQU	EMUTYP_ANSI	; DEFAULT VDA EMULATION (EMUTYP_TTY, EMUTYP_ANSI, ...)
+TERMTYPE	.EQU	TERM_ANSI	; TERM_TTY=0, TERM_ANSI=1, TERM_WYSE=2
+;
+RAMSIZE		.EQU	512		; SIZE OF RAM IN KB, MUST MATCH YOUR HARDWARE!!!
+CLRRAMDISK	.EQU	CLR_AUTO	; CLR_ALWAYS, CLR_NEVER, CLR_AUTO (CLEAR IF INVALID DIR AREA)
+;
+DSKMAP		.EQU	DM_RAM		; DM_ROM, DM_RAM, DM_FD, DM_IDE, DM_PPIDE, DM_SD, DM_PRPSD, DM_PPPSD, DM_HDSK
+;
+DSKYENABLE	.EQU	FALSE		; TRUE FOR DSKY SUPPORT (DO NOT COMBINE WITH PPIDE)
+;
+UARTENABLE	.EQU	TRUE		; TRUE FOR UART SUPPORT (ALMOST ALWAYS WANT THIS TO BE TRUE)
+UARTCNT		.EQU	1		; NUMBER OF UARTS
+UART0IOB	.EQU	$68		; UART0 IOBASE
+UART0BAUD	.EQU	CONBAUD		; UART0 BAUDRATE
+UART0FIFO	.EQU	TRUE		; UART0 TRUE ENABLES UART FIFO (16550 ASSUMED, N8VEM AND ZETA ONLY)
+UART0AFC	.EQU	FALSE		; UART0 TRUE ENABLES AUTO FLOW CONTROL (YOUR TERMINAL/UART MUST SUPPORT RTS/CTS FLOW CONTROL!!!)
+;
+ASCIENABLE	.EQU	FALSE		; TRUE FOR Z180 ASCI SUPPORT
+ASCI0BAUD	.EQU	CONBAUD		; ASCI0 BAUDRATE (IMPLEMENTED BY Z180_CNTLB0)
+ASCI1BAUD	.EQU	CONBAUD		; ASCI1 BAUDRATE (IMPLEMENTED BY Z180_CNTLB1)
+;
+VDUENABLE	.EQU	FALSE		; TRUE FOR VDU BOARD SUPPORT
+CVDUENABLE	.EQU	TRUE		; TRUE FOR CVDU BOARD SUPPORT
+UPD7220ENABLE	.EQU	FALSE		; TRUE FOR uPD7220 BOARD SUPPORT
+N8VENABLE	.EQU	FALSE		; TRUE FOR N8 (TMS9918) VIDEO/KBD SUPPORT
+;
+DEFIOBYTE	.EQU	$00		; DEFAULT INITIAL VALUE FOR CP/M IOBYTE, $00=TTY, $01=CRT (MUST HAVE CRT HARDWARE)
+ALTIOBYTE	.EQU	DEFIOBYTE	; ALT INITIAL VALUE (USED WHEN CONFIG JUMPER SHORTED)
+WRTCACHE	.EQU	TRUE		; ENABLE WRITE CACHING IN CBIOS (DE)BLOCKING ALGORITHM
+DSKTRACE	.EQU	FALSE		; ENABLE TRACING OF CBIOS DISK FUNCTION CALLS
+;
+MDENABLE	.EQU	TRUE		; TRUE FOR ROM/RAM DISK SUPPORT (ALMOST ALWAYS WANT THIS ENABLED)
+;
+FDENABLE	.EQU	TRUE		; TRUE FOR FLOPPY SUPPORT
+FDMODE		.EQU	FDMODE_DIO3	; FDMODE_DIO, FDMODE_ZETA, FDMODE_DIDE, FDMODE_N8, FDMODE_DIO3
+FDTRACE		.EQU	1		; 0=SILENT, 1=FATAL ERRORS, 2=ALL ERRORS, 3=EVERYTHING (ONLY RELEVANT IF FDENABLE = TRUE)
+FDMEDIA		.EQU	FDM144		; FDM720, FDM144, FDM360, FDM120 (ONLY RELEVANT IF FDENABLE = TRUE)
+FDMEDIAALT	.EQU	FDM720		; ALTERNATE MEDIA TO TRY, SAME CHOICES AS ABOVE (ONLY RELEVANT IF FDMAUTO = TRUE)
+FDMAUTO		.EQU	TRUE		; SELECT BETWEEN MEDIA OPTS ABOVE AUTOMATICALLY
+;
+IDEENABLE	.EQU	FALSE		; TRUE FOR IDE SUPPORT
+IDEMODE		.EQU	IDEMODE_DIO	; IDEMODE_DIO, IDEMODE_DIDE
+IDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
+IDE8BIT		.EQU	FALSE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
+IDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+;
+PPIDEENABLE	.EQU	TRUE		; TRUE FOR PPIDE SUPPORT (DO NOT COMBINE WITH DSKYENABLE)
+PPIDEIOB	.EQU	$20		; PPIDE IOBASE IS $20 FOR DISKIO V3
+PPIDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPIDEENABLE = TRUE)
+PPIDE8BIT	.EQU	FALSE		; USE IDE 8BIT TRANSFERS (PROBABLY ONLY WORKS FOR CF CARDS!)
+PPIDECAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+PPIDESLOW	.EQU	FALSE		; ADD DELAYS TO HELP PROBLEMATIC HARDWARE (TRY THIS IF PPIDE IS UNRELIABLE)
+;
+SDENABLE	.EQU	FALSE		; TRUE FOR SD SUPPORT
+SDMODE		.EQU	SDMODE_JUHA	; SDMODE_JUHA, SDMODE_CSIO, SDMODE_UART, SDMODE_PPI, SDMODE_DSD
+SDTRACE		.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
+SDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+SDCSIOFAST	.EQU	FALSE		; TABLE-DRIVEN BIT INVERTER
+;
+PRPENABLE	.EQU	FALSE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
+PRPSDENABLE	.EQU	TRUE		; TRUE FOR PROPIO SD SUPPORT (FOR N8VEM PROPIO ONLY!)
+PRPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PRPSDENABLE = TRUE)
+PRPSDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+PRPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
+;
+PPPENABLE	.EQU	FALSE		; TRUE FOR PARPORTPROP SUPPORT
+PPPSDENABLE	.EQU	TRUE		; TRUE FOR PARPORTPROP SD SUPPORT
+PPPSDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPPENABLE = TRUE)
+PPPSDCAPACITY	.EQU	64		; CAPACITY OF PPP SD DEVICE (IN MB)
+PPPCONENABLE	.EQU	TRUE		; TRUE FOR PROPIO CONSOLE SUPPORT (PS/2 KBD & VGA VIDEO)
+;
+HDSKENABLE	.EQU	FALSE		; TRUE FOR SIMH HDSK SUPPORT
+HDSKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
+HDSKCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
+;
+PPKENABLE	.EQU	FALSE		; TRUE FOR PARALLEL PORT KEYBOARD
+PPKTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF PPKENABLE = TRUE)
+KBDENABLE	.EQU	TRUE		; TRUE FOR PS/2 KEYBOARD ON I8242
+KBDTRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF KBDENABLE = TRUE)
+;
+TTYENABLE	.EQU	TRUE		; INCLUDE TTY EMULATION SUPPORT
+ANSIENABLE	.EQU	TRUE		; INCLUDE ANSI EMULATION SUPPORT
+ANSITRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF ANSIENABLE = TRUE)
+;
+BOOTTYPE	.EQU	BT_MENU		; BT_MENU (WAIT FOR KEYPRESS), BT_AUTO (BOOT_DEFAULT AFTER BOOT_TIMEOUT SECS)
+BOOT_TIMEOUT	.EQU	20		; APPROX TIMEOUT IN SECONDS FOR AUTOBOOT, 0 FOR IMMEDIATE
+BOOT_DEFAULT	.EQU	'R'		; SELECTION TO INVOKE AT TIMEOUT

Source/ver.inc

@@ -1,7 +1,7 @@
 #DEFINE	RMJ	2
 #DEFINE	RMN	5
 #DEFINE	RUP	0
-#DEFINE	RTP	15
+#DEFINE	RTP	16
 #DEFINE BIOSVER	"2.5"
-#DEFINE BIOSBLD "Build 15"
+#DEFINE BIOSBLD "Build 16"
 #DEFINE REVISION 412