atari5200: conio now uses just four colors altogether

[cc65] / include / atari5200.h

diff --git a/include/atari5200.h b/include/atari5200.h
index 4bd5bc0fd7421fa0031e18219e7691f094d16043..d6c2561b25520292461ac053f91c9ff5584454cc 100644 (file)
--- a/include/atari5200.h
+++ b/include/atari5200.h
@@ -46,46 +46,20 @@
 /* the addresses of the static drivers */
 extern void atr5200std_joy[];        /* referred to by joy_static_stddrv[] */
 
-/* make GTIA color value */
-#define _gtia_mkcolor(hue,lum) (((hue) << 4) | ((lum) << 1))
-
-/* luminance values go from 0 (black) to 7 (white) */
-
-/* hue values */
-#define HUE_GREY        0
-#define HUE_GOLD        1
-#define HUE_GOLDORANGE  2
-#define HUE_REDORANGE   3
-#define HUE_ORANGE      4
-#define HUE_MAGENTA     5
-#define HUE_PURPLE      6
-#define HUE_BLUE        7
-#define HUE_BLUE2       8
-#define HUE_CYAN        9
-#define HUE_BLUEGREEN   10
-#define HUE_BLUEGREEN2  11
-#define HUE_GREEN       12
-#define HUE_YELLOWGREEN 13
-#define HUE_YELLOW      14
-#define HUE_YELLOWRED   15
-
-/* Color defines, similar to c64 colors (untested) */
-#define COLOR_BLACK             _gtia_mkcolor(HUE_GREY,0)
-#define COLOR_WHITE             _gtia_mkcolor(HUE_GREY,7)
-#define COLOR_RED               _gtia_mkcolor(HUE_REDORANGE,1)
-#define COLOR_CYAN              _gtia_mkcolor(HUE_CYAN,3)
-#define COLOR_VIOLET            _gtia_mkcolor(HUE_PURPLE,4)
-#define COLOR_GREEN             _gtia_mkcolor(HUE_GREEN,2)
-#define COLOR_BLUE              _gtia_mkcolor(HUE_BLUE,2)
-#define COLOR_YELLOW            _gtia_mkcolor(HUE_YELLOW,7)
-#define COLOR_ORANGE            _gtia_mkcolor(HUE_ORANGE,5)
-#define COLOR_BROWN             _gtia_mkcolor(HUE_YELLOW,2)
-#define COLOR_LIGHTRED          _gtia_mkcolor(HUE_REDORANGE,6)
-#define COLOR_GRAY1             _gtia_mkcolor(HUE_GREY,2)
-#define COLOR_GRAY2             _gtia_mkcolor(HUE_GREY,3)
-#define COLOR_LIGHTGREEN        _gtia_mkcolor(HUE_GREEN,6)
-#define COLOR_LIGHTBLUE         _gtia_mkcolor(HUE_BLUE,6)
-#define COLOR_GRAY3             _gtia_mkcolor(HUE_GREY,5)
+/* Masks for joy_read */
+#define JOY_UP_MASK     0x01
+#define JOY_DOWN_MASK   0x02
+#define JOY_LEFT_MASK   0x04
+#define JOY_RIGHT_MASK  0x08
+#define JOY_BTN_1_MASK  0x10
+
+/* Character codes */
+#define CH_ULCORNER     0x0B         /* '+' sign */
+#define CH_URCORNER     0x0B
+#define CH_LLCORNER     0x0B
+#define CH_LRCORNER     0x0B
+#define CH_HLINE        0x0D         /* dash */
+#define CH_VLINE        0x01         /* exclamation mark */
 
 /* get_tv return values */
 #define AT_NTSC     0
@@ -103,5 +77,17 @@ extern void atr5200std_joy[];        /* referred to by joy_static_stddrv[] */
 #include <_antic.h>
 #define ANTIC (*(struct __antic*)0xD400)
 
+/* conio color defines */
+#define COLOR_WHITE 0x00
+#define COLOR_RED   0x01
+#define COLOR_GREEN 0x02
+#define COLOR_BLACK 0x03
+
+/* The following #define will cause the matching function calls in conio.h
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
+#define _bordercolor(color) 0
+
 /* End of atari5200.h */
-#endif /* #ifndef _ATARI5200_H */
+#endif