Merge branch '86Box:master' into master

2025-01-01 15:51:38 -07:00
parent 9b107ebeae 5e10a83540
commit 6ad5a7d836
6 changed files with 254 additions and 104 deletions
--- a/src/machine/m_at_socket4.c
+++ b/src/machine/m_at_socket4.c
@@ -126,7 +126,6 @@ machine_at_p5mp3_init(const machine_t *model)
        return ret;

    machine_at_common_init(model);
-    device_add(&ide_pci_device);

    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);