Minor code cleanup

branches/wbw/Source/ansi.asm

@@ -2,6 +2,13 @@
 
 ; Status: Still very experimental, either doesn't work or is buggy
  
+; WBW: BOGUS EQUATE TO GET MODULE TO BUILD FOR NON-N8 HARDWARE
+; NEEDS TO BE FIXED BEFORE IT WILL WORK FOR ANYTHING OTHER THAN N8
+#IF (!N8VENABLE)
+#DEFINE	N8V_OFFSET	PANIC
+#ENDIF
+
+;
 ;==================================================================================================
 ;   ANSI EMULATION MODULE
 ;==================================================================================================
@@ -150,6 +157,7 @@ ANSI_STATE2_NOT_SEMI:
 	JP	ANSI_CMD_DISP
 	
 ANSI_INIT:
+	PRTS("ANSI:$")
 	JR	ANSI_INI	; REUSE THE INI FUNCTION BELOW
 ;
 

branches/wbw/Source/config_n8_2312.asm

@@ -3,34 +3,21 @@
 ;   ROMWBW 2.X CONFIGURATION FOR N8 5/8/2012
 ;==================================================================================================
 ;
-; About Doug's configuration
-;
-; The CPU Frequency is specified as 18 (MHz)
-; The Platform is PLT_N8
-; The default VDA is the TMS9918 (N8V)
-; The default emulation is ANSI
-; The DSKMAP is DM_PPIDE
-; The N8VENABLE is TRUE
-; The PPIDEENABLE is TRUE
-; The PPIDECAPACITY is 200*9
-; The TTYENABLE AND ANSIENABLE ARE TRUE
-
-
 ; BUILD CONFIGURATION OPTIONS
 ;
-CPUFREQ		.EQU	18		; IN MHZ, USED TO COMPUTE DELAY FACTORS
+CPUFREQ		.EQU	20		; IN MHZ, USED TO COMPUTE DELAY FACTORS
 ;
 PLATFORM	.EQU	PLT_N8		; PLT_N8VEM, PLT_ZETA, PLT_N8
 ;
 DEFCON		.EQU	CIODEV_UART	; DEFAULT CONSOLE DEVICE (LOADER AND MONITOR): CIODEV_UART, CIODEV_VDU, DIODEV_PRPCON
 ALTCON		.EQU	DEFCON		; ALT CONSOLE DEVICE (USED WHEN CONFIG JUMPER SHORTED)
 DEFVDA		.EQU	VDADEV_N8V	; DEFAULT VDA (VDADEV_NONE, VDADEV_VDU, VDADEV_CVDU, VDADEV_7220, VDADEV_N8V)
-DEFEMU		.EQU	EMUTYP_ANSI	; EMUTYP_TTY	; DEFAULT EMULATION TYPE (EMUTYP_TTY, EMUTYP_ANSI, ...)
+DEFEMU		.EQU	EMUTYP_TTY	; DEFAULT EMULATION TYPE (EMUTYP_TTY, EMUTYP_ANSI, ...)
 ;
 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_PPIDE	; DM_ROM, DM_RAM, DM_FD, DM_IDE, DM_PPIDE, DM_SD, DM_PRPSD, DM_PPPSD
+DSKMAP		.EQU	DM_RAM		; DM_ROM, DM_RAM, DM_FD, DM_IDE, DM_PPIDE, DM_SD, DM_PRPSD, DM_PPPSD
 ;
 DSKYENABLE	.EQU	FALSE		; TRUE FOR DSKY SUPPORT (DO NOT COMBINE WITH PPIDE)
 ;
@@ -61,16 +48,16 @@ IDETRACE	.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE
 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)
+PPIDEENABLE	.EQU	FALSE		; TRUE FOR PPIDE SUPPORT (DO NOT COMBINE WITH DSKYENABLE)
 PPIDEMODE	.EQU	PPIDEMODE_STD	; PPIDEMODE_STD, PPIDEMODE_DIO3
 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	200*9		; CAPACITY OF DEVICE (IN MB)
+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	TRUE		; TRUE FOR SD SUPPORT
-SDTRACE		.EQU	2		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
-SDCAPACITY	.EQU	200*9		; CAPACITY OF DEVICE (IN MB)
+SDTRACE		.EQU	1		; 0=SILENT, 1=ERRORS, 2=EVERYTHING (ONLY RELEVANT IF IDEENABLE = TRUE)
+SDCAPACITY	.EQU	64		; CAPACITY OF DEVICE (IN MB)
 SDCSIO		.EQU	TRUE		; TRUE IF USING THE CSIO PORT (N8 ONLY)
 SDCSIOFAST	.EQU	FALSE		; TRUE IF USING THE LOOKUP TABLE RATHER THAN SHIFTS AND ROTATES (N8 ONLY)
 PPISD		.EQU	FALSE		; TRUE IF USING PPISD MINI-BOARD (DO NOT COMBINE WITH PPIDE)

branches/wbw/Source/n8v.asm

@@ -24,12 +24,12 @@ DATAP:  .EQU    BASE+24
 ; BOARD INITIALIZATION
 ;_________________________________________________________________________
 ;
-; FIX: THE BELOW BELONGS IN N8V.INI
-;
 N8V_INIT:
 	PRTS("N8V:$")
 	LD	HL,CHARSET
 	CALL	N8V_VDAINI
+	XOR	A
+	RET
 ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; This routine is called from bnk1.asm to init the TMS9918		;
@@ -276,7 +276,8 @@ BAN_LOOP3:
 BAN_DONE3:
 ; fall through...
 
-	CALL	PPK_INIT
+;	WBW: PPK_INIT SHOULD ONLY BE CALLED FROM HBIOS INIT
+;	CALL	PPK_INIT
 	; fall through...
 
 	XOR	A

branches/wbw/Source/std.asm

@@ -129,13 +129,6 @@ IDEMODE_DIDE	.EQU	2		; DUAL IDE
 ;
 PPIDEMODE_STD	.EQU	1		; STANDARD N8VEM PARALLEL PORT
 PPIDEMODE_DIO3	.EQU	2		; DISKIO V3 PARALLEL PORT
-;;
-;; CONSOLE DEVICE CHOICES FOR LDRCON AND DBGCON IN CONFIG SETTINGS
-;;
-;CON_UART	.EQU	1
-;CON_VDU		.EQU	2
-;CON_PRP		.EQU	3
-;CON_PPP		.EQU	4
 ;
 ; CONSOLE TERMINAL TYPE CHOICES
 ;
@@ -173,7 +166,7 @@ SYS		.EQU	BLD_SYS
 #IF (SYS == SYS_CPM)
 DOS		.EQU	DOS_BDOS
 CP		.EQU	CP_CCP
-#DEFINE		OSLBL	"CP/M-80 2.2C"
+#DEFINE		OSLBL	"CP/M-80 2.2"
 #ENDIF
 ;
 #IF (SYS == SYS_ZSYS)