fix comments

[cc65] / libsrc / c64 / c64-ptvjoy.s

diff --git a/libsrc/c64/c64-ptvjoy.s b/libsrc/c64/c64-ptvjoy.s
index 9c5db39f0aef72c036ceb666963f58525d91c2a0..e365ee6a9ba774f84fb590b3cfff3c0a2c188a36 100755 (executable)
--- a/libsrc/c64/c64-ptvjoy.s
+++ b/libsrc/c64/c64-ptvjoy.s
@@ -21,7 +21,7 @@
 ; Driver signature
 
         .byte   $6A, $6F, $79   ; "joy"
-        .byte   $00             ; Driver API version number
+        .byte   JOY_API_VERSION        ; Driver API version number
 
 ; Button state masks (8 values)
 
@@ -30,16 +30,17 @@
         .byte   $04                     ; JOY_LEFT
         .byte   $08                     ; JOY_RIGHT
         .byte   $10                     ; JOY_FIRE
-        .byte   $00                     ; Future expansion
+        .byte   $00                     ; JOY_FIRE2 unavailable
         .byte   $00                     ; Future expansion
         .byte   $00                     ; Future expansion
 
 ; Jump table.
 
-        .word   INSTALL
-        .word   DEINSTALL
-        .word   COUNT
-        .word   READ
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   COUNT
+        .addr   READ
+        .addr   0                       ; IRQ entry unused
 
 ; ------------------------------------------------------------------------
 ; Constants
@@ -59,15 +60,14 @@ JOY_COUNT       = 4             ; Number of joysticks we support
 INSTALL:
         lda     #<JOY_ERR_OK
         ldx     #>JOY_ERR_OK
-
-;      rts                     ; Run into DEINSTALL instead
+;      rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts
 
 
@@ -116,12 +116,12 @@ joy2:   dex
 
 ; Read joystick 3
 
-joy3:   dex
-        bne     joy4
-
         lda     #%10000000      ; cia 2 port B Data-Direction
         sta     CIA2_DDRB       ; bit 7: out    bit 6-0: in
 
+joy3:   dex
+        bne     joy4
+
         lda     #$80            ; cia 2 port B read/write
         sta     CIA2_PRB        ; (output one at PB7)
 
@@ -131,10 +131,7 @@ joy3:   dex
 
 ; Read joystick 4
 
-joy4:   lda     #%10000000      ; cia 2 port B Data-Direction
-        sta     CIA2_DDRB       ; bit 7: out    bit 6-0: in
-
-        lda     #$00            ; cia 2 port B read/write
+joy4:   lda     #$00            ; cia 2 port B read/write
         sta     CIA2_PRB        ; (output zero at PB7)
 
         lda     CIA2_PRB        ; cia 2 port B read/write