Adjusted to recent driver interface change.
Please note that this change is absolutely untested! Apart from the recent driver interface change: - vic20-stdjoy.s was "slightly broken" because it didn't clear x on return from joy_read. - vic20-ptvjoy.s was "heavily broken" because it returned a totally different set of bits of the first joystick.
This commit is contained in:
@@ -112,10 +112,21 @@ READ: lda #$7F ; mask for VIA2 JOYBIT: sw3
|
||||
sty VIA1_DDRA ; restore the state of DDRA
|
||||
|
||||
cli ; necessary?
|
||||
ror ; Shift sw3 into bit 7
|
||||
and #$9E ; Mask relevant bits
|
||||
eor #$9E ; Active states are inverted
|
||||
php ; Save sw3 in carry
|
||||
lsr ; Shift sw0,sw1,sw2,sw4 into bits 1-4
|
||||
tax ; Save sw0,sw1,sw2
|
||||
and #$10 ; Extract sw4 in bit 4
|
||||
sta tmp1 ; Save sw4 in bit 4
|
||||
txa ; Restore sw0,sw1,sw2
|
||||
lsr ; Shift sw0,sw1,sw2 into bits 0-2
|
||||
and #$07 ; Mask bits 0-2
|
||||
plp ; Restore sw3 in carry
|
||||
bcc @L0 ; Is sw3 set?
|
||||
ora #$08 ; Yes: Add sw3 in bit 3
|
||||
@L0: ora tmp1 ; Add sw4 in bit 4
|
||||
eor #$1F ; Active states are inverted
|
||||
|
||||
ldx #0
|
||||
rts
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user