80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix new machine names

Browse Source
This commit is contained in:
RichardG867
2024-01-25 21:27:39 -03:00
parent e779ea5902
commit c996f69e8c
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -638,7 +638,7 @@ extern int machine_at_8500tuc_init(const machine_t *);
extern int machine_at_p55t2s_init(const machine_t *); extern int machine_at_p55t2s_init(const machine_t *);
extern int machine_at_p5vxb_init(const machine_t *); extern int machine_at_p5vxb_init(const machine_t *);
extern int machine_at_dell_430vx_init(const machine_t *); extern int machine_at_dellhannibalp_init(const machine_t *);
extern int machine_at_gw2kte_init(const machine_t *); extern int machine_at_gw2kte_init(const machine_t *);
extern int machine_at_ap5s_init(const machine_t *); extern int machine_at_ap5s_init(const machine_t *);
@@ -688,7 +688,7 @@ extern int machine_at_ficpa2012_init(const machine_t *);
extern int machine_at_r534f_init(const machine_t *); extern int machine_at_r534f_init(const machine_t *);
extern int machine_at_ms5146_init(const machine_t *); extern int machine_at_ms5146_init(const machine_t *);
extern int machine_at_cb52x_si_init(const machine_t *); extern int machine_at_cb52xsi_init(const machine_t *);
extern int machine_at_m560_init(const machine_t *); extern int machine_at_m560_init(const machine_t *);
extern int machine_at_ms5164_init(const machine_t *); extern int machine_at_ms5164_init(const machine_t *);
@@ -710,7 +710,7 @@ extern int machine_at_p6rp4_init(const machine_t *);
extern int machine_at_686nx_init(const machine_t *); extern int machine_at_686nx_init(const machine_t *);
extern int machine_at_acerv60n_init(const machine_t *); extern int machine_at_acerv60n_init(const machine_t *);
extern int machine_at_lgibm440fx_init(const machine_t *); extern int machine_at_lgibmx61_init(const machine_t *);
extern int machine_at_vs440fx_init(const machine_t *); extern int machine_at_vs440fx_init(const machine_t *);
extern int machine_at_gw2kvenus_init(const machine_t *); extern int machine_at_gw2kvenus_init(const machine_t *);
extern int machine_at_ap440fx_init(const machine_t *); extern int machine_at_ap440fx_init(const machine_t *);
@@ -731,12 +731,12 @@ extern int machine_at_kn97_init(const machine_t *);
extern int machine_at_lx6_init(const machine_t *); extern int machine_at_lx6_init(const machine_t *);
extern int machine_at_spitfire_init(const machine_t *); extern int machine_at_spitfire_init(const machine_t *);
extern int machine_at_mate_nx_ma30d_23d_init(const machine_t *); extern int machine_at_ma30d_init(const machine_t *);
extern int machine_at_p6i440e2_init(const machine_t *); extern int machine_at_p6i440e2_init(const machine_t *);
extern int machine_at_p2bls_init(const machine_t *); extern int machine_at_p2bls_init(const machine_t *);
extern int machine_at_lgibm440bx_init(const machine_t *); extern int machine_at_lgibmx7g_init(const machine_t *);
extern int machine_at_p3bf_init(const machine_t *); extern int machine_at_p3bf_init(const machine_t *);
extern int machine_at_bf6_init(const machine_t *); extern int machine_at_bf6_init(const machine_t *);
extern int machine_at_ax6bc_init(const machine_t *); extern int machine_at_ax6bc_init(const machine_t *);

8
src/machine/m_at_slot1.c
View File

@@ -153,11 +153,11 @@ machine_at_spitfire_init(const machine_t *model)
} }
int int
machine_at_mate_nx_ma30d_23d_init(const machine_t *model) machine_at_ma30d_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/mate_nx_ma30d_23d/BIOS.ROM", ret = bios_load_linear("roms/machines/ma30d/BIOS.ROM",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
@@ -261,11 +261,11 @@ machine_at_p2bls_init(const machine_t *model)
} }
int int
machine_at_lgibm440bx_init(const machine_t *model) machine_at_lgibmx7g_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/lgibm440bx/ms6119.331", ret = bios_load_linear("roms/machines/lgibmx7g/ms6119.331",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)

4
src/machine/m_at_socket7.c
View File

@@ -1211,11 +1211,11 @@ machine_at_ms5146_init(const machine_t *model)
} }
int int
machine_at_cb52x_si_init(const machine_t *model) machine_at_cb52xsi_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/cb52x_si/CD5205S.ROM", ret = bios_load_linear("roms/machines/cb52xsi/CD5205S.ROM",
0x000e0000, 131072, 0); 0x000e0000, 131072, 0);
if (bios_only || !ret) if (bios_only || !ret)

12
src/machine/m_at_socket7_3v.c
View File

