Target-specific black & white values for use by the target-shared TGI kernel

git-svn-id: svn://svn.cc65.org/cc65/trunk@4993 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/asminc/tgi-kernel.inc b/asminc/tgi-kernel.inc
index 1a6223bb0ee80f1e4758c42a508dcad9af5655f6..5f43fc00760c0a46c37092d0d46082e0f4e26116 100644 (file)
--- a/asminc/tgi-kernel.inc
+++ b/asminc/tgi-kernel.inc
@@ -78,10 +78,7 @@
 TGI_API_VERSION         = $03
 
 ;------------------------------------------------------------------------------
-; Color and text constants
-
-TGI_COLOR_BLACK         = 0
-TGI_COLOR_WHITE         = 1
+; Text constants
 
 TGI_FONT_BITMAP         = 0
 TGI_FONT_VECTOR         = 1
@@ -99,7 +96,13 @@ TGI_CLIP_BOTTOM         = $04
 TGI_CLIP_TOP            = $08
 
 ;------------------------------------------------------------------------------
-; C accessible Variables
+; ASM accessible color constants
+
+       .global tgi_color_black:zp      ; Target-specific value for black
+       .global tgi_color_white:zp      ; Target-specific value for white
+
+;------------------------------------------------------------------------------
+; C accessible variables
 
        .global _tgi_drv                ; Pointer to driver
        .global _tgi_error              ; Last error code
@@ -125,7 +128,7 @@ TGI_CLIP_TOP            = $08
         .global _tgi_aspectratio        ; Aspect ratio, fixed point 8.8
 
 ;------------------------------------------------------------------------------
-; ASM accessible Variables
+; ASM accessible variables
 
                .global tgi_clip_x1             ; Coordinate for line clipper
                .global tgi_clip_y1             ; Coordinate for line clipper

diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile
index d2f065c13dbaedff0bd8b40b2cecd6a07a7c7573..a5f45f3efcc3c0e85a554a8d1b9f5ad6b0ddbe06 100644 (file)
--- a/libsrc/apple2/Makefile
+++ b/libsrc/apple2/Makefile
@@ -103,6 +103,7 @@ S_OBJS=     _scrsize.o      \
        sysrmdir.o      \
         systime.o       \
         sysuname.o      \
+        tgi_colors.o    \
         tgi_mode_table.o\
         toascii.o       \
         vtabz.o         \

diff --git a/libsrc/apple2/tgi_colors.s b/libsrc/apple2/tgi_colors.s
new file mode 100644 (file)
index 0000000..8bc3698
--- /dev/null
+++ b/libsrc/apple2/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $03

diff --git a/libsrc/apple2enh/Makefile b/libsrc/apple2enh/Makefile
index e41d435dbcfba6b36c564afc47812e0602f2adbb..9bdeea289b9aa49880ef242a558ecd767d717aeb 100644 (file)
--- a/libsrc/apple2enh/Makefile
+++ b/libsrc/apple2enh/Makefile
@@ -107,6 +107,7 @@ S_OBJS=     _scrsize.o      \
         systime.o       \
         sysuname.o      \
        textframe.o     \
+        tgi_colors.o    \
         tgi_mode_table.o\
         toascii.o       \
         videomode.o     \

diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile
index be909955f6623635ab273af6676f094236de35fb..2eb51d910a4bd3ed4740a112c49efeba99523681 100644 (file)
--- a/libsrc/atari/Makefile
+++ b/libsrc/atari/Makefile
@@ -113,8 +113,9 @@ OBJS =      _scrsize.o      \
        sysrmdir.o      \
        systime.o       \
        sysuname.o      \
-       toascii.o       \
+       tgi_colors.o    \
        tgi_mode_table.o\
+       toascii.o       \
        tvtype.o        \
        ucase_fn.o      \
        wherex.o        \

diff --git a/libsrc/atari/tgi_colors.s b/libsrc/atari/tgi_colors.s
new file mode 100644 (file)
index 0000000..4dab483
--- /dev/null
+++ b/libsrc/atari/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $01

