Skip to content

Commit

Permalink
z80membership: fix conversion to new compiler and 16x50 setup buglet
Browse files Browse the repository at this point in the history
  • Loading branch information
EtchedPixels committed Jun 28, 2024
1 parent 93ef1dd commit 3355613
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Kernel/platform/platform-z80membership/devtty.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
out(uart_ms, w >> 8);
out(uart_lcr, d & 0x7F);

out(uart_ier, 0x0D);
out(uart_ier, 0x05);
}

/*
Expand Down
22 changes: 14 additions & 8 deletions Kernel/platform/platform-z80membership/z80membership.S
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,8 @@ map_proc_a: ; used by bankfork
map_proc_always_di:
map_proc_always:
push af
push hl
ld hl, #_udata + U_DATA__U_PAGE
call map_proc_hl
pop hl
ld a, (_udata + U_DATA__U_PAGE)
out (0xCC),a
pop af
ret
;
Expand All @@ -269,7 +267,7 @@ map_proc_always:
;
map_save_kernel:
push af
in a,(0xCC) ; FIXME: check can read back
in a,(0xCC)
and #0x0F
ld (mapsave), a
xor a
Expand All @@ -295,7 +293,7 @@ map_restore:
;
outchar:
push af
twait: in a,(0xCD)
twait: in a,(0xCD)
bit 5,a
jr z, twait
pop af
Expand All @@ -313,6 +311,10 @@ twait: in a,(0xCD)
.export _sd_spi_rx_sector

_sd_spi_tx_byte:
pop de
pop hl
push hl
push de
push bc
ld a,l
rlca
Expand Down Expand Up @@ -343,6 +345,10 @@ _sd_spi_tx_byte:
pop bc
ret
_sd_spi_rx_byte:
pop de
pop hl
push hl
push de
push bc
ld a, 1
out (0xC5),a ; send FF
Expand Down Expand Up @@ -534,8 +540,8 @@ spi_tx_loop:
sd_map:
ld a,(_td_raw)
or a
jp nz, map_proc_always
ret
ret z
jp map_proc_always

_sd_spi_rx_sector:
pop de
Expand Down
4 changes: 2 additions & 2 deletions STATUS.md
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ Builds, passes basic tests

## sbc2g

Builds, crashes when running. Under investigation
Builds, passes basic tests

## sbcv2

Expand Down Expand Up @@ -578,7 +578,7 @@ Builds, usually passes basic tests, debugging a possible interrupt problem

## z80membership

Builds, need to debug the emulator to do proper testing
Builds,passes basic tests

## z80pack

Expand Down

0 comments on commit 3355613

Please sign in to comment.