no TGI_ERR_NO_MEM or TGI_ERR_NO_IOCB anymore: replaced by TGI_ERR_NO_RES

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

diff --git a/libsrc/plus4/plus4-stdjoy.s b/libsrc/plus4/plus4-stdjoy.s
index ed5af58ebfebcba8c7149c2379ef28c0275b17db..bdba131fb49ef0dec24fe89567a4a9a2a0ec1ee7 100644 (file)
--- a/libsrc/plus4/plus4-stdjoy.s
+++ b/libsrc/plus4/plus4-stdjoy.s
@@ -9,7 +9,7 @@
 
        .include        "joy-kernel.inc"
         .include        "joy-error.inc"
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 
         .macpack        generic
 
@@ -22,7 +22,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)
 
@@ -31,19 +31,20 @@
         .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                     
+; Constants
 
 JOY_COUNT       = 2             ; Number of joysticks we support
 
@@ -64,8 +65,7 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 INSTALL:
         lda     #<JOY_ERR_OK
         ldx     #>JOY_ERR_OK
-
-;      rts                     ; Run into DEINSTALL instead
+;      rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
 ; UNINSTALL routine. Is called before the driver is removed from memory.