Added SER_ prefix. Whitespace cleanup

[cc65] / libsrc / joystick / joy-kernel.s

diff --git a/libsrc/joystick/joy-kernel.s b/libsrc/joystick/joy-kernel.s
index fbed5ce0a581c85929e5f04ef0b42fdc044e9f6e..c2d50c8d8b529f7e74b6973f1d9a8f7716851d6b 100644 (file)
--- a/libsrc/joystick/joy-kernel.s
+++ b/libsrc/joystick/joy-kernel.s
@@ -4,9 +4,7 @@
 ; Common functions of the joystick API.
 ;
 
-        .export         _joy_install, _joy_uninstall, _joy_masks
-        .export         joy_clear_ptr
-              
+        .import         joy_libref
         .importzp       ptr1
 
         .include        "joy-kernel.inc"
@@ -18,63 +16,60 @@
 
 
 .bss
-_joy_drv:       .res    2                      ; Pointer to driver
-
-_joy_masks:     .res    JOY_MASK_COUNT
+_joy_drv:       .res    2               ; Pointer to driver
 
 ; Jump table for the driver functions.
 .data
 joy_vectors:
-joy_install:           jmp     $0000
-joy_uninstall:         jmp     $0000
+joy_install:    jmp     $0000
+joy_uninstall:  jmp     $0000
 joy_count:      jmp     $0000
 joy_read:       jmp     $0000
 
 ; Driver header signature
 .rodata
-joy_sig:        .byte   $6A, $6F, $79, $00      ; "joy", version
-joy_sig_len     = * - joy_sig
+joy_sig:        .byte   $6A, $6F, $79, JOY_API_VERSION  ; "joy", version
 
 
+.code
 ;----------------------------------------------------------------------------
 ; unsigned char __fastcall__ joy_install (void* driver);
 ; /* Install the driver once it is loaded */
 
 
 _joy_install:
-               sta     _joy_drv
-       sta     ptr1
-       stx     _joy_drv+1
-       stx     ptr1+1
+        sta     _joy_drv
+        sta     ptr1
+        stx     _joy_drv+1
+        stx     ptr1+1
 
 ; Check the driver signature
 
-        ldy     #joy_sig_len-1
+        ldy     #.sizeof(joy_sig)-1
 @L0:    lda     (ptr1),y
         cmp     joy_sig,y
         bne     inv_drv
         dey
         bpl     @L0
 
-; Copy the mask array
+; Set the library reference
 
-        ldy     #JOY_MASKS + JOY_MASK_COUNT - 1
-        ldx     #JOY_MASK_COUNT-1
-@L1:    lda     (ptr1),y
-        sta     _joy_masks,x
-        dey
-        dex
-        bpl     @L1
+        ldy     #JOY_HDR::LIBREF
+        lda     #<joy_libref
+        sta     (ptr1),y
+        iny
+        lda     #>joy_libref
+        sta     (ptr1),y
 
 ; Copy the jump vectors
 
-        ldy     #JOY_HDR_JUMPTAB
+        ldy     #JOY_HDR::JUMPTAB
         ldx     #0
-@L2:    inx                             ; Skip the JMP opcode
+@L1:    inx                             ; Skip the JMP opcode
         jsr     copy                    ; Copy one byte
         jsr     copy                    ; Copy one byte
-        cpx     #(JOY_HDR_JUMPCOUNT*3)
-        bne     @L2
+        cpy     #(JOY_HDR::JUMPTAB + .sizeof(JOY_HDR::JUMPTAB))
+        bne     @L1
 
         jmp     joy_install             ; Call driver install routine
 
@@ -89,24 +84,23 @@ inv_drv:
 
 copy:   lda     (ptr1),y
         iny
-set:    sta     joy_vectors,x
+        sta     joy_vectors,x
         inx
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ joy_uninstall (void);
+; unsigned char joy_uninstall (void);
 ; /* Uninstall the currently loaded driver. Note: This call does not free
-;  * allocated memory.
-;  */
+; ** allocated memory.
+; */
 
 _joy_uninstall:
         jsr     joy_uninstall           ; Call the driver routine
 
-joy_clear_ptr:                          ; External entry point
+_joy_clear_ptr:                         ; External entry point
         lda     #0
         sta     _joy_drv
         sta     _joy_drv+1              ; Clear the driver pointer
 
         tax                             ; Return zero
         rts
-