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

Fix internal name for HP Holly

Browse Source
This commit is contained in:
RichardG867
2025-12-19 22:45:39 -03:00
parent 008061548b
commit e3a2bca761
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,7 +971,7 @@ extern const device_t p54tp4xe_device;
#endif
extern int machine_at_p54tp4xe_init(const machine_t *);
extern int machine_at_exp8551_init(const machine_t *);
extern int machine_at_hpholly_init(const machine_t *);
extern int machine_at_holly_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t vectra52_device;
#endif

10
src/machine/m_at_socket7_3v.c
View File

@@ -158,7 +158,7 @@ machine_at_exp8551_init(const machine_t *model)
}
static void
machine_at_hpholly_gpio_init(void)
machine_at_holly_gpio_init(void)
{
uint32_t gpio = 0xffffe2ff;
@@ -193,19 +193,19 @@ machine_at_hpholly_gpio_init(void)
}
int
machine_at_hpholly_init(const machine_t *model) /* HP Pavilion Holly, 7070/7090/5100/7100 */
machine_at_holly_init(const machine_t *model) /* HP Pavilion Holly, 7070/7090/5100/7100 */
{
int ret;
ret = bios_load_linear_combined("roms/machines/hpholly/1005CA2L.BIO",
"roms/machines/hpholly/1005CA2L.BI1",
ret = bios_load_linear_combined("roms/machines/holly/1005CA2L.BIO",
"roms/machines/holly/1005CA2L.BI1",
0x20000, 128);
if (bios_only || !ret)
return ret;
machine_at_common_init_ex(model, 2);
machine_at_hpholly_gpio_init();
machine_at_holly_gpio_init();
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);

4
src/machine/machine_table.c
View File

@@ -13427,10 +13427,10 @@ const machine_t machines[] = {
Command 0xA0 copyright string: (C)1994 AMI . */
{
.name = "[i430FX] HP Pavilion 51xx/7070/7090/71xx (Holly)",
.internal_name = "hpholly",
.internal_name = "holly",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_hpholly_init,
.init = machine_at_holly_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,