Fixes for the ptvjoy drivers by Marco van den Heuvel.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4581 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/c128/c128-ptvjoy.s b/libsrc/c128/c128-ptvjoy.s
index d566f72db6d34eeeb16d970a782337f46644314e..e101997f10737b694b8502ca8c3573cc7974c382 100644 (file)
--- a/libsrc/c128/c128-ptvjoy.s
+++ b/libsrc/c128/c128-ptvjoy.s
@@ -117,24 +117,24 @@ joy2:   dex
 
 ; Read joystick 3
 
-joy3:   dex
-        bne     joy4
-
+joy3:
         lda     #%10000000      ; cia 2 port B Data-Direction
         sta     CIA2_DDRB       ; bit 7: out    bit 6-0: in
 
+        dex
+        bne     joy4
+
         lda     #$80            ; cia 2 port B read/write
         sta     CIA2_PRB        ; (output one at PB7)
 
         lda     CIA2_PRB        ; cia 2 port B read/write
         and     #$1f            ; get bit 4-0 (PB4-PB0)
+        eor     #$1f
         rts
 
 ; Read joystick 4
 
-joy4:   lda     #%10000000      ; cia 2 port B Data-Direction
-        sta     CIA2_DDRB       ; bit 7: out    bit 6-0: in
-
+joy4:
         lda     #$00            ; cia 2 port B read/write
         sta     CIA2_PRB        ; (output zero at PB7)
 
@@ -146,7 +146,7 @@ joy4:   lda     #%10000000      ; cia 2 port B Data-Direction
         and     #%00100000      ; get bit 5 (PB5)
         lsr
         ora     tmp1
+        eor     #$1f
 
         ldx #0
         rts
-

diff --git a/libsrc/vic20/vic20-ptvjoy.s b/libsrc/vic20/vic20-ptvjoy.s
index 72b341eca36169402ef795b6076b8a9129beb06e..b8c08c67d9c619728f7c27caa953428491e888e2 100644 (file)
--- a/libsrc/vic20/vic20-ptvjoy.s
+++ b/libsrc/vic20/vic20-ptvjoy.s
@@ -125,6 +125,7 @@ joy2:       lda     #%10000000      ; via port B Data-Direction
 
        lda     VIA1_PRB        ; via port B read/write
        and     #$1f            ; get bit 4-0 (PB4-PB0)
+       eor     #$1f
        rts
 
 ; Read joystick 3
@@ -140,6 +141,7 @@ joy3:       lda     #$00            ; via port B read/write
        and     #%00100000      ; get bit 5 (PB5)
        lsr
        ora     tmp1
+       eor     #$1f
 
        ldx     #0
        rts