claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-underscore the Dell OptiPlex machines

Browse Source
This commit is contained in:
RichardG867
2025-05-28 15:36:53 -03:00
parent 81af1f8195
commit 4a3eb80082
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,7 +670,7 @@ extern int machine_at_tek932_init(const machine_t *);
extern int machine_at_acerv30_init(const machine_t *); extern int machine_at_acerv30_init(const machine_t *);
extern int machine_at_apollo_init(const machine_t *); extern int machine_at_apollo_init(const machine_t *);
extern int machine_at_optiplex_gxl_init(const machine_t *); extern int machine_at_optiplexgxl_init(const machine_t *);
extern int machine_at_zappa_init(const machine_t *); extern int machine_at_zappa_init(const machine_t *);
extern int machine_at_powermatev_init(const machine_t *); extern int machine_at_powermatev_init(const machine_t *);
extern int machine_at_hawk_init(const machine_t *); extern int machine_at_hawk_init(const machine_t *);
@@ -750,7 +750,7 @@ extern int machine_at_gw2kte_init(const machine_t *);
extern int machine_at_ma23c_init(const machine_t *); extern int machine_at_ma23c_init(const machine_t *);
extern int machine_at_nupro592_init(const machine_t *); extern int machine_at_nupro592_init(const machine_t *);
extern int machine_at_tx97_init(const machine_t *); extern int machine_at_tx97_init(const machine_t *);
extern int machine_at_optiplex_gn_init(const machine_t *); extern int machine_at_optiplexgn_init(const machine_t *);
extern int machine_at_ym430tx_init(const machine_t *); extern int machine_at_ym430tx_init(const machine_t *);
extern int machine_at_thunderbolt_init(const machine_t *); extern int machine_at_thunderbolt_init(const machine_t *);
extern int machine_at_an430tx_init(const machine_t *); extern int machine_at_an430tx_init(const machine_t *);
@@ -819,7 +819,7 @@ extern int machine_at_p65up5_cpknd_init(const machine_t *);
extern int machine_at_kn97_init(const machine_t *); 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_optiplex_gxa_init(const machine_t *); extern int machine_at_optiplexgxa_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_ma30d_init(const machine_t *); extern int machine_at_ma30d_init(const machine_t *);

4
src/machine/m_at_slot1.c
View File

@@ -151,11 +151,11 @@ machine_at_lx6_init(const machine_t *model)
} }
int int
machine_at_optiplex_gxa_init(const machine_t *model) machine_at_optiplexgxa_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/optiplex_gxa/DELL.ROM", ret = bios_load_linear("roms/machines/optiplexgxa/DELL.ROM",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)

4
src/machine/m_at_socket5.c
View File

@@ -238,11 +238,11 @@ machine_at_apollo_init(const machine_t *model)
} }
int int
machine_at_optiplex_gxl_init(const machine_t *model) machine_at_optiplexgxl_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/optiplex_gxl/DELL.ROM", ret = bios_load_linear("roms/machines/optiplexgxl/DELL.ROM",
0x000e0000, 131072, 0); 0x000e0000, 131072, 0);
if (bios_only || !ret) if (bios_only || !ret)

4
src/machine/m_at_socket7.c
View File

@@ -970,11 +970,11 @@ machine_at_tx97_init(const machine_t *model)
} }
int int
machine_at_optiplex_gn_init(const machine_t *model) machine_at_optiplexgn_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/optiplex_gn/DELL.ROM", ret = bios_load_linear("roms/machines/optiplexgn/DELL.ROM",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)

12
src/machine/machine_table.c
View File

@@ -10549,10 +10549,10 @@ const machine_t machines[] = {
/* Has a National Semiconductor PC87332VLJ Super I/O with AMIKey 'F' KBC firmware. */ /* Has a National Semiconductor PC87332VLJ Super I/O with AMIKey 'F' KBC firmware. */
{ {
.name = "[i430FX] Dell OptiPlex GXL/GXM", .name = "[i430FX] Dell OptiPlex GXL/GXM",
.internal_name = "optiplex_gxl", .internal_name = "optiplexgxl",
.type = MACHINE_TYPE_SOCKET5, .type = MACHINE_TYPE_SOCKET5,
.chipset = MACHINE_CHIPSET_INTEL_430FX, .chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_optiplex_gxl_init, .init = machine_at_optiplexgxl_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -13147,10 +13147,10 @@ const machine_t machines[] = {
*/ */
{ {
.name = "[i430TX] Dell OptiPlex GN+", .name = "[i430TX] Dell OptiPlex GN+",
.internal_name = "optiplex_gn", .internal_name = "optiplexgn",
.type = MACHINE_TYPE_SOCKET7, .type = MACHINE_TYPE_SOCKET7,
.chipset = MACHINE_CHIPSET_INTEL_430TX, .chipset = MACHINE_CHIPSET_INTEL_430TX,
.init = machine_at_optiplex_gn_init, .init = machine_at_optiplexgn_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
@@ -15210,10 +15210,10 @@ const machine_t machines[] = {
firmwares: AMI '5' MegaKey, Phoenix MultiKey/42 1.37, or Phoenix MultiKey/42i 4.16. */ firmwares: AMI '5' MegaKey, Phoenix MultiKey/42 1.37, or Phoenix MultiKey/42i 4.16. */
{ {
.name = "[i440LX] Dell OptiPlex GXa", .name = "[i440LX] Dell OptiPlex GXa",
.internal_name = "optiplex_gxa", .internal_name = "optiplexgxa",
.type = MACHINE_TYPE_SLOT1, .type = MACHINE_TYPE_SLOT1,
.chipset = MACHINE_CHIPSET_INTEL_440LX, .chipset = MACHINE_CHIPSET_INTEL_440LX,
.init = machine_at_optiplex_gxa_init, .init = machine_at_optiplexgxa_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,