From edd596b2a4438788dca88f457910945614699ba1 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Tue, 2 Apr 2019 19:10:52 +0200
Subject: [PATCH] atari: split color.s into bordercolor.s and bgcolor.s

---
 include/atari.h                     |  6 ++++++
 libsrc/atari/{color.s => bgcolor.s} | 16 ++--------------
 libsrc/atari/bordercolor.s          | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 14 deletions(-)
 rename libsrc/atari/{color.s => bgcolor.s} (54%)
 create mode 100644 libsrc/atari/bordercolor.s

diff --git a/include/atari.h b/include/atari.h
index a0d4a3d27..899a6ac51 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -491,5 +491,11 @@ extern void atrx15p2_tgi[];
 #define PxCTL_IRQ_STATUS         0x80
 
 
+/* The following #defines will cause the matching functions calls in conio.h
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
+#define _textcolor(color)        1
+
 /* End of atari.h */
 #endif
diff --git a/libsrc/atari/color.s b/libsrc/atari/bgcolor.s
similarity index 54%
rename from libsrc/atari/color.s
rename to libsrc/atari/bgcolor.s
index 57d0036c9..928dfff9a 100644
--- a/libsrc/atari/color.s
+++ b/libsrc/atari/bgcolor.s
@@ -1,15 +1,12 @@
 ;
-; Christian Groessler, 27-Dec-2002
+; Christian Groessler, 02-Apr-2019
 ;
 
-        .export         _textcolor, _bgcolor, _bordercolor
-        .import         return1
+        .export         _bgcolor
 
         .include        "atari.inc"
 
 
-_textcolor      =       return1
-
 _bgcolor:
         ldx     COLOR2  ; get old value
         sta     COLOR2  ; set new value
@@ -23,12 +20,3 @@ bright: lda     #0
         txa
         ldx     #0      ; fix X
         rts
-
-
-_bordercolor:
-        ldx     COLOR4  ; get old value
-        sta     COLOR4  ; set new value
-        txa
-        ldx     #0      ; fix X
-        rts
-
diff --git a/libsrc/atari/bordercolor.s b/libsrc/atari/bordercolor.s
new file mode 100644
index 000000000..b519686c5
--- /dev/null
+++ b/libsrc/atari/bordercolor.s
@@ -0,0 +1,15 @@
+;
+; Christian Groessler, 02-Apr-2019
+;
+
+        .export         _bordercolor
+
+        .include        "atari.inc"
+
+
+_bordercolor:
+        ldx     COLOR4  ; get old value
+        sta     COLOR4  ; set new value
+        txa
+        ldx     #0      ; fix X
+        rts
-- 
2.39.5