From e3a2bca7612ebf304ae549a39e772f780c0f7b8d Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 19 Dec 2025 22:45:39 -0300 Subject: [PATCH] Fix internal name for HP Holly --- src/include/86box/machine.h | 2 +- src/machine/m_at_socket7_3v.c | 10 +++++----- src/machine/machine_table.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 789168d6e..6b84d2b57 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -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 diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c index c3672c8e6..a1ea76940 100644 --- a/src/machine/m_at_socket7_3v.c +++ b/src/machine/m_at_socket7_3v.c @@ -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); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index af72dda82..792409e9b 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -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,