From f4fadfe22ef162a010115d896fcc2952e00a52c2 Mon Sep 17 00:00:00 2001 From: cartifanwlr Date: Sat, 27 Jan 2024 18:34:04 +0300 Subject: [PATCH] Move MSI MS-4144 into dev branch --- CMakeLists.txt | 1 + src/include/86box/machine.h | 2 ++ src/machine/CMakeLists.txt | 4 ++++ src/machine/m_at_386dx_486.c | 4 ++-- src/machine/machine_table.c | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6b50baf3..06a6be389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,6 +159,7 @@ cmake_dependent_option(PAS16 "Pro Audio Spectrum 16" cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF) cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF) cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF) +cmake_dependent_option(MS4144 "MSI MS-4144" ON "DEV_BRANCH" OFF) # Ditto but for Qt if(QT) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 5dd95b673..f55644b87 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -536,7 +536,9 @@ extern int machine_at_greenb_init(const machine_t *); extern int machine_at_r418_init(const machine_t *); extern int machine_at_ls486e_init(const machine_t *); extern int machine_at_4dps_init(const machine_t *); +#if defined(DEV_BRANCH) && defined(USE_MS4144) extern int machine_at_ms4144_init(const machine_t *); +#endif extern int machine_at_4saw2_init(const machine_t *); extern int machine_at_m4li_init(const machine_t *); extern int machine_at_alfredo_init(const machine_t *); diff --git a/src/machine/CMakeLists.txt b/src/machine/CMakeLists.txt index e88631044..b90f92100 100644 --- a/src/machine/CMakeLists.txt +++ b/src/machine/CMakeLists.txt @@ -40,3 +40,7 @@ endif() if(OPEN_AT) target_compile_definitions(mch PRIVATE USE_OPEN_AT) endif() + +if(MS4144) + target_compile_definitions(mch PRIVATE USE_MS4144) +endif() \ No newline at end of file diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index b8d4c2e48..ebd8728d9 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -1045,7 +1045,7 @@ machine_at_4dps_init(const machine_t *model) return ret; } - +#if defined(DEV_BRANCH) && defined(USE_MS4144) int machine_at_ms4144_init(const machine_t *model) { @@ -1072,7 +1072,7 @@ machine_at_ms4144_init(const machine_t *model) return ret; } - +#endif int machine_at_486sp3c_init(const machine_t *model) { diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4e7dfb2c9..bbcfc80cc 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -7783,6 +7783,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, +#if defined(DEV_BRANCH) && defined(USE_MS4144) /* AMIKEY-2 */ { .name = "[SiS 496] MSI MS-4144", @@ -7823,6 +7824,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, +#endif /* This has the UMC 88xx on-chip KBC. */ { .name = "[UMC 8881] A-Trend ATC-1415",