X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=asminc%2Fjoy-kernel.inc;h=4fe5572cf0b843c9d4a6e05bd63db59216bd3004;hb=ff339393859558323553aea89c1ecc90fcf55d01;hp=7f600ed1b9bf03c978ef5a75ee12db98102e51a7;hpb=59d2e4e1f41c7d1b365f59b3e86f076b1cc7e70b;p=cc65

diff --git a/asminc/joy-kernel.inc b/asminc/joy-kernel.inc
index 7f600ed1b..4fe5572cf 100644
--- a/asminc/joy-kernel.inc
+++ b/asminc/joy-kernel.inc
@@ -6,10 +6,10 @@
 ;/*                                                                           */
 ;/*                                                                           */
 ;/*                                                                           */
-;/* (C) 2002      Ullrich von Bassewitz                                       */
-;/*               Wacholderweg 14                                             */
-;/*               D-70597 Stuttgart                                           */
-;/* EMail:        uz@musoftware.de                                            */
+;/* (C) 2002-2006, Ullrich von Bassewitz                                      */
+;/*                Römerstraße 52                                             */
+;/*                D-70794 Filderstadt                                        */
+;/* EMail:         uz@cc65.org                                                */
 ;/*                                                                           */
 ;/*                                                                           */
 ;/* This software is provided 'as-is', without any expressed or implied       */
@@ -40,27 +40,28 @@
 ; Driver header stuff
 
 .struct JOY_HDR
-	ID	.byte	3	; $6A, $6F, $79 ("joy")
-	VERSION .byte	1	; Interface version
-	MASKS	.byte	8	; Joystick state mask array
-	JUMPTAB .struct
-	    INSTALL	.word	; INSTALL routine
-	    UNINSTALL   .word	; UNINSTALL routine
-	    COUNT       .word	; COUNT routine
-	    READ 	.word	; READ routine
-            IRQ         .word   ; IRQ routine
-	.endstruct
+        ID      .byte   3       ; $6A, $6F, $79 ("joy")
+        VERSION .byte   1       ; Interface version
+        LIBREF  .addr           ; Library reference
+        MASKS   .byte   8       ; Joystick state mask array
+        JUMPTAB .struct
+            INSTALL     .addr   ; INSTALL routine
+            UNINSTALL   .addr   ; UNINSTALL routine
+            COUNT       .addr   ; COUNT routine
+            READ        .addr   ; READ routine
+            IRQ         .addr   ; IRQ routine
+        .endstruct
 .endstruct
 
 ;------------------------------------------------------------------------------
 ; The JOY API version, stored in JOY_HDR::VERSION
 
-JOY_API_VERSION         = $01
+JOY_API_VERSION         = $03
 
 ;------------------------------------------------------------------------------
 ; Variables
 
-       	.global	_joy_drv                        ; Pointer to driver
+        .global _joy_drv                        ; Pointer to driver
         .global _joy_masks
 
 ;------------------------------------------------------------------------------
@@ -74,10 +75,11 @@ JOY_API_VERSION         = $01
 ;------------------------------------------------------------------------------
 ; C callable functions
 
+        .global _joy_load_driver
         .global _joy_unload
-       	.global	_joy_install
-       	.global _joy_uninstall
-       	.global	_joy_count
-       	.global	_joy_read
-
+        .global _joy_install
+        .global _joy_uninstall
+        .global _joy_count
+        .global _joy_read
 
+        .global _joy_clear_ptr