MirrorRepos
/
RomWBW
mirror of https://github.com/wwarthen/RomWBW.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #600 from dinoboards/dean-ch376-include-ports-in-boot 

ch376-native: output the configured port numbers for the ch376 driver
pull/601/head
Wayne Warthen 6 months ago
committed by GitHub
parent
8c629c637d f03c68c016
commit
dddffac68f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 91 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Source/HBIOS/cfg_MASTER.asm
  2. 118
      Source/HBIOS/ch376-native/base-drv/ch376_init.c.s
  3. 16
      Source/HBIOS/ch376-native/source-doc/base-drv/ch376_init.c

4
Source/HBIOS/cfg_MASTER.asm
View File

@ -513,3 +513,7 @@ 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
_CH376_DAT_PORT_ADDR .EQU _CH376_DATA_PORT
_CH376_CMD_PORT_ADDR .EQU _CH376_COMMAND_PORT
_USB_MOD_LEDS_ADDR .EQU _USB_MODULE_LEDS

118
Source/HBIOS/ch376-native/base-drv/ch376_init.c.s
View File

@ -112,7 +112,7 @@ ch376_init_str_1:
DEFB $08
DEFM "*$"
DEFB $00
;source-doc/base-drv/ch376_init.c:25: static void _chnative_init(bool forced) {
;source-doc/base-drv/ch376_init.c:33: static void _chnative_init(bool forced) {
; ---------------------------------
; Function _chnative_init
; ---------------------------------
@ -121,7 +121,7 @@ __chnative_init:
ld ix,0
add ix,sp
dec sp
;source-doc/base-drv/ch376_init.c:28: const uint8_t loop_counter = forced ? 40 : 5;
;source-doc/base-drv/ch376_init.c:36: const uint8_t loop_counter = forced ? 40 : 5;
bit 0,(ix+4)
jr Z,l__chnative_init_00113
ld a,$28
@ -130,146 +130,172 @@ l__chnative_init_00113:
ld a,$05
l__chnative_init_00114:
ld (ix-1),a
;source-doc/base-drv/ch376_init.c:30: print_string("\r\nCH376: *$");
;source-doc/base-drv/ch376_init.c:38: print_string("\r\nCH376: IO=0x$");
ld hl,ch376_init_str_2
call _print_string
;source-doc/base-drv/ch376_init.c:32: r = wait_for_state(loop_counter, state, 1);
;source-doc/base-drv/ch376_init.c:39: print_hex((uint8_t)&CH376_DAT_PORT_ADDR);
ld l, +((_CH376_DAT_PORT_ADDR) & $FF)
call _print_hex
;source-doc/base-drv/ch376_init.c:40: print_string(comma_0_x_dollar);
ld hl,_comma_0_x_dollar
call _print_string
;source-doc/base-drv/ch376_init.c:41: print_hex((uint8_t)&CH376_CMD_PORT_ADDR);
ld l, +((_CH376_CMD_PORT_ADDR) & $FF)
call _print_hex
;source-doc/base-drv/ch376_init.c:42: print_string(comma_0_x_dollar);
ld hl,_comma_0_x_dollar
call _print_string
;source-doc/base-drv/ch376_init.c:43: print_hex((uint8_t)&USB_MOD_LEDS_ADDR);
ld l, +((_USB_MOD_LEDS_ADDR) & $FF)
call _print_hex
;source-doc/base-drv/ch376_init.c:44: print_string(" *$");
ld hl,ch376_init_str_3
call _print_string
;source-doc/base-drv/ch376_init.c:46: r = wait_for_state(loop_counter, state, 1);
ld a,$01
push af
inc sp
ld l,$00
ld a,(ix-1)
call _wait_for_state
;source-doc/base-drv/ch376_init.c:33: state = r & 255;
;source-doc/base-drv/ch376_init.c:35: print_string("\bPRESENT (VER $");
;source-doc/base-drv/ch376_init.c:47: state = r & 255;
;source-doc/base-drv/ch376_init.c:49: print_string("\bPRESENT (VER $");
push de
ld hl,ch376_init_str_3
ld hl,ch376_init_str_4
call _print_string
pop de
;source-doc/base-drv/ch376_init.c:37: r = usb_init(state);
;source-doc/base-drv/ch376_init.c:51: r = usb_init(state);
ld l, e
call _usb_init
ex de, hl
;source-doc/base-drv/ch376_init.c:38: state = r & 255;
;source-doc/base-drv/ch376_init.c:52: state = r & 255;
ld c, e
;source-doc/base-drv/ch376_init.c:39: if (state != 2) {
;source-doc/base-drv/ch376_init.c:53: if (state != 2) {
ld a, c
sub $02
jr Z,l__chnative_init_00102
;source-doc/base-drv/ch376_init.c:40: print_string("\rCH376: $");
ld hl,ch376_init_str_4
call _print_string
;source-doc/base-drv/ch376_init.c:41: print_string("VERSION FAILURE\r\n$");
;source-doc/base-drv/ch376_init.c:54: print_string("\rCH376: $");
ld hl,ch376_init_str_5
call _print_string
;source-doc/base-drv/ch376_init.c:42: return;
;source-doc/base-drv/ch376_init.c:55: print_string("VERSION FAILURE\r\n$");
ld hl,ch376_init_str_6
call _print_string
;source-doc/base-drv/ch376_init.c:56: return;
jr l__chnative_init_00111
l__chnative_init_00102:
;source-doc/base-drv/ch376_init.c:45: print_hex(r >> 8);
;source-doc/base-drv/ch376_init.c:59: print_hex(r >> 8);
push bc
ld l, d
call _print_hex
;source-doc/base-drv/ch376_init.c:46: print_string(ch376_driver_version);
;source-doc/base-drv/ch376_init.c:60: print_string(ch376_driver_version);
ld hl,_ch376_driver_version
call _print_string
;source-doc/base-drv/ch376_init.c:48: print_string("USB: *$");
ld hl,ch376_init_str_6
;source-doc/base-drv/ch376_init.c:62: print_string("USB: *$");
ld hl,ch376_init_str_7
call _print_string
pop bc
;source-doc/base-drv/ch376_init.c:50: r = wait_for_state(loop_counter, state, 3);
;source-doc/base-drv/ch376_init.c:64: r = wait_for_state(loop_counter, state, 3);
ld a,$03
push af
inc sp
ld l, c
ld a,(ix-1)
call _wait_for_state
;source-doc/base-drv/ch376_init.c:51: state = r & 255;
;source-doc/base-drv/ch376_init.c:53: if (state == 2) {
;source-doc/base-drv/ch376_init.c:65: state = r & 255;
;source-doc/base-drv/ch376_init.c:67: if (state == 2) {
ld a, e
sub $02
jr NZ,l__chnative_init_00104
;source-doc/base-drv/ch376_init.c:54: print_string("\bDISCONNECTED$");
ld hl,ch376_init_str_7
;source-doc/base-drv/ch376_init.c:68: print_string("\bDISCONNECTED$");
ld hl,ch376_init_str_8
call _print_string
;source-doc/base-drv/ch376_init.c:55: return;
;source-doc/base-drv/ch376_init.c:69: return;
jr l__chnative_init_00111
l__chnative_init_00104:
;source-doc/base-drv/ch376_init.c:58: print_string("\bCONNECTED$");
;source-doc/base-drv/ch376_init.c:72: print_string("\bCONNECTED$");
push de
ld hl,ch376_init_str_8
ld hl,ch376_init_str_9
call _print_string
pop de
;source-doc/base-drv/ch376_init.c:61: r = usb_init(state);
;source-doc/base-drv/ch376_init.c:75: r = usb_init(state);
ld l, e
call _usb_init
ex de, hl
;source-doc/base-drv/ch376_init.c:62: state = r & 255;
;source-doc/base-drv/ch376_init.c:76: state = r & 255;
ld c, e
;source-doc/base-drv/ch376_init.c:64: for (uint8_t i = 0; i < loop_counter; i++) {
;source-doc/base-drv/ch376_init.c:78: for (uint8_t i = 0; i < loop_counter; i++) {
ld b,$00
l__chnative_init_00109:
ld a, b
sub (ix-1)
jr NC,l__chnative_init_00111
;source-doc/base-drv/ch376_init.c:65: if (r >> 8 != 0)
;source-doc/base-drv/ch376_init.c:79: if (r >> 8 != 0)
ld a,$00
or d
jr NZ,l__chnative_init_00111
;source-doc/base-drv/ch376_init.c:68: print_string(".$");
;source-doc/base-drv/ch376_init.c:82: print_string(".$");
push bc
ld hl,ch376_init_str_9
ld hl,ch376_init_str_10
call _print_string
pop bc
;source-doc/base-drv/ch376_init.c:69: r = usb_init(state);
;source-doc/base-drv/ch376_init.c:83: r = usb_init(state);
push bc
ld l, c
call _usb_init
ex de, hl
pop bc
;source-doc/base-drv/ch376_init.c:70: state = r & 255;
;source-doc/base-drv/ch376_init.c:84: state = r & 255;
ld c, e
;source-doc/base-drv/ch376_init.c:64: for (uint8_t i = 0; i < loop_counter; i++) {
;source-doc/base-drv/ch376_init.c:78: for (uint8_t i = 0; i < loop_counter; i++) {
inc b
jr l__chnative_init_00109
l__chnative_init_00111:
;source-doc/base-drv/ch376_init.c:72: }
;source-doc/base-drv/ch376_init.c:86: }
inc sp
pop ix
ret
_comma_0_x_dollar:
DEFB +$20
DEFB +$30
DEFB +$78
DEFB +$24
ch376_init_str_2:
DEFB $0d
DEFB $0a
DEFM "CH376: *$"
DEFM "CH376: IO=0x$"
DEFB $00
ch376_init_str_3:
DEFM " *$"
DEFB $00
ch376_init_str_4:
DEFB $08
DEFM "PRESENT (VER $"
DEFB $00
ch376_init_str_4:
ch376_init_str_5:
DEFB $0d
DEFM "CH376: $"
DEFB $00
ch376_init_str_5:
ch376_init_str_6:
DEFM "VERSION FAILURE"
DEFB $0d
DEFB $0a
DEFM "$"
DEFB $00
ch376_init_str_6:
ch376_init_str_7:
DEFM "USB: *$"
DEFB $00
ch376_init_str_7:
ch376_init_str_8:
DEFB $08
DEFM "DISCONNECTED$"
DEFB $00
ch376_init_str_8:
ch376_init_str_9:
DEFB $08
DEFM "CONNECTED$"
DEFB $00
ch376_init_str_9:
ch376_init_str_10:
DEFM ".$"
DEFB $00
;source-doc/base-drv/ch376_init.c:74: void chnative_init_force(void) { _chnative_init(true); }
;source-doc/base-drv/ch376_init.c:88: void chnative_init_force(void) { _chnative_init(true); }
; ---------------------------------
; Function chnative_init_force
; ---------------------------------
@ -280,7 +306,7 @@ _chnative_init_force:
call __chnative_init
inc sp
ret
;source-doc/base-drv/ch376_init.c:76: void chnative_init(void) { _chnative_init(false); }
;source-doc/base-drv/ch376_init.c:90: void chnative_init(void) { _chnative_init(false); }
; ---------------------------------
; Function chnative_init
; ---------------------------------

16
Source/HBIOS/ch376-native/source-doc/base-drv/ch376_init.c
View File

@ -22,12 +22,26 @@ static uint16_t wait_for_state(const uint8_t loop_counter, uint8_t state, const
extern const char ch376_driver_version[];
extern uint8_t CH376_DAT_PORT_ADDR;
extern uint8_t CH376_CMD_PORT_ADDR;
extern uint8_t USB_MOD_LEDS_ADDR;
// there is a weird bug with the compilier - somtimes string literals containing
// a dollar sign -- the dollar sign is ignored!
const char comma_0_x_dollar[] = {' ', '0', 'x', '$'};
static void _chnative_init(bool forced) {
uint8_t state = 0;
uint16_t r;
const uint8_t loop_counter = forced ? 40 : 5;
print_string("\r\nCH376: *$");
print_string("\r\nCH376: IO=0x$");
print_hex((uint8_t)&CH376_DAT_PORT_ADDR);
print_string(comma_0_x_dollar);
print_hex((uint8_t)&CH376_CMD_PORT_ADDR);
print_string(comma_0_x_dollar);
print_hex((uint8_t)&USB_MOD_LEDS_ADDR);
print_string(" *$");
r = wait_for_state(loop_counter, state, 1);
state = r & 255;

Write Preview
Loading…
Cancel
Save