Added library reference joy_libref to JOY interface.

2025-01-12 02:30:44 +00:00 · 2013-06-01 00:36:08 +02:00 · 2013-06-01 00:36:08 +02:00 · 23650cb946
commit 23650cb946
parent 619b215260
34 changed files with 155 additions and 14 deletions
--- a/asminc/joy-kernel.inc
+++ b/asminc/joy-kernel.inc
@ -42,20 +42,21 @@
 .struct JOY_HDR
        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     .word   ; INSTALL routine
-            UNINSTALL   .word   ; UNINSTALL routine
-            COUNT       .word   ; COUNT routine
-            READ        .word   ; READ routine
-            IRQ         .word   ; IRQ routine
+            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         = $02

 ;------------------------------------------------------------------------------
 ; Variables
@ -82,4 +83,3 @@ JOY_API_VERSION         = $01
        .global _joy_read

        .global _joy_clear_ptr
-
--- a/libsrc/apple2/joy/a2.stdjoy.s
+++ b/libsrc/apple2/joy/a2.stdjoy.s
@ -36,6 +36,10 @@ PREAD   :=      $FB1E   ; Read paddle in X, return AD conv. value in Y
        .byte   $6A, $6F, $79   ; "joy"
        .byte   JOY_API_VERSION ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $10
--- a/libsrc/apple2/libref.s
+++ b/libsrc/apple2/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/atari/joy/atrmj8.s
+++ b/libsrc/atari/joy/atrmj8.s
@ -26,6 +26,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $02                     ; JOY_UP
--- a/libsrc/atari/joy/atrstd.s
+++ b/libsrc/atari/joy/atrstd.s
@ -25,6 +25,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/atari/libref.s
+++ b/libsrc/atari/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/atmos/joy/atmos-pase.s
+++ b/libsrc/atmos/joy/atmos-pase.s
@ -21,6 +21,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $10                     ; JOY_UP
--- a/libsrc/atmos/libref.s
+++ b/libsrc/atmos/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
--- a/libsrc/c128/joy/c128-ptvjoy.s
+++ b/libsrc/c128/joy/c128-ptvjoy.s
@ -24,6 +24,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/c128/joy/c128-stdjoy.s
+++ b/libsrc/c128/joy/c128-stdjoy.s
@ -25,6 +25,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/c128/libref.s
+++ b/libsrc/c128/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/c16/libref.s
+++ b/libsrc/c16/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/c64/joy/c64-hitjoy.s
+++ b/libsrc/c64/joy/c64-hitjoy.s
@ -23,6 +23,10 @@
        .byte   $6A, $6F, $79   ; "joy"
        .byte   JOY_API_VERSION ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/c64/joy/c64-numpad.s
+++ b/libsrc/c64/joy/c64-numpad.s
@ -25,6 +25,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $02                     ; JOY_UP        "8"
--- a/libsrc/c64/joy/c64-ptvjoy.s
+++ b/libsrc/c64/joy/c64-ptvjoy.s
@ -23,6 +23,10 @@
        .byte   $6A, $6F, $79   ; "joy"
        .byte   JOY_API_VERSION ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/c64/joy/c64-stdjoy.s
+++ b/libsrc/c64/joy/c64-stdjoy.s
@ -24,6 +24,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/c64/libref.s
+++ b/libsrc/c64/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/cbm510/joy/cbm510-std.s
+++ b/libsrc/cbm510/joy/cbm510-std.s
@ -25,6 +25,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/cbm510/libref.s
+++ b/libsrc/cbm510/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/geos-cbm/joy/geos-stdjoy.s
+++ b/libsrc/geos-cbm/joy/geos-stdjoy.s
@ -22,6 +22,10 @@
        .byte $6A, $6F, $79     ; "joy"
        .byte JOY_API_VERSION   ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte $01               ; JOY_UP
--- a/libsrc/geos-cbm/system/libref.s
+++ b/libsrc/geos-cbm/system/libref.s
@ -2,7 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;

-        .export         em_libref
+        .export         em_libref, joy_libref
        .import         _exit

 em_libref       := _exit
+joy_libref      := _exit
--- a/libsrc/joystick/joy-kernel.s
+++ b/libsrc/joystick/joy-kernel.s
@ -4,6 +4,7 @@
 ; Common functions of the joystick API.
 ;

+        .import         joy_libref
        .importzp       ptr1
        .interruptor    joy_irq         ; Export as IRQ handler

@ -55,6 +56,15 @@ _joy_install:
        dey
        bpl     @L0

+; Set the library reference
+
+        ldy     #JOY_HDR::LIBREF
+        lda     #<joy_libref
+        sta     (ptr1),y
+        iny
+        lda     #>joy_libref
+        sta     (ptr1),y
+
 ; Copy the mask array

        ldy     #JOY_HDR::MASKS + .sizeof(JOY_HDR::MASKS) - 1
--- a/libsrc/lynx/joy/lynx-stdjoy.s
+++ b/libsrc/lynx/joy/lynx-stdjoy.s
@ -26,6 +26,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

 joy_mask:
--- a/libsrc/lynx/libref.s
+++ b/libsrc/lynx/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
--- a/libsrc/nes/joy/nes-stdjoy.s
+++ b/libsrc/nes/joy/nes-stdjoy.s
@ -23,6 +23,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $10                     ; JOY_UP
--- a/libsrc/nes/libref.s
+++ b/libsrc/nes/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
--- a/libsrc/pet/joy/pet-ptvjoy.s
+++ b/libsrc/pet/joy/pet-ptvjoy.s
@ -24,6 +24,10 @@ VIA_DDRA        := $E843                ; Data direction register A
        .byte   $6A, $6F, $79   ; "joy"
        .byte   JOY_API_VERSION ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/pet/joy/pet-stdjoy.s
+++ b/libsrc/pet/joy/pet-stdjoy.s
@ -21,6 +21,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01             ; JOY_UP
--- a/libsrc/pet/libref.s
+++ b/libsrc/pet/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
--- a/libsrc/plus4/joy/plus4-stdjoy.s
+++ b/libsrc/plus4/joy/plus4-stdjoy.s
@ -24,6 +24,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/plus4/libref.s
+++ b/libsrc/plus4/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
--- a/libsrc/vic20/joy/vic20-ptvjoy.s
+++ b/libsrc/vic20/joy/vic20-ptvjoy.s
@ -23,6 +23,10 @@
        .byte   $6A, $6F, $79   ; "joy"
        .byte   JOY_API_VERSION ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $01                     ; JOY_UP
--- a/libsrc/vic20/joy/vic20-stdjoy.s
+++ b/libsrc/vic20/joy/vic20-stdjoy.s
@ -25,6 +25,10 @@
        .byte   $6A, $6F, $79           ; "joy"
        .byte   JOY_API_VERSION         ; Driver API version number

+; Library reference
+
+        .addr   $0000
+
 ; Button state masks (8 values)

        .byte   $02                     ; JOY_UP
--- a/libsrc/vic20/libref.s
+++ b/libsrc/vic20/libref.s
@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit