diff --git a/Source/HBIOS/cfg_MASTER.asm b/Source/HBIOS/cfg_MASTER.asm index 03501fb5..c5f7478a 100644 --- a/Source/HBIOS/cfg_MASTER.asm +++ b/Source/HBIOS/cfg_MASTER.asm @@ -509,3 +509,7 @@ CHSCSIENABLE .EQU FALSE ; CH376: ENABLE CH376 NATIVE MASS STORAGE DEVICES (REQU CHUFIENABLE .EQU FALSE ; CH376: ENABLE CH376 NATIVE UFI FLOPPY DISK DEVICES (REQUIRES CHNATIVEENABLE) CHNATIVEFORCE .EQU FALSE ; CH376: DISABLE AUTO-DETECTION OF MODULE - ASSUME ITS INSTALLED (REQUIRES CHNATIVEENABLE) CHNATIVEEZ80 .EQU FALSE ; CH376: DELEGATE USB DRIVERS TO EZ80'S FIRMWARE + +_CH376_DATA_PORT .EQU $FF88 ; CH376: DATA PORT +_CH376_COMMAND_PORT .EQU $FF89 ; CH376: COMMAND PORT +_USB_MODULE_LEDS .EQU $FF8A ; CH376: LED CONTROL PORT diff --git a/Source/HBIOS/ch376-native/base-drv/ch376.c.s b/Source/HBIOS/ch376-native/base-drv/ch376.c.s index 710a7959..31fce084 100644 --- a/Source/HBIOS/ch376-native/base-drv/ch376.c.s +++ b/Source/HBIOS/ch376-native/base-drv/ch376.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/ch376_init.c.s b/Source/HBIOS/ch376-native/base-drv/ch376_init.c.s index 1c0ebe13..bdd67453 100644 --- a/Source/HBIOS/ch376-native/base-drv/ch376_init.c.s +++ b/Source/HBIOS/ch376-native/base-drv/ch376_init.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/class_hub.c.s b/Source/HBIOS/ch376-native/base-drv/class_hub.c.s index 056266f9..27677a28 100644 --- a/Source/HBIOS/ch376-native/base-drv/class_hub.c.s +++ b/Source/HBIOS/ch376-native/base-drv/class_hub.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/dev_transfers.c.s b/Source/HBIOS/ch376-native/base-drv/dev_transfers.c.s index 7185ae4c..7019e002 100644 --- a/Source/HBIOS/ch376-native/base-drv/dev_transfers.c.s +++ b/Source/HBIOS/ch376-native/base-drv/dev_transfers.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/enumerate.c.s b/Source/HBIOS/ch376-native/base-drv/enumerate.c.s index 450eece3..7b99952f 100644 --- a/Source/HBIOS/ch376-native/base-drv/enumerate.c.s +++ b/Source/HBIOS/ch376-native/base-drv/enumerate.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/enumerate_hub.c.s b/Source/HBIOS/ch376-native/base-drv/enumerate_hub.c.s index 061b599a..7b970bcf 100644 --- a/Source/HBIOS/ch376-native/base-drv/enumerate_hub.c.s +++ b/Source/HBIOS/ch376-native/base-drv/enumerate_hub.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/enumerate_storage.c.s b/Source/HBIOS/ch376-native/base-drv/enumerate_storage.c.s index 0b85b094..bb73bfab 100644 --- a/Source/HBIOS/ch376-native/base-drv/enumerate_storage.c.s +++ b/Source/HBIOS/ch376-native/base-drv/enumerate_storage.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/hbios-driver-storage.c.s b/Source/HBIOS/ch376-native/base-drv/hbios-driver-storage.c.s index dfc56fb0..164d6677 100644 --- a/Source/HBIOS/ch376-native/base-drv/hbios-driver-storage.c.s +++ b/Source/HBIOS/ch376-native/base-drv/hbios-driver-storage.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/protocol.c.s b/Source/HBIOS/ch376-native/base-drv/protocol.c.s index 165c2f6e..0b07a180 100644 --- a/Source/HBIOS/ch376-native/base-drv/protocol.c.s +++ b/Source/HBIOS/ch376-native/base-drv/protocol.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/transfers.c.s b/Source/HBIOS/ch376-native/base-drv/transfers.c.s index 0289e39b..f048769d 100644 --- a/Source/HBIOS/ch376-native/base-drv/transfers.c.s +++ b/Source/HBIOS/ch376-native/base-drv/transfers.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/usb-base-drv.c.s b/Source/HBIOS/ch376-native/base-drv/usb-base-drv.c.s index 81697938..06bec59b 100644 --- a/Source/HBIOS/ch376-native/base-drv/usb-base-drv.c.s +++ b/Source/HBIOS/ch376-native/base-drv/usb-base-drv.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/usb_state.c.s b/Source/HBIOS/ch376-native/base-drv/usb_state.c.s index 9cf0c5af..d70ea4c5 100644 --- a/Source/HBIOS/ch376-native/base-drv/usb_state.c.s +++ b/Source/HBIOS/ch376-native/base-drv/usb_state.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/base-drv/work-area.c.s b/Source/HBIOS/ch376-native/base-drv/work-area.c.s index e08c9fe6..ff1b7e91 100644 --- a/Source/HBIOS/ch376-native/base-drv/work-area.c.s +++ b/Source/HBIOS/ch376-native/base-drv/work-area.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/keyboard/class_hid.c.s b/Source/HBIOS/ch376-native/keyboard/class_hid.c.s index f53b35a5..a3dbc2b3 100644 --- a/Source/HBIOS/ch376-native/keyboard/class_hid.c.s +++ b/Source/HBIOS/ch376-native/keyboard/class_hid.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/keyboard/kyb-init.c.s b/Source/HBIOS/ch376-native/keyboard/kyb-init.c.s index af030411..9aba172e 100644 --- a/Source/HBIOS/ch376-native/keyboard/kyb-init.c.s +++ b/Source/HBIOS/ch376-native/keyboard/kyb-init.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/keyboard/kyb_driver.c.s b/Source/HBIOS/ch376-native/keyboard/kyb_driver.c.s index 26988280..f804e4ae 100644 --- a/Source/HBIOS/ch376-native/keyboard/kyb_driver.c.s +++ b/Source/HBIOS/ch376-native/keyboard/kyb_driver.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/scsi-drv/class_scsi.c.s b/Source/HBIOS/ch376-native/scsi-drv/class_scsi.c.s index 3976a6a0..bcf0bdae 100644 --- a/Source/HBIOS/ch376-native/scsi-drv/class_scsi.c.s +++ b/Source/HBIOS/ch376-native/scsi-drv/class_scsi.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/scsi-drv/scsi-init.c.s b/Source/HBIOS/ch376-native/scsi-drv/scsi-init.c.s index c8a696e9..3f0802de 100644 --- a/Source/HBIOS/ch376-native/scsi-drv/scsi-init.c.s +++ b/Source/HBIOS/ch376-native/scsi-drv/scsi-init.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/scsi-drv/scsi_driver.c.s b/Source/HBIOS/ch376-native/scsi-drv/scsi_driver.c.s index 47527495..9dc504aa 100644 --- a/Source/HBIOS/ch376-native/scsi-drv/scsi_driver.c.s +++ b/Source/HBIOS/ch376-native/scsi-drv/scsi_driver.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/source-doc/base-drv/ch376.h b/Source/HBIOS/ch376-native/source-doc/base-drv/ch376.h index 9507c765..c40173a0 100644 --- a/Source/HBIOS/ch376-native/source-doc/base-drv/ch376.h +++ b/Source/HBIOS/ch376-native/source-doc/base-drv/ch376.h @@ -129,10 +129,10 @@ typedef struct { typedef enum _ch376_pid { CH_PID_SETUP = DEF_USB_PID_SETUP, CH_PID_IN = DEF_USB_PID_IN, CH_PID_OUT = DEF_USB_PID_OUT } ch376_pid; -__sfr __banked __at(0xFF88) CH376_DATA_PORT; -__sfr __banked __at(0xFF89) CH376_COMMAND_PORT; +extern __sfr __banked CH376_DATA_PORT; +extern __sfr __banked CH376_COMMAND_PORT; -__sfr __banked __at(0xFF8A) USB_MODULE_LEDS; +extern __sfr __banked USB_MODULE_LEDS; extern void delay_20ms(void); extern void delay_short(void); diff --git a/Source/HBIOS/ch376-native/ufi-drv/class_ufi.c.s b/Source/HBIOS/ch376-native/ufi-drv/class_ufi.c.s index 6eaf2e9e..560fd123 100644 --- a/Source/HBIOS/ch376-native/ufi-drv/class_ufi.c.s +++ b/Source/HBIOS/ch376-native/ufi-drv/class_ufi.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/ufi-drv/ufi-init.c.s b/Source/HBIOS/ch376-native/ufi-drv/ufi-init.c.s index e282a318..01d67fbe 100644 --- a/Source/HBIOS/ch376-native/ufi-drv/ufi-init.c.s +++ b/Source/HBIOS/ch376-native/ufi-drv/ufi-init.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/ufi-drv/ufi_driver.c.s b/Source/HBIOS/ch376-native/ufi-drv/ufi_driver.c.s index 53179ed6..b440df7d 100644 --- a/Source/HBIOS/ch376-native/ufi-drv/ufi_driver.c.s +++ b/Source/HBIOS/ch376-native/ufi-drv/ufi_driver.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;-------------------------------------------------------- diff --git a/Source/HBIOS/ch376-native/ufi-drv/usb_cbi.c.s b/Source/HBIOS/ch376-native/ufi-drv/usb_cbi.c.s index c00100d5..90a034cd 100644 --- a/Source/HBIOS/ch376-native/ufi-drv/usb_cbi.c.s +++ b/Source/HBIOS/ch376-native/ufi-drv/usb_cbi.c.s @@ -19,9 +19,6 @@ ;-------------------------------------------------------- ; special function registers ;-------------------------------------------------------- -_CH376_DATA_PORT .EQU 0xff88 -_CH376_COMMAND_PORT .EQU 0xff89 -_USB_MODULE_LEDS .EQU 0xff8a ;-------------------------------------------------------- ; ram data ;--------------------------------------------------------