no TGI_ERR_NO_MEM or TGI_ERR_NO_IOCB anymore: replaced by TGI_ERR_NO_RES

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

diff --git a/libsrc/vic20/vic20-stdjoy.s b/libsrc/vic20/vic20-stdjoy.s
index 6d725a702433c78d51bb9910a5a6136330096b05..e352950cf37e3de3ad58dc9f95259bba81138afb 100644 (file)
--- a/libsrc/vic20/vic20-stdjoy.s
+++ b/libsrc/vic20/vic20-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the VIC20
+; Standard joystick driver for the VIC20. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-20
 ; Using code from Steve Schmidtke
@@ -22,7 +23,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,16 +32,17 @@
         .byte   $08                     ; JOY_LEFT
         .byte   $80                     ; 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
@@ -64,15 +66,14 @@ JOY_COUNT       = 1             ; 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