From aa2167926a49ed73a84ae5fc4eb7f8eb0d35cbe6 Mon Sep 17 00:00:00 2001 From: Christian Groessler Date: Fri, 20 Sep 2013 00:26:49 +0200 Subject: [PATCH] move CHARGEN_RELOC enabling to Makefile.inc --- libsrc/atari/Makefile.inc | 17 +++++++++++++++++ libsrc/atari/romswitch.inc | 6 +----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libsrc/atari/Makefile.inc b/libsrc/atari/Makefile.inc index d12b54058..af5a17e59 100644 --- a/libsrc/atari/Makefile.inc +++ b/libsrc/atari/Makefile.inc @@ -14,3 +14,20 @@ # needs DEFAULT_DEVICE to be defined, otherwise no effect CA65FLAGS += -D NUMDRVS=4 -D LINEBUF=80 -D UCASE_FILENAME=1 -D DEFAULT_DEVICE=1 -D DYNAMIC_DD=1 + +# The following defines are only used by the 'atarixl' target: +# +# CHARGEN_RELOC - If defined, CHBAS and CHBASE are updated when +# enabling or disabling the ROM. +# If the ROM is enabled, $E0 is written to CHBAS +# and CHBASE. +# If the ROM is disabled, the upper byte of +# __CHARGEN_START__ is written to CHBAS and CHBASE. +# USEWSYNC - If defined, the code waits for horizontal retrace +# before switching the ROM and updating CHBAS and +# CHBASE. This define only has effect if CHARGEN_RELOC +# is also defined. + +# Disabled by default, you should enable it if the linker script relocates the +# character generator (like atarixl-largehimem.cfg). +#CA65FLAGS += -D CHARGEN_RELOC -D USEWSYNC diff --git a/libsrc/atari/romswitch.inc b/libsrc/atari/romswitch.inc index e1f3433b6..7169f2b39 100644 --- a/libsrc/atari/romswitch.inc +++ b/libsrc/atari/romswitch.inc @@ -14,16 +14,12 @@ ; __CHARGEN_START__ is written to CHBAS and CHBASE. ; USEWSYNC: If defined, the code waits for horizontal retrace ; before switching the ROM and updating CHBAS and -; CHBASE. This define only has effect if CHAGEN_RELOC +; CHBASE. This define only has effect if CHARGEN_RELOC ; is also defined. .ifdef __ATARIXL__ -USEWSYNC = 1 -CHARGEN_RELOC = 1 - - .ifdef CHARGEN_RELOC .macro set_chbase val -- 2.39.5