From 8c975dfb36c43a25443879f218ff102f0e86e354 Mon Sep 17 00:00:00 2001 From: Karri Kaksonen Date: Tue, 1 Mar 2022 07:03:29 +0200 Subject: [PATCH] Remove garbage --- include/atari7800.h | 50 +++++---------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/include/atari7800.h b/include/atari7800.h index 378f8786a..4fdaacfcc 100644 --- a/include/atari7800.h +++ b/include/atari7800.h @@ -25,10 +25,14 @@ /* Color defines */ #define COLOR_BLACK 0x00 -#define COLOR_WHITE 0x0F +#define COLOR_GREY 0x01 +#define COLOR_LIGHTGREY 0x02 +#define COLOR_WHITE 0x03 /* TGI color defines (default palette) */ #define TGI_COLOR_BLACK COLOR_BLACK +#define TGI_COLOR_GREY COLOR_GREY +#define TGI_COLOR_LIGHTGREY COLOR_LIGHTGREY #define TGI_COLOR_WHITE COLOR_WHITE /* Masks for joy_read */ @@ -57,49 +61,5 @@ #include <_maria.h> #define MARIA (*(struct __maria*)0x0020) -/* - * Alternative MARIA register definitions. - */ -#define BKGRND MARIA.bkgrnd -#define BACKGRND MARIA.bkgrnd -#define P0C1 MARIA.p0c1 -#define P0C2 MARIA.p0c2 -#define P0C3 MARIA.p0c3 -#define WSYNC MARIA.wsync -#define P1C1 MARIA.p1c1 -#define P1C2 MARIA.p1c2 -#define P1C3 MARIA.p1c3 -#define MSTAT MARIA.mstat -#define P2C1 MARIA.p2c1 -#define P2C2 MARIA.p2c2 -#define P2C3 MARIA.p2c3 -#define DPPH MARIA.dpph -#define DPH MARIA.dpph -#define P3C1 MARIA.p3c1 -#define P3C2 MARIA.p3c2 -#define P3C3 MARIA.p3c3 -#define DPPL MARIA.dppl -#define DPL MARIA.dppl -#define P4C1 MARIA.p4c1 -#define P4C2 MARIA.p4c2 -#define P4C3 MARIA.p4c3 -#define CHBASE MARIA.chbase -#define P5C1 MARIA.p5c1 -#define P5C2 MARIA.p5c2 -#define P5C3 MARIA.p5c3 -#define OFFSET MARIA.offset -#define P6C1 MARIA.p6c1 -#define P6C2 MARIA.p6c2 -#define P6C3 MARIA.p6c3 -#define CTRL MARIA.ctrl -#define P7C1 MARIA.p7c1 -#define P7C2 MARIA.p7c2 -#define P7C3 MARIA.p7c3 - -/* - * MSTAT register constants - */ -#define MSTAT_VBLANK 0x80 /* vblank is on when bit 7 is set */ - /* End of atari7800.h */ #endif