Skip to content

Intelligently handle accelerator #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Intelligently handle accelerator #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08c96a1
Use logic to determine which (if any) accelerators we enable/disable
ryucats Oct 20, 2023
bd8a5d4
Detect GS (so that we can handle ZipGS/TransWarpGS) and disable accel…
ryucats Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 79 additions & 1 deletion src/client/main.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ entrypoint:

jsr INIT_SCREEN ; Sets up the screen for behaviors we expect
jsr MAKETBL ; Prepare our CRC tables
jsr DETECT_CPU ; Try to figure out if we're running an accelerator
jsr ACCEL_DISABLE ; disable accelerators (if present)
JSR_GET_PREFIX ; Get our current prefix (ProDOS only)
jsr BLOAD ; Load up user parameters, if any
jsr PARMDFT ; Set up parameters
Expand Down Expand Up @@ -170,6 +172,7 @@ KQUIT:
KQUITENTRY:
lda #MENU_QUIT
jsr HILIGHT_MENU
jsr ACCEL_ENABLE
jmp QUIT ; Head into OS oblivion

KLEFT:
Expand Down Expand Up @@ -354,6 +357,81 @@ BumpA1:
BumpA1Done:
rts

;---------------------------------------------------------
; ACCEL_* - disable/enable accelerators (if present)
;---------------------------------------------------------
ACCEL_DISABLE:
lda $FE1F ; ][ and //e have $60, GS has detect routine
cmp #$60
bne AD_65C02 ; if GS, do Zip/TransWarp
lda CPU_TYPE
beq AD_EXIT ; NMOS 6502 isn't accelerated, skip
cmp #2 ; non-GS 65816 is UltraWarp
beq AD_65816
AD_65C02:
lda #$5a ; Unlock ZipChip
sta $c05a
sta $c05a
sta $c05a
sta $c05a ; Unlock finished

lda #$00
sta $c05a ; Disable ZipChip
lda #$01
sta $C074 ; Disable TransWarp
bne AD_EXIT
AD_65816:
lda #$01
sta $C05D ; Slow down UltraWarp
AD_EXIT:
rts

ACCEL_ENABLE:
lda $FE1F ; ][ and //e have $60, GS has detect routine
cmp #$60
bne AE_65C02 ; if GS, do Zip/TransWarp
lda CPU_TYPE
beq AE_EXIT ; NMOS 6502 isn't accelerated, skip
cmp #2 ; non-GS 65816 is UltraWarp
beq AE_65816
AE_65C02:
lda #$00
sta $c05b ; Enable ZipChip

lda #$a5
sta $c05a ; Lock ZipChip

lda #$00 ; Enable TransWarp
sta $C074
beq AE_EXIT
AE_65816:
lda #$01
sta $C05C ; Speed up UltraWarp
AE_EXIT:
rts

;---------------------------------------------------------
;DETECT_CPU - identify CPU, to try to logic our way through
; accelerator detection
;---------------------------------------------------------
CPU_TYPE: .byte 0 ; default to NMOS 6502
DETECT_CPU:
.setcpu "6502"
lda #0
.setcpu "65C02"
bra :+ ; undocumented two-byte NOP on NMOS
.setcpu "6502"
beq CT_OUT ; we have an NMOS 6502
: inc CPU_TYPE ; we have a CMOS 65C02/65C816 ...
.setcpu "65816"
lda CPU_TYPE
xba ; exchange B and A (65C816 only)
dec ; A=0 (65C02), A=1 (65C816, via B)
xba ; swap back (again, 65C816 only)
inc ; A=1 (65C02), A=2 (65C816, via B)
sta CPU_TYPE
.setcpu "6502"
CT_OUT: rts

;---------------------------------------------------------
; Table of menu highlighting coordinates
Expand All @@ -374,4 +452,4 @@ MENUHITBL:
CUR_MENU:
.byte MENU_CONFIG
PREV_MENU:
.byte $ff
.byte $ff
22 changes: 0 additions & 22 deletions src/client/prodos/ethernet/ethproto.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,31 +956,9 @@ RECEIVE_LOOP_WARM:
rts

RECEIVE_LOOP_PAUSE:
lda #$5a
sta $c05a
sta $c05a
sta $c05a
sta $c05a ; Unlock ZipChip

lda #$00
sta $c05a ; Disable ZipChip

lda #$01
sta $C074 ; Disable TransWarp

PauseValue:
lda #$7f
jsr DELAY ; Wait!

lda #$00
sta $c05b ; Enable ZipChip

lda #$a5
sta $c05a ; Lock ZipChip

lda #$00 ; Enable TransWarp
sta $C074

jmp RECEIVE_LOOP_WARM


Expand Down