@@ -672,15 +672,15 @@ machine_at_p5vxb_init(const machine_t *model)
} }
int int
machine_at_dell_430vx_init(const machine_t *model) machine_at_dellhannibalp_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear_combined2("roms/machines/dell_430vx/1003DY0J.BIO", ret = bios_load_linear_combined2("roms/machines/dellhannibalp/1003DY0J.BIO",
"roms/machines/dell_430vx/1003DY0J.BI1", "roms/machines/dellhannibalp/1003DY0J.BI1",
"roms/machines/dell_430vx/1003DY0J.BI2", "roms/machines/dellhannibalp/1003DY0J.BI2",
"roms/machines/dell_430vx/1003DY0J.BI3", "roms/machines/dellhannibalp/1003DY0J.BI3",
"roms/machines/dell_430vx/1003DY0J.RCV", "roms/machines/dellhannibalp/1003DY0J.RCV",
0x3a000, 128); 0x3a000, 128);
if (bios_only || !ret) if (bios_only || !ret)

4
src/machine/m_at_socket8.c
View File

@@ -195,11 +195,11 @@ machine_at_acerv60n_init(const machine_t *model)
} }
int int
machine_at_lgibm440fx_init(const machine_t *model) machine_at_lgibmx61_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/lgibm440fx/bios.rom", ret = bios_load_linear("roms/machines/lgibmx61/bios.rom",
0x000e0000, 131072, 0); 0x000e0000, 131072, 0);
if (bios_only || !ret) if (bios_only || !ret)

20
src/machine/machine_table.c
View File

@@ -9570,10 +9570,10 @@ const machine_t machines[] = {
Command 0xA0 copyright string: (C)1994 AMI . */ Command 0xA0 copyright string: (C)1994 AMI . */
{ {
.name = "[i430VX] Dell Hannibal+", .name = "[i430VX] Dell Hannibal+",
.internal_name = "dell_430vx", .internal_name = "dellhannibalp",
.type = MACHINE_TYPE_SOCKET7_3V, .type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430VX, .chipset = MACHINE_CHIPSET_INTEL_430VX,
.init = machine_at_dell_430vx_init, .init = machine_at_dellhannibalp_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -11122,10 +11122,10 @@ const machine_t machines[] = {
/* Has the SiS 5571 chipset with on-chip KBC. */ /* Has the SiS 5571 chipset with on-chip KBC. */
{ {
.name = "[SiS 5571] Daewoo CB52X-SI", .name = "[SiS 5571] Daewoo CB52X-SI",
.internal_name = "cb52x_si", .internal_name = "cb52xsi",
.type = MACHINE_TYPE_SOCKET7, .type = MACHINE_TYPE_SOCKET7,
.chipset = MACHINE_CHIPSET_SIS_5571, .chipset = MACHINE_CHIPSET_SIS_5571,
.init = machine_at_cb52x_si_init, .init = machine_at_cb52xsi_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -12024,10 +12024,10 @@ const machine_t machines[] = {
/* Has the AMIKey-2 (updated 'H') KBC firmware. */ /* Has the AMIKey-2 (updated 'H') KBC firmware. */
{ {
.name = "[i440FX] LG IBM Multinet x61 (MSI MS-6106)", .name = "[i440FX] LG IBM Multinet x61 (MSI MS-6106)",
.internal_name = "lgibm440fx", .internal_name = "lgibmx61",
.type = MACHINE_TYPE_SOCKET8, .type = MACHINE_TYPE_SOCKET8,
.chipset = MACHINE_CHIPSET_INTEL_440FX, .chipset = MACHINE_CHIPSET_INTEL_440FX,
.init = machine_at_lgibm440fx_init, .init = machine_at_lgibmx61_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -12357,10 +12357,10 @@ const machine_t machines[] = {
AMIKey-2 KBC firmware. */ AMIKey-2 KBC firmware. */
{ {
.name = "[i440LX] NEC Mate NX MA30D/23D", .name = "[i440LX] NEC Mate NX MA30D/23D",
.internal_name = "mate_nx_ma30d_23d", .internal_name = "ma30d",
.type = MACHINE_TYPE_SLOT1, .type = MACHINE_TYPE_SLOT1,
.chipset = MACHINE_CHIPSET_INTEL_440LX, .chipset = MACHINE_CHIPSET_INTEL_440LX,
.init = machine_at_mate_nx_ma30d_23d_init, .init = machine_at_ma30d_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -12688,10 +12688,10 @@ const machine_t machines[] = {
/* Has the AMIKey-2 (updated 'H') KBC firmware. */ /* Has the AMIKey-2 (updated 'H') KBC firmware. */
{ {
.name = "[i440BX] LG IBM Multinet i x7G (MSI MS-6119)", .name = "[i440BX] LG IBM Multinet i x7G (MSI MS-6119)",
.internal_name = "lgibm440bx", .internal_name = "lgibmx7g",
.type = MACHINE_TYPE_SLOT1, .type = MACHINE_TYPE_SLOT1,
.chipset = MACHINE_CHIPSET_INTEL_440BX, .chipset = MACHINE_CHIPSET_INTEL_440BX,
.init = machine_at_lgibm440bx_init, .init = machine_at_lgibmx7g_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,