Remove trailings spaces from CBM-related asm files

[cc65] / libsrc / mouse / mouse-kernel.s

diff --git a/libsrc/mouse/mouse-kernel.s b/libsrc/mouse/mouse-kernel.s
index bd0e15356637cdbc12f62b28c7b05c3e420bc3c4..2fa5b5e2d4d9a8bca7cf3b37b17a5343e4830074 100644 (file)
--- a/libsrc/mouse/mouse-kernel.s
+++ b/libsrc/mouse/mouse-kernel.s
@@ -1,12 +1,12 @@
 ;
-; Ullrich von Bassewitz, 2003-12-28
+; Ullrich von Bassewitz, 2003-12-28, 2009-09-26
 ;
 ; Common functions of the mouse driver API.
 ;
 
-        .import         return0, popsreg, incsp2
+        .import         return0, popsreg, incsp2, mouse_libref
         .importzp       sreg, ptr1, tmp1, tmp2
-               .interruptor    mouse_irq               ; Export as IRQ handler
+        .interruptor    mouse_irq               ; Export as IRQ handler
 
         .include        "mouse-kernel.inc"
 
@@ -17,7 +17,7 @@
 
 
 .bss
-_mouse_drv:     .res    2                      ; Pointer to driver
+_mouse_drv:     .res    2               ; Pointer to driver
 
 _mouse_hidden:  .res    1               ; Mouse visibility flag
 
@@ -28,13 +28,14 @@ mouse_install:  jmp     return0
 mouse_uninstall:jmp     return0
 mouse_hide:     jmp     return0
 mouse_show:     jmp     return0
-mouse_box:      jmp     return0
+mouse_setbox:   jmp     return0
+mouse_getbox:   jmp     return0
 mouse_move:     jmp     return0
 mouse_buttons:  jmp     return0
 mouse_pos:      jmp     return0
 mouse_info:     jmp     return0
 mouse_ioctl:    jmp     return0
-mouse_irq:     .byte   $60, $00, $00   ; RTS plus two dummy bytes
+mouse_irq:      .byte   $60, $00, $00   ; RTS plus two dummy bytes
 mouse_flags:    .byte   $00
 
 ; Driver header signature
@@ -49,10 +50,10 @@ mouse_sig:      .byte   $6d, $6f, $75, MOUSE_API_VERSION    ; "mou", version
 ; /* Install an already loaded driver. Returns an error code. */
 
 _mouse_install:
-               sta     _mouse_drv
-       sta     ptr1
-       stx     _mouse_drv+1
-       stx     ptr1+1
+        sta     _mouse_drv
+        sta     ptr1
+        stx     _mouse_drv+1
+        stx     ptr1+1
 
 ; Check the driver signature
 
@@ -63,6 +64,15 @@ _mouse_install:
         dey
         bpl     @L0
 
+; Set the library reference
+
+        ldy     #MOUSE_HDR::LIBREF
+        lda     #<mouse_libref
+        sta     (ptr1),y
+        iny
+        lda     #>mouse_libref
+        sta     (ptr1),y
+
 ; Reset flags
 
         lda     #1
@@ -103,7 +113,7 @@ _mouse_install:
 
         bit     mouse_flags             ; Test MOUSE_FLAG_EARLY_IRQ
         bvc     @L3                     ; Jump if no interrupts at this time
-               jsr     install_irq             ; Activate IRQ routine
+        jsr     install_irq             ; Activate IRQ routine
 
 ; Call driver install routine and check for errors
 
@@ -118,16 +128,16 @@ _mouse_install:
         bit     mouse_flags             ; Test MOUSE_FLAG_LATE_IRQ
         bpl     Exit                    ; Jump if vector not needed
 install_irq:
-               ldy     #$4C                    ; Jump opcode
-               sty     mouse_irq               ; Activate IRQ routine
+        ldy     #$4C                    ; Jump opcode
+        sty     mouse_irq               ; Activate IRQ routine
 Exit:   rts
 
 ; Uninstall IRQ vector if install routine had errors. A/X may contain the
 ; error code from mouse_install, so don't use it.
 
 uninstall_irq:
-       ldy     #$60                    ; RTS opcode
-       sty     mouse_irq               ; Disable IRQ entry point
+        ldy     #$60                    ; RTS opcode
+        sty     mouse_irq               ; Disable IRQ entry point
         rts
 
 ; Driver signature invalid. One word is still on the stack
@@ -155,12 +165,24 @@ copycb: lda     (sreg),y
         rts
 
 ;----------------------------------------------------------------------------
-; unsigned char __fastcall__ mouse_uninstall (void);
+; unsigned char mouse_uninstall (void);
 ; /* Uninstall the currently loaded driver. Returns an error code. */
 
 _mouse_uninstall:
-       jsr     uninstall_irq           ; Disable driver interrupts
-        jsr     mouse_uninstall         ; Call driver routine
+
+; Depending on the late/early IRQ flag, we will disable IRQs before or after
+; calling the driver mouse_uninstall routine.
+
+        bit     mouse_flags             ; Test MOUSE_FLAG_LATE_IRQ
+        bpl     @L1                     ; Don't disable interrupts now
+        jsr     uninstall_irq           ; Disable driver interrupts
+@L1:    jsr     mouse_uninstall         ; Call driver routine
+
+; We don't check the flag a second time here, since disabling IRQs twice,
+; or disabling them if they weren't enabled will do no harm, and the missing
+; check will save a few bytes.
+
+        jsr     uninstall_irq           ; Disable driver interrupts
 
 _mouse_clear_ptr:                       ; External entry point
         lda     #0
@@ -169,5 +191,3 @@ _mouse_clear_ptr:                       ; External entry point
 
         tax
         rts                             ; Return zero
-
-