remove superfluous ".code" line

[cc65] / libsrc / cbm510 / cbm510-stdjoy.s

diff --git a/libsrc/cbm510/cbm510-stdjoy.s b/libsrc/cbm510/cbm510-stdjoy.s
index 20d8c30df1f9fa3926147b8a16d9fba024b53e41..5b7ec56a21192578f716ca66329ad83caebfb814 100644 (file)
--- a/libsrc/cbm510/cbm510-stdjoy.s
+++ b/libsrc/cbm510/cbm510-stdjoy.s
@@ -11,6 +11,7 @@
        .include        "joy-kernel.inc"
         .include        "joy-error.inc"
         .include        "cbm510.inc"
+        .include        "extzp.inc"
 
         .macpack        generic
 
@@ -23,7 +24,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)
 
@@ -32,16 +33,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   UNINSTALL
-        .word   COUNT
-        .word   READ
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   COUNT
+        .addr   READ
+        .addr   0                       ; IRQ entry unused
 
 ; ------------------------------------------------------------------------
 ; Constants
@@ -65,7 +67,6 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 INSTALL:
         lda     #<JOY_ERR_OK
         ldx     #>JOY_ERR_OK
-
 ;      rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
@@ -96,13 +97,13 @@ READ:   ldx     #$0F            ; Switch to the system bank
 
 ; Get the direction bits
 
-       ldy     #CIA_PRB
+       ldy     #CIA::PRB
        lda     (cia2),y        ; Read joystick inputs
        sta     tmp1
 
 ; Get the fire bits
 
-        ldy     #CIA_PRA
+        ldy     #CIA::PRA
        lda     (cia2),y
 
 ; Make the result value