mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Add two OEM BIOSes to 2 Intel machines + two misc changes (#6310)

Browse Source 
* Added Bravo MS-T BIOS for Intel Monaco

-Move Atlantis machine above Thor machine
-Correct the name for Zeos Pantera Wildcat

* Added Gateway 2000 latest BIOS of Intel Zappa

* Fixed a compile-breaking mistake
This commit is contained in:
Maxwell Scott
2025-10-11 03:56:20 +07:00
committed by GitHub
parent fadc8c37b8
commit c0159caee7
4 changed files with 179 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/86box/machine.h
View File

@@ -918,6 +918,9 @@ extern int machine_at_apollo_init(const machine_t *);
extern int machine_at_optiplexgxl_init(const machine_t *);
extern int machine_at_pt2000_init(const machine_t *);
extern int machine_at_pc330_65x6_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t zappa_device;
#endif
extern int machine_at_zappa_init(const machine_t *);
extern int machine_at_powermatev_init(const machine_t *);
extern int machine_at_hawk_init(const machine_t *);
@@ -965,6 +968,9 @@ extern int machine_at_monaco_init(const machine_t *);
extern uint32_t machine_at_endeavor_gpio_handler(uint8_t write, uint32_t val);
extern int machine_at_endeavor_init(const machine_t *);
extern int machine_at_atlantis_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t monaco_device;
#endif
extern int machine_at_monaco_init(const machine_t *);
extern int machine_at_ms5119_init(const machine_t *);
extern int machine_at_pb640_init(const machine_t *);

68
src/machine/m_at_socket5.c
View File

@@ -599,18 +599,74 @@ machine_at_pt2000_init(const machine_t *model)
return ret;
}
static const device_config_t zappa_config[] = {
// clang-format off
{
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "zappa",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = {
{
.name = "Intel AMIBIOS - Revision 1.00.06.BS0",
.internal_name = "zappa",
.bios_type = BIOS_NORMAL,
.files_no = 2,
.local = 0,
.size = 131072,
.files = { "roms/machines/zappa/1006bs0_.bio", "roms/machines/zappa/1006bs0_.bi1", "" }
},
{
.name = "Intel AMIBIOS - Revision 1.00.11.BS0T (Gateway 2000)",
.internal_name = "zappa_gw2k",
.bios_type = BIOS_NORMAL,
.files_no = 2,
.local = 0,
.size = 131072,
.files = { "roms/machines/zappa/1011BS0T.BIO", "roms/machines/zappa/1011BS0T.BI1", "" }
},
{ .files_no = 0 }
}
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
const device_t zappa_device = {
.name = "Intel Advanced/ZP (Zappa)",
.internal_name = "zappa_device",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = zappa_config
};
int
machine_at_zappa_init(const machine_t *model)
{
int ret;
int ret = 0;
const char *fn;
const char *fn2;
ret = bios_load_linear_combined("roms/machines/zappa/1006bs0_.bio",
"roms/machines/zappa/1006bs0_.bi1",
0x20000, 128);
if (bios_only || !ret)
/* No ROMs available */
if (!device_available(model->device))
return ret;
device_context(model->device);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
ret = bios_load_linear_combined(fn, fn2, 0x20000, 128);
device_context_restore();
machine_at_common_init_ex(model, 2);
machine_at_zappa_gpio_init();

68
src/machine/m_at_socket7_3v.c
View File

@@ -576,18 +576,74 @@ machine_at_atlantis_init(const machine_t *model)
return ret;
}
static const device_config_t monaco_config[] = {
// clang-format off
{
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "monaco",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = {
{
.name = "Intel AMIBIOS - Revision 1.00.07.BU0",
.internal_name = "monaco",
.bios_type = BIOS_NORMAL,
.files_no = 2,
.local = 0,
.size = 131072,
.files = { "roms/machines/monaco/1007BU0_.BIO", "roms/machines/monaco/1007BU0_.BI1", "" }
},
{
.name = "Intel AMIBIOS - Revision 1.00.12.BU0Q (AST Bravo MS-T)",
.internal_name = "bravomst",
.bios_type = BIOS_NORMAL,
.files_no = 2,
.local = 0,
.size = 131072,
.files = { "roms/machines/monaco/1012BU0Q.BIO", "roms/machines/monaco/1012BU0Q.BI1", "" }
},
{ .files_no = 0 }
}
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
const device_t monaco_device = {
.name = "Intel Advanced/MA (Monaco)",
.internal_name = "monaco_device",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = monaco_config
};
int
machine_at_monaco_init(const machine_t *model)
{
int ret;
int ret = 0;
const char *fn;
const char *fn2;
ret = bios_load_linear_combined("roms/machines/monaco/1007BU0_.BIO",
"roms/machines/monaco/1007BU0_.BI1",
0x20000, 128);
if (bios_only || !ret)
/* No ROMs available */
if (!device_available(model->device))
return ret;
device_context(model->device);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
ret = bios_load_linear_combined(fn, fn2, 0x20000, 128);
device_context_restore();
machine_at_common_init_ex(model, 2);
machine_at_monaco_gpio_init();

98
src/machine/machine_table.c
View File

@@ -12512,7 +12512,7 @@ const machine_t machines[] = {
.kbc_p1 = 0x000044f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.device = &zappa_device,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
@@ -13375,6 +13375,52 @@ const machine_t machines[] = {
.snd_device = NULL,
.net_device = NULL
},
/* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
PC87306 Super I/O chip, command 0xA1 returns '5'.
Command 0xA0 copyright string: (C)1994 AMI . */
{
.name = "[i430FX] Intel Advanced/AS (Atlantis)",
.internal_name = "atlantis",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_atlantis_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_SOCKET5_7,
.block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
.min_bus = 50000000,
.max_bus = 66666667,
.min_voltage = 3380,
.max_voltage = 3520,
.min_multi = 1.5,
.max_multi = 3.0
},
.bus_flags = MACHINE_PS2_PCI,
.flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM, /* Machine has onboard sound: Crystal CS4232-KQ */
.ram = {
.min = 8192,
.max = 131072,
.step = 8192
},
.nvrmask = 255,
.jumpered_ecp_dma = MACHINE_DMA_3,
.default_jumpered_ecp_dma = 3,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0x000044f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &mach64ct_device_onboard,
.snd_device = NULL,
.net_device = NULL
},
/* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
PC87306 Super I/O chip, command 0xA1 returns '5'.
Command 0xA0 copyright string: (C)1994 AMI . */
@@ -13467,52 +13513,6 @@ const machine_t machines[] = {
.snd_device = &sb_vibra16s_onboard_device,
.net_device = NULL
},
/* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
PC87306 Super I/O chip, command 0xA1 returns '5'.
Command 0xA0 copyright string: (C)1994 AMI . */
{
.name = "[i430FX] Intel Advanced/AS (Atlantis)",
.internal_name = "atlantis",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_atlantis_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_SOCKET5_7,
.block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
.min_bus = 50000000,
.max_bus = 66666667,
.min_voltage = 3380,
.max_voltage = 3520,
.min_multi = 1.5,
.max_multi = 3.0
},
.bus_flags = MACHINE_PS2_PCI,
.flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM, /* Machine has onboard sound: Crystal CS4232-KQ */
.ram = {
.min = 8192,
.max = 131072,
.step = 8192
},
.nvrmask = 255,
.jumpered_ecp_dma = MACHINE_DMA_3,
.default_jumpered_ecp_dma = 3,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0x000044f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &mach64ct_device_onboard,
.snd_device = NULL,
.net_device = NULL
},
/* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
PC87306 Super I/O chip, command 0xA1 returns '5'.
Command 0xA0 copyright string: (C)1994 AMI . */
@@ -13551,7 +13551,7 @@ const machine_t machines[] = {
.kbc_p1 = 0x000044f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.device = &monaco_device,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
@@ -14192,7 +14192,7 @@ const machine_t machines[] = {
/* KBC firmware is unknown. No PS/2 port is present and no commands outside */
/* of the base AT KBC command set are used. */
{
.name = "[VLSI Wildcat] Zeos Pantera Wildcat",
.name = "[VLSI Wildcat] ZEOS Boa 2 (Pantera/Wildcat)",
.internal_name = "zeoswildcat",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_VLSI_WILDCAT,