Minor PCF Changes

- Slightly modified to be more consistent with typical RomWBW driver config.

Source/HBIOS/cfg_DUO.asm

@@ -96,6 +96,8 @@ CTCOSC		.SET	(7372800/8)	; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
 PCFBASE		.SET	$56		; PCF8584 BASE I/O ADDRESS
+PCFCLK		.SET	PCFCLK_12	; PCF CLOCK BASE: PCFCLK_[3|443|6|8|12]
+PCFTRNS		.SET	PCFTRNS_90	; PCF TRANSFER SPEED: PCFTRNS_[90|45|11|15]
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_DYNO.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_EPITX.asm

@@ -92,7 +92,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_EZZ80.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_FZ80.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_GMZ180.asm

@@ -91,7 +91,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_HEATH.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_MASTER.asm

@@ -128,8 +128,8 @@ CTCOSC		.EQU	614400		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.EQU	FALSE		; ENABLE PCF8584 I2C CONTROLLER
 PCFBASE		.EQU	$F0		; PCF8584 BASE I/O ADDRESS
-PCFCLK		.EQU	12		; PCF CLOCK BASE
-PCFTRNS		.EQU	90		; PCF TRANSFER SPEED
+PCFCLK		.EQU	PCFCLK_12	; PCF CLOCK BASE: PCFCLK_[3|443|6|8|12]
+PCFTRNS		.EQU	PCFTRNS_90	; PCF TRANSFER SPEED: PCFTRNS_[90|45|11|15]
 ;
 EIPCENABLE	.EQU	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_MBC.asm

@@ -92,7 +92,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	(4915200/8)	; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_MK4.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$B0		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_MON.asm

@@ -92,7 +92,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_N8.asm

@@ -99,7 +99,6 @@ CTCBASE		.SET	$B0		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_NABU.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_RCEZ80.asm

@@ -93,7 +93,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_RCZ180.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_RCZ280.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_RCZ80.asm

@@ -96,8 +96,8 @@ CTCOSC		.SET	CPUOSC		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
 PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
-PCFCLK		.SET	8		; PCF CLOCK BASE
-PCFTRNS		.SET	90		; PCF TRANSFER SPEED
+PCFCLK		.SET	PCFCLK_8	; PCF CLOCK BASE: PCFCLK_[3|443|6|8|12]
+PCFTRNS		.SET	PCFTRNS_90	; PCF TRANSFER SPEED: PCFTRNS_[90|45|11|15]
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_RPH.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$B0		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_S100.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_SBC.asm

@@ -92,7 +92,6 @@ CTCTIMCH	.SET	3		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	614400		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_SCZ180.asm

@@ -97,7 +97,6 @@ CTCBASE		.SET	$88		; CTC BASE I/O ADDRESS
 CTCTIMER	.SET	FALSE		; ENABLE CTC PERIODIC TIMER
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_Z80RETRO.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	1		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	7372800		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_ZETA.asm

@@ -84,7 +84,6 @@ KIOBASE		.SET	$80		; KIO BASE I/O ADDRESS
 CTCENABLE	.SET	FALSE		; ENABLE ZILOG CTC SUPPORT
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/cfg_ZETA2.asm

@@ -95,7 +95,6 @@ CTCTIMCH	.SET	1		; TIMER CHANNEL (0-3)
 CTCOSC		.SET	921600		; CTC CLOCK FREQUENCY
 ;
 PCFENABLE	.SET	FALSE		; ENABLE PCF8584 I2C CONTROLLER
-PCFBASE		.SET	$F0		; PCF8584 BASE I/O ADDRESS
 ;
 EIPCENABLE	.SET	FALSE		; EIPC: ENABLE Z80 EIPC (Z84C15) INITIALIZATION
 ;

Source/HBIOS/pcf.asm

@@ -66,62 +66,10 @@ PCF_BB		.EQU  00000001B
 ; |  12MHz  |       |        |       |         |        | 90Khz | 120Khz |   138Khz  |  150Khz |
 ; +----------------------------------------------------------------------------------+---------+
 ;
