mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-22 09:11:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Move MSI MS-4144 into dev branch

Browse source
This commit is contained in:
cartifanwlr 2024-01-27 18:34:04 +03:00
parent f7c28f7e32
commit f4fadfe22e
5 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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(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(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(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 # Ditto but for Qt
if(QT) if(QT)

2
src/include/86box/machine.h
View file

@ -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_r418_init(const machine_t *);
extern int machine_at_ls486e_init(const machine_t *); extern int machine_at_ls486e_init(const machine_t *);
extern int machine_at_4dps_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 *); extern int machine_at_ms4144_init(const machine_t *);
#endif
extern int machine_at_4saw2_init(const machine_t *); extern int machine_at_4saw2_init(const machine_t *);
extern int machine_at_m4li_init(const machine_t *); extern int machine_at_m4li_init(const machine_t *);
extern int machine_at_alfredo_init(const machine_t *); extern int machine_at_alfredo_init(const machine_t *);

4
src/machine/CMakeLists.txt
View file

@ -40,3 +40,7 @@ endif()
if(OPEN_AT) if(OPEN_AT)
target_compile_definitions(mch PRIVATE USE_OPEN_AT) target_compile_definitions(mch PRIVATE USE_OPEN_AT)
endif() endif()
if(MS4144)
target_compile_definitions(mch PRIVATE USE_MS4144)
endif()

4
src/machine/m_at_386dx_486.c
View file

@ -1045,7 +1045,7 @@ machine_at_4dps_init(const machine_t *model)
return ret; return ret;
} }
#if defined(DEV_BRANCH) && defined(USE_MS4144)
int int
machine_at_ms4144_init(const machine_t *model) machine_at_ms4144_init(const machine_t *model)
{ {
@ -1072,7 +1072,7 @@ machine_at_ms4144_init(const machine_t *model)
return ret; return ret;
} }
#endif
int int
machine_at_486sp3c_init(const machine_t *model) machine_at_486sp3c_init(const machine_t *model)
{ {

2
src/machine/machine_table.c
View file

@ -7783,6 +7783,7 @@ const machine_t machines[] = {
.snd_device = NULL, .snd_device = NULL,
.net_device = NULL .net_device = NULL
}, },
#if defined(DEV_BRANCH) && defined(USE_MS4144)
/* AMIKEY-2 */ /* AMIKEY-2 */
{ {
.name = "[SiS 496] MSI MS-4144", .name = "[SiS 496] MSI MS-4144",
@ -7823,6 +7824,7 @@ const machine_t machines[] = {
.snd_device = NULL, .snd_device = NULL,
.net_device = NULL .net_device = NULL
}, },
#endif
/* This has the UMC 88xx on-chip KBC. */ /* This has the UMC 88xx on-chip KBC. */
{ {
.name = "[UMC 8881] A-Trend ATC-1415", .name = "[UMC 8881] A-Trend ATC-1415",