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

Naming fixes to the HP Vectra Series 2 [skip ci]

Browse Source
This commit is contained in:
RichardG867
2025-10-25 14:28:27 -03:00
parent e637e83d22
commit aa9101418a
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,9 +971,9 @@ extern const device_t p54tp4xe_device;
extern int machine_at_p54tp4xe_init(const machine_t *);
extern int machine_at_exp8551_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t hpvectravexxx_device;
extern const device_t vectra52_device;
#endif
extern int machine_at_hpvectravexxx_init(const machine_t *);
extern int machine_at_vectra52_init(const machine_t *);
extern int machine_at_vectra500mt_init(const machine_t *);
extern int machine_at_vectra54_init(const machine_t *);
#ifdef EMU_DEVICE_H

46
src/machine/m_at_socket7_3v.c
View File

@@ -158,38 +158,38 @@ machine_at_exp8551_init(const machine_t *model)
}
static void
machine_at_hpvectravexxx_gpio_init(void)
machine_at_vectra52_gpio_init(void)
{
uint32_t gpio = 0x40;
if (cpu_busspeed <= 40000000)
gpio |= 0x30;
else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
if (cpu_busspeed <= 40000000)
gpio |= 0x30;
else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
gpio |= 0x00;
else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
gpio |= 0x20;
else if (cpu_busspeed > 60000000)
else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
gpio |= 0x20;
else if (cpu_busspeed > 60000000)
gpio |= 0x10;
if (cpu_dmulti <= 1.5)
if (cpu_dmulti <= 1.5)
gpio |= 0x82;
else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
gpio |= 0x02;
else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
gpio |= 0x00;
else if (cpu_dmulti > 2.5)
else if (cpu_dmulti > 2.5)
gpio |= 0x80;
machine_set_gpio_default(gpio);
}
static const device_config_t hpvectravexxx_config[] = {
static const device_config_t vectra52_config[] = {
// clang-format off
{
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "gu_07_05",
.default_string = "vectra52_0705",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
@@ -197,21 +197,21 @@ static const device_config_t hpvectravexxx_config[] = {
.bios = {
{
.name = "GU.07.02 (01/25/96)",
.internal_name = "gu_07_02",
.internal_name = "vectra52_0702",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
.size = 131072,
.files = { "roms/machines/hpvectravexxx/d3653.bin", "" }
.files = { "roms/machines/vectra52/d3653.bin", "" }
},
{
.name = "GU.07.05 (08/06/96)",
.internal_name = "gu_07_05",
.internal_name = "vectra52_0705",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
.size = 131072,
.files = { "roms/machines/hpvectravexxx/GU0705US.FUL", "" }
.files = { "roms/machines/vectra52/GU0705US.FUL", "" }
},
{ .files_no = 0 }
}
@@ -220,9 +220,9 @@ static const device_config_t hpvectravexxx_config[] = {
// clang-format on
};
const device_t hpvectravexxx_device = {
.name = "HP Vectra VE 5/XXX Series 2",
.internal_name = "hpvectravexxx_device",
const device_t vectra52_device = {
.name = "HP Vectra VE 5/xxx Series 2",
.internal_name = "vectra52",
.flags = 0,
.local = 0,
.init = NULL,
@@ -231,11 +231,11 @@ const device_t hpvectravexxx_device = {
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = hpvectravexxx_config
.config = vectra52_config
};
int
machine_at_hpvectravexxx_init(const machine_t *model)
machine_at_vectra52_init(const machine_t *model)
{
int ret = 0;
const char *fn;
@@ -250,7 +250,7 @@ machine_at_hpvectravexxx_init(const machine_t *model)
device_context_restore();
machine_at_common_init_ex(model, 2);
machine_at_hpvectravexxx_gpio_init();
machine_at_vectra52_gpio_init();
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);

6
src/machine/machine_table.c
View File

@@ -13378,10 +13378,10 @@ const machine_t machines[] = {
},
{
.name = "[i430FX] HP Vectra VE 5/xxx Series 2",
.internal_name = "hpvectravexxx",
.internal_name = "vectra52",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_hpvectravexxx_init,
.init = machine_at_vectra52_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
@@ -13411,7 +13411,7 @@ const machine_t machines[] = {
.kbc_p1 = 0x00000cf0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &hpvectravexxx_device,
.device = &vectra52_device,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,