diff --git a/libsrc/atmos/Makefile b/libsrc/atmos/Makefile
index 5fe1792b329d3d0ed63eb09a9bb61cec0ab0d62d..a365541321cb4ada2c453c8037099bff64101d63 100644 (file)
--- a/libsrc/atmos/Makefile
+++ b/libsrc/atmos/Makefile
@@ -65,6 +65,7 @@ OBJS  =       _scrsize.o      \
         revers.o        \
         systime.o       \
         sysuname.o      \
+        tgi_colors.o    \
         wherex.o        \
         wherey.o        \
         write.o

diff --git a/libsrc/atmos/tgi_colors.s b/libsrc/atmos/tgi_colors.s
new file mode 100644 (file)
index 0000000..4dab483
--- /dev/null
+++ b/libsrc/atmos/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $01

diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile
index 22f928db92099dcadde2b71dd41c5f6a3fdcb6f7..18b7af1a7616fd7bb076c43f1012b9e0ccbc3d80 100644 (file)
--- a/libsrc/c128/Makefile
+++ b/libsrc/c128/Makefile
@@ -67,6 +67,7 @@ OBJS =        _scrsize.o              \
        slow.o                  \
         systime.o               \
         sysuname.o              \
+        tgi_colors.o            \
        tgi_mode_table.o        \
        toggle_videomode.o      \
         videomode.o

diff --git a/libsrc/c128/tgi_colors.s b/libsrc/c128/tgi_colors.s
new file mode 100644 (file)
index 0000000..4dab483
--- /dev/null
+++ b/libsrc/c128/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $01

diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile
index 9b6feb0be152eb9027a1227e3a7b460a4b71427f..f21c140c832c7c54f778da167f25a42a247c8da9 100644 (file)
--- a/libsrc/c64/Makefile
+++ b/libsrc/c64/Makefile
@@ -4,7 +4,6 @@
 
 .SUFFIXES: .o .s .c
 
-
 #--------------------------------------------------------------------------
 # Programs and flags
 
@@ -67,6 +66,7 @@ OBJS =        _scrsize.o              \
         revers.o                \
         systime.o               \
         sysuname.o              \
+        tgi_colors.o            \
         tgi_mode_table.o
 
 #--------------------------------------------------------------------------

diff --git a/libsrc/c64/tgi_colors.s b/libsrc/c64/tgi_colors.s
new file mode 100644 (file)
index 0000000..4dab483
--- /dev/null
+++ b/libsrc/c64/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $01

diff --git a/libsrc/lynx/Makefile b/libsrc/lynx/Makefile
index d6801be305f2530c6cf0b7edcec59a5057af94e3..c5a1c13af67a97495a0b595a931bedbfdf1203df 100644 (file)
--- a/libsrc/lynx/Makefile
+++ b/libsrc/lynx/Makefile
@@ -4,7 +4,6 @@
 
 .SUFFIXES: .o .s .c
 
-
 #--------------------------------------------------------------------------
 # Programs and flags
 
@@ -64,6 +63,7 @@ OBJS =  bllhdr.o      \
        oserror.o       \
        read.o          \
        sysuname.o      \
+        tgi_colors.o   \
         toascii.o      \
         uploader.o
 

diff --git a/libsrc/lynx/tgi_colors.s b/libsrc/lynx/tgi_colors.s
new file mode 100644 (file)
index 0000000..64155f3
--- /dev/null
+++ b/libsrc/lynx/tgi_colors.s
@@ -0,0 +1,8 @@
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+       .include        "tgi-kernel.inc"
+
+       .export         tgi_color_black:zp = $00
+       .export         tgi_color_white:zp = $0F

diff --git a/libsrc/tgi/tgi_init.s b/libsrc/tgi/tgi_init.s
index ccee5a63a1aae15645b5554e5007d298f837f20e..0df052edd0e98ef69e44a8f1282211350d2b7b65 100644 (file)
--- a/libsrc/tgi/tgi_init.s
+++ b/libsrc/tgi/tgi_init.s
@@ -55,7 +55,7 @@
 
 ; Set the drawing color to white
 
-@L1:    lda     #TGI_COLOR_WHITE
+@L1:    lda     #tgi_color_white
         jsr     _tgi_setcolor           ; tgi_setcolor (TGI_COLOR_WHITE);
 
 ; Set the text style