chris/open-roms
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configuration cleanup

Browse Source
This commit is contained in:
FeralChild64 committed 2019-10-18 21:33:11 +02:00
1 parent abc669d761
commit d6f4f80e89
7 files changed
+38 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c64/,,config_generic.s
+5 -5
View File
@@ -10,13 +10,13 @@
// - do not enable features which are a significant compatibility risk
// Hardware platform and variant
// Hardware platform and brand
#define CONFIG_PLATFORM_COMMODORE_64
#define CONFIG_VARIANT_GENERIC
// #define CONFIG_VARIANT_MEGA_65
// #define CONFIG_VARIANT_ULTIMATE_64
#define CONFIG_BRAND_GENERIC
// #define CONFIG_BRAND_MEGA_65
// #define CONFIG_BRAND_ULTIMATE_64
// Processor instruction set
@@ -62,7 +62,7 @@
// #define CONFIG_BANNER_SIMPLE
#define CONFIG_BANNER_FANCY
// #define CONFIG_BANNER_VARIANT
// #define CONFIG_BANNER_BRAND
#define CONFIG_SHOW_PAL_NTSC
c64/,,config_mega65.s
+4 -4
View File
@@ -12,13 +12,13 @@
// do not enable CPU-specific optimizations; ROMs would be hard to test
// Hardware platform and variant
// Hardware platform and brand
#define CONFIG_PLATFORM_COMMODORE_64
// #define CONFIG_VARIANT_GENERIC
#define CONFIG_VARIANT_MEGA_65
// #define CONFIG_VARIANT_ULTIMATE_64
// #define CONFIG_BRAND_GENERIC
#define CONFIG_BRAND_MEGA_65
// #define CONFIG_BRAND_ULTIMATE_64
// Processor instruction set
c64/,,config_ultimate64.s
+4 -4
View File
@@ -10,13 +10,13 @@
// - do not enable features which are a significant compatibility risk
// Hardware platform and variant
// Hardware platform and brand
#define CONFIG_PLATFORM_COMMODORE_64
// #define CONFIG_VARIANT_GENERIC
// #define CONFIG_VARIANT_MEGA_65
#define CONFIG_VARIANT_ULTIMATE_64
// #define CONFIG_BRAND_GENERIC
// #define CONFIG_BRAND_MEGA_65
#define CONFIG_BRAND_ULTIMATE_64
// Processor instruction set
c64/aliases/,aliases_config.s
+14 -14
View File
@@ -19,28 +19,28 @@
// Check that platform variant configuration is correct
// Check that platform and brand configuration is correct
{
.var selected = 0;
#if CONFIG_VARIANT_GENERIC
#if CONFIG_BRAND_GENERIC
.eval selected++
#endif
#if CONFIG_VARIANT_MEGA_65
#if CONFIG_BRAND_MEGA_65
.eval selected++
#endif
#if CONFIG_VARIANT_ULTIMATE_64
#if CONFIG_BRAND_ULTIMATE_64
.eval selected++
#endif
.if (selected != 1) .error "Please select exactly one CONFIG_VARIANT_* option"
.if (selected != 1) .error "Please select exactly one CONFIG_BRAND_* option"
#if !CONFIG_PLATFORM_COMMODORE_64 && CONFIG_VARIANT_MEGA_65 &&
.error "CONFIG_VARIANT_MEGA_65 can only be used with CONFIG_PLATFORM_COMMODORE_64"
#if !CONFIG_PLATFORM_COMMODORE_64 && CONFIG_BRAND_MEGA_65 &&
.error "CONFIG_BRAND_MEGA_65 can only be used with CONFIG_PLATFORM_COMMODORE_64"
#endif
#if !CONFIG_PLATFORM_COMMODORE_64 && CONFIG_VARIANT_ULTIMATE_64 &&
.error "CONFIG_VARIANT_ULTIMATE_64 can only be used with CONFIG_PLATFORM_COMMODORE_64"
#if !CONFIG_PLATFORM_COMMODORE_64 && CONFIG_BRAND_ULTIMATE_64 &&
.error "CONFIG_BRAND_ULTIMATE_64 can only be used with CONFIG_PLATFORM_COMMODORE_64"
#endif
}
@@ -97,18 +97,18 @@
#if CONFIG_BANNER_FANCY
.eval selected++
#endif
#if CONFIG_BANNER_VARIANT
#if CONFIG_BANNER_BRAND
.eval selected++
#endif
.if (selected != 1) .error "Please select exactly one CONFIG_MEMORY_MODEL_* option"
#if CONFIG_BANNER_VARIANT && !CONFIG_VARIANT_MEGA_65
.error "CONFIG_BANNER_VARIANT is not supported for your CONFIG_VARIANT_*"
#if CONFIG_BANNER_BRAND && !CONFIG_BRAND_MEGA_65
.error "CONFIG_BANNER_BRAND is not supported for your CONFIG_BRAND_*"
#endif
#if CONFIG_BANNER_VARIANT && CONFIG_VARIANT_MEGA_65 && CONFIG_SHOW_PAL_NTSC
.error "MEGA65 variant banner does not support showing PAL/NTSC"
#if CONFIG_BANNER_BRAND && CONFIG_BRAND_MEGA_65 && CONFIG_SHOW_PAL_NTSC
.error "MEGA65 brand banner does not support showing PAL/NTSC"
#endif
}
c64/basic/init/initmsg_real.s
+1 -1
View File
@@ -72,7 +72,7 @@ initmsg_real:
ldy #$00
jmp plot_set
#elif CONFIG_BANNER_VARIANT && CONFIG_VARIANT_MEGA_65
#elif CONFIG_BANNER_BRAND && CONFIG_BRAND_MEGA_65
lda #<startup_banner
ldy #>startup_banner
c64/basic/init/startup_banner.s
+4 -4
View File
@@ -6,11 +6,11 @@
.macro BANNER_TEXT() {
#if CONFIG_VARIANT_GENERIC
#if CONFIG_BRAND_GENERIC
.text "OPEN ROMS GENERIC BUILD"
#elif CONFIG_VARIANT_MEGA_65
#elif CONFIG_BRAND_MEGA_65
.text "OPEN ROMS FOR MEGA65"
#elif CONFIG_VARIANT_ULTIMATE_64
#elif CONFIG_BRAND_ULTIMATE_64
.text "OPEN ROMS FOR ULTIMATE 64"
#endif
@@ -42,7 +42,7 @@ pre_revision_string:
.text "RELEASE "
.byte $00
#elif CONFIG_BANNER_VARIANT && CONFIG_VARIANT_MEGA_65
#elif CONFIG_BANNER_BRAND && CONFIG_BRAND_MEGA_65
// Fancy Mega65 banner - from Retrofan
.byte $9a, $12, $20, $20, $7f, $a9, $20, $20, $1f, $20, $9a, $20, $20, $20