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

Alfredo, Batman's Renvenge, and Plato: Pre-initialize NVR to 0x00 instead of 0xFF and give them the correct Phoenix keyboard controller, fixes hang after the first soft reset.

Browse Source
This commit is contained in:
OBattler
2025-04-02 18:45:27 +02:00
parent 420a08ee2c
commit 98efd05dda
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/m_at_386dx_486.c
View File

@@ -1249,6 +1249,8 @@ machine_at_alfredo_init(const machine_t *model)
return ret; return ret;
machine_at_common_init(model); machine_at_common_init(model);
device_add(&amstrad_megapc_nvr_device);
device_add(&ide_pci_device); device_add(&ide_pci_device);
pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING); pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
@@ -1258,7 +1260,7 @@ machine_at_alfredo_init(const machine_t *model)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&keyboard_ps2_pci_device); device_add(&keyboard_ps2_phoenix_device);
device_add(&sio_device); device_add(&sio_device);
device_add(&fdc37c663_device); device_add(&fdc37c663_device);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);

6
src/machine/m_at_socket4.c
View File

@@ -44,7 +44,9 @@
void void
machine_at_premiere_common_init(const machine_t *model, int pci_switch) machine_at_premiere_common_init(const machine_t *model, int pci_switch)
{ {
machine_at_common_init(model); machine_at_common_init_ex(model);
device_add(&amstrad_megapc_nvr_device);
device_add(&ide_pci_device); device_add(&ide_pci_device);
pci_init(PCI_CONFIG_TYPE_2 | pci_switch); pci_init(PCI_CONFIG_TYPE_2 | pci_switch);
@@ -54,7 +56,7 @@ machine_at_premiere_common_init(const machine_t *model, int pci_switch)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&keyboard_ps2_intel_ami_pci_device); device_add(&keyboard_ps2_phoenix_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&fdc37c665_device); device_add(&fdc37c665_device);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);