From: Greg King <gregdk@users.sf.net>
Date: Thu, 4 Sep 2014 21:37:41 +0000 (-0400)
Subject: Swapped the locations of a constructor and a destructor in a source file.
X-Git-Tag: V2.15~46^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=970af0cdb2f058f8e6a4fc7e82e0137d52fe6a5a;p=cc65

Swapped the locations of a constructor and a destructor in a source file.

The constructor now is first.

Used a more expressive literal zero.
---

diff --git a/libsrc/atmos/capslock.s b/libsrc/atmos/capslock.s
index 6811862c6..0ed6e70da 100644
--- a/libsrc/atmos/capslock.s
+++ b/libsrc/atmos/capslock.s
@@ -5,25 +5,15 @@
 ; (which is the default on other cc65 platforms).
 ; This module is linked by the conio and POSIX input functions.
 ;
-; 2014-08-22, Greg King
+; 2014-09-04, Greg King
 ;
 
-        .destructor     restore_caps
         .constructor    disable_caps
+        .destructor     restore_caps
 
         .include        "atmos.inc"
 
 
-;--------------------------------------------------------------------------
-
-; Restore the old capitals-lock state.
-
-restore_caps:
-        lda     capsave
-        sta     CAPSLOCK
-        rts
-
-
 ;--------------------------------------------------------------------------
 ; Put this constructor into a segment that can be re-used by programs.
 ;
@@ -39,6 +29,18 @@ disable_caps:
         rts
 
 
+;--------------------------------------------------------------------------
+
+.code
+
+; Restore the old capitals-lock state.
+
+restore_caps:
+        lda     capsave
+        sta     CAPSLOCK
+        rts
+
+
 ;--------------------------------------------------------------------------
 
 .bss
diff --git a/libsrc/atmos/cgetc.s b/libsrc/atmos/cgetc.s
index dab92f882..e4ea15ac6 100644
--- a/libsrc/atmos/cgetc.s
+++ b/libsrc/atmos/cgetc.s
@@ -1,6 +1,6 @@
 ;
 ; 2003-04-13, Ullrich von Bassewitz
-; 2014-08-22, Greg King
+; 2014-09-04, Greg King
 ;
 ; char cgetc (void);
 ;
@@ -38,15 +38,15 @@
         beq     @L2
         dec     STATUS          ; Clear bit zero
 
-; We have the character, clear avail flag
+; We have the character, clear the "available" flag
 
 @L2:    and     #$7F            ; Mask out avail flag
         sta     KEYBUF
-        ldx     #>0
+        ldx     #>$0000
         ldy     MODEKEY
         cpy     #FUNCTKEY
         bne     @L3
-        ora     #$80            ; FUNCT pressed
+        ora     #$80            ; FUNCT-key pressed
 
 ; Done