-; CLOCK CHIP FREQUENCIES
-;
-PCF_CLK3   	.EQU	000H
-PCF_CLK443 	.EQU	010H
-PCF_CLK6   	.EQU	014H
-PCF_CLK8   	.EQU	018H
-PCF_CLK12  	.EQU	01CH
-;
-; TRANSMISSION FREQUENCIES
-;
-PCF_TRNS90 	.EQU	000H	;  90 kHz */
-PCF_TRNS45 	.EQU	001H	;  45 kHz */
-PCF_TRNS11 	.EQU	002H	;  11 kHz */
-PCF_TRNS15 	.EQU	003H	; 1.5 kHz */
-;
-; BELOW VARIABLES CONTROL PCF CLOCK DIVISOR PROGRAMMING
-;
-#IF (PCFCLK = 3)
-PCF_CLK .EQU PCF_CLK3
-#ELSE
- #IF (PCFCLK = 443)
-PCF_CLK .EQU PCF_CLK443
- #ELSE
-  #IF (PCFCLK = 6)
-PCF_CLK .EQU PCF_CLK6
-  #ELSE
-   #IF (PCFCLK = 8)
-PCF_CLK .EQU PCF_CLK8
-   #ELSE
-    #IF (PCFCLK = 12)
-PCF_CLK .EQU PCF_CLK12
-    #ELSE ***ERROR
-     .ERROR "PCFCLK UNDEFINED OR WRONG VALUE VALID VALUES ARE (3,443,6,8,12)"
-    #ENDIF
-   #ENDIF
-  #ENDIF
- #ENDIF
-#ENDIF
-;
-#IF (PCFTRNS = 90)
-PCF_TRNS .EQU PCF_TRNS90
-#ELSE
- #IF (PCFTRNS = 45)
-PCF_TRNS .EQU PCF_TRNS45
- #ELSE
-  #IF (PCFTRNS = 11)
-PCF_TRNS .EQU PCF_TRNS11
-  #ELSE
-   #IF (PCFTRNS = 15)
-PCF_TRNS .EQU PCF_TRNS15
-   #ELSE ***ERROR
-    .ERROR "PCFTRNS UNDEFINED OR WRONG VALUE VALID VALUES ARE (90,45,11,15)"
-   #ENDIF
-  #ENDIF
- #ENDIF
-#ENDIF
+; SEE STD.ASM FOR DEFINITIONS OF PCFCLK AND PCFTRNS VALUES
+;
+PCF_CLK	  	.EQU	PCFCLK
+PCF_TRNS	.EQU	PCFTRNS
 ;
 ; TIMEOUT AND DELAY VALUES (ARBITRARY)
 ;

Source/HBIOS/std.asm

@@ -327,6 +327,21 @@ SYQMODE_NONE	.EQU	0		; NONE
 SYQMODE_SPP	.EQU	1		; IBM PC STANDARD PAR PORT (SPP)
 SYQMODE_MG014	.EQU	2		; RCBUS MG014 STYLE INTERFACE
 ;
+; PCF CLOCK CHIP FREQUENCIES
+;
+PCFCLK_3   	.EQU	$00		;  3    MHz 
+PCFCLK_443 	.EQU	$10            ;  4.43 MHz
+PCFCLK_6   	.EQU	$14            ;  6    MHz 
+PCFCLK_8   	.EQU	$18            ;  8    MHz 
+PCFCLK_12  	.EQU	$1C            ; 12    MHz 
+;
+; PCF TRANSMISSION FREQUENCIES
+;
+PCFTRNS_90 	.EQU	$00		; 90   KHZ
+PCFTRNS_45 	.EQU	$01		; 45   KHZ
+PCFTRNS_11 	.EQU	$02		; 11   KHZ
+PCFTRNS_15 	.EQU	$03		;  1.5 KHZ
+;
 ; GDC MONITOR SELECTIONS
 ;
 GDCMON_NONE	.EQU	0