From 9e5ead428cc4eead39c89bd0765fa30de9a331be Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Tue, 19 Mar 2024 17:31:46 -0300 Subject: [PATCH 1/2] De-underscore the Aptiva 510 --- src/include/86box/machine.h | 2 +- src/machine/m_at_386dx_486.c | 4 ++-- src/machine/machine_table.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 18abf9ea9..ee18a89b1 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -521,7 +521,7 @@ extern int machine_at_403tg_d_init(const machine_t *); extern int machine_at_403tg_d_mr_init(const machine_t *); extern int machine_at_pb450_init(const machine_t *); extern int machine_at_pb450_init(const machine_t *); -extern int machine_at_aptiva_510_init(const machine_t *); +extern int machine_at_aptiva510_init(const machine_t *); extern int machine_at_pc330_6573_init(const machine_t *); extern int machine_at_mvi486_init(const machine_t *); diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index 4cfa7447e..0c687bf20 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -722,11 +722,11 @@ machine_at_pc330_6573_common_init(const machine_t *model) } int -machine_at_aptiva_510_init(const machine_t *model) +machine_at_aptiva510_init(const machine_t *model) { int ret; - ret = bios_load_linear("roms/machines/aptiva_510/$IMAGES.USF", + ret = bios_load_linear("roms/machines/aptiva510/$IMAGES.USF", 0x000e0000, 131072, 0); if (bios_only || !ret) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 04cc59043..6683f41f0 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -7187,10 +7187,10 @@ const machine_t machines[] = { /* Has IBM PS/2 Type 1 KBC firmware. */ { .name = "[OPTi 802G] IBM Aptiva 510/710/Vision", - .internal_name = "aptiva_510", + .internal_name = "aptiva510", .type = MACHINE_TYPE_486_S3, .chipset = MACHINE_CHIPSET_OPTI_895_802G, - .init = machine_at_aptiva_510_init, + .init = machine_at_aptiva510_init, .p1_handler = NULL, .gpio_handler = NULL, .available_flag = MACHINE_AVAILABLE, From 0660f08a40732c34ef299cc8f48d25a348417553 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 20 Mar 2024 22:21:31 +0100 Subject: [PATCH 2/2] PB450 fixes. --- src/machine/m_at_386dx_486.c | 25 +++++++++++++------------ src/machine/machine_table.c | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index 4cfa7447e..9e527e8c3 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -671,25 +671,26 @@ machine_at_pb450_init(const machine_t *model) if (bios_only || !ret) return ret; - machine_at_common_init(model); + machine_at_common_init_ex(model, 2); + device_add(&ide_vlb_2ch_device); pci_init(PCI_CONFIG_TYPE_1); pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); - pci_register_slot(0x11, PCI_CARD_NORMAL, 5, 4, 3, 2); - pci_register_slot(0x12, PCI_CARD_NORMAL, 9, 8, 7, 6); - - device_add(&opti895_device); - device_add(&opti822_device); - device_add(&keyboard_ps2_intel_ami_pci_device); - device_add(&fdc37c661_ide_device); - device_add(&ide_opti611_vlb_sec_device); - device_add(&ide_vlb_2ch_device); - device_add(&intel_flash_bxt_device); - device_add(&phoenix_486_jumper_pci_device); + pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x12, PCI_CARD_NORMAL, 5, 6, 7, 8); if (gfxcard[0] == VID_INTERNAL) device_add(&gd5428_vlb_onboard_device); + device_add(&opti602_device); + device_add(&opti895_device); + device_add(&opti822_device); + device_add(&keyboard_ps2_ami_device); + device_add(&fdc37c661_ide_device); + device_add(&ide_opti611_vlb_sec_device); + device_add(&intel_flash_bxt_device); + device_add(&phoenix_486_jumper_pci_device); + return ret; } diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 04cc59043..9a7161c7f 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -6438,7 +6438,7 @@ const machine_t machines[] = { .max = 65536, .step = 1024 }, - .nvrmask = 127, + .nvrmask = 255, .kbc_device = NULL, .kbc_p1 = 0xff, .gpio = 0xffffffff,