summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/pc/atpci.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/pc/atpci.cpp')
-rw-r--r--src/mame/pc/atpci.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/pc/atpci.cpp b/src/mame/pc/atpci.cpp
index b879844dd7b..e5712e621ca 100644
--- a/src/mame/pc/atpci.cpp
+++ b/src/mame/pc/atpci.cpp
@@ -109,30 +109,30 @@ void at586_state::at_softlists(machine_config &config)
void at586_state::at586(machine_config &config)
{
- pentium_device &maincpu(PENTIUM(config, m_maincpu, 60000000));
+ pentium_device &maincpu(PENTIUM(config, m_maincpu, XTAL::u(60000000)));
maincpu.set_addrmap(AS_PROGRAM, &at586_state::at586_map);
maincpu.set_addrmap(AS_IO, &at586_state::at586_io);
maincpu.set_irq_acknowledge_callback("pcibus:1:i82371ab:pic8259_master", FUNC(pic8259_device::inta_cb));
RAM(config, RAM_TAG).set_default_size("4M").set_extra_options("1M,2M,8M,16M,32M,64M,128M,256M");
- PCI_BUS(config, "pcibus", 0).set_busnum(0);
+ PCI_BUS(config, "pcibus").set_busnum(0);
PCI_CONNECTOR(config, "pcibus:0", pci_devices, "i82439tx", true).set_option_machine_config("i82439tx", [this](device_t *device) { tx_config(device); });
PCI_CONNECTOR(config, "pcibus:1", pci_devices, "i82371ab", true);
// FIXME: determine ISA bus clock
- ISA16_SLOT(config, "isa1", 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, "svga_et4k", false);
- ISA16_SLOT(config, "isa2", 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa3", 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa4", 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa5", 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa1", "pcibus:1:i82371ab:isabus", pc_isa16_cards, "svga_et4k", false);
+ ISA16_SLOT(config, "isa2", "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa3", "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa4", "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa5", "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false);
at_softlists(config);
}
void at586_state::at586x3(machine_config &config)
{
- pentium_device &maincpu(PENTIUM(config, m_maincpu, 60000000));
+ pentium_device &maincpu(PENTIUM(config, m_maincpu, XTAL::u(60000000)));
maincpu.set_addrmap(AS_PROGRAM, &at586_state::at586_map);
maincpu.set_addrmap(AS_IO, &at586_state::at586_io);
maincpu.smiact().set("pcibus:0:i82439tx", FUNC(i82439tx_device::smi_act_w));
@@ -140,16 +140,16 @@ void at586_state::at586x3(machine_config &config)
RAM(config, RAM_TAG).set_default_size("4M").set_extra_options("1M,2M,8M,16M,32M,64M,128M,256M");
- PCI_BUS(config, "pcibus", 0).set_busnum(0);
+ PCI_BUS(config, "pcibus").set_busnum(0);
PCI_CONNECTOR(config, "pcibus:0", pci_devices, "i82439tx", true).set_option_machine_config("i82439tx", [this](device_t *device) { tx_config(device); });
PCI_CONNECTOR(config, "pcibus:1", pci_devices, "i82371sb", true).set_option_machine_config("i82371sb", [this](device_t *device) { sb_config(device); });
// FIXME: determine ISA bus clock
- ISA16_SLOT(config, "isa1", 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false);
- ISA16_SLOT(config, "isa2", 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa3", 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa4", 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa5", 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa1", "pcibus:1:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false);
+ ISA16_SLOT(config, "isa2", "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa3", "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa4", "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa5", "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false);
at_softlists(config);
}
@@ -159,7 +159,7 @@ INPUT_PORTS_END
void at586_state::at586m55(machine_config &config)
{
- pentium_device &pentium(PENTIUM(config, m_maincpu, 60000000));
+ pentium_device &pentium(PENTIUM(config, m_maincpu, XTAL::u(60000000)));
pentium.set_addrmap(AS_PROGRAM, &at586_state::at586_map);
pentium.set_addrmap(AS_IO, &at586_state::at586_io);
pentium.smiact().set("pcibus:0:i82439tx", FUNC(i82439tx_device::smi_act_w));
@@ -167,16 +167,16 @@ void at586_state::at586m55(machine_config &config)
RAM(config, RAM_TAG).set_default_size("4M").set_extra_options("1M,2M,8M,16M,32M,64M,128M,256M");
- PCI_BUS(config, "pcibus", 0).set_busnum(0);
+ PCI_BUS(config, "pcibus").set_busnum(0);
PCI_CONNECTOR(config, "pcibus:0", pci_devices, "i82439tx", true).set_option_machine_config("i82439tx", [this](device_t *device) { tx_config(device); });
PCI_CONNECTOR(config, "pcibus:7", pci_devices, "i82371sb", true).set_option_machine_config("i82371sb", [this](device_t *device) { sb_config(device); });
- ISA16_SLOT(config, "board4", 0, "pcibus:7:i82371sb:isabus", isa_internal_devices, "fdc37c93x", true).set_option_machine_config("fdc37c93x", [this](device_t *device) { superio_config(device); });
- ISA16_SLOT(config, "isa1", 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false);
- ISA16_SLOT(config, "isa2", 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa3", 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa4", 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
- ISA16_SLOT(config, "isa5", 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "board4", "pcibus:7:i82371sb:isabus", isa_internal_devices, "fdc37c93x", true).set_option_machine_config("fdc37c93x", [this](device_t *device) { superio_config(device); });
+ ISA16_SLOT(config, "isa1", "pcibus:7:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false);
+ ISA16_SLOT(config, "isa2", "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa3", "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa4", "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
+ ISA16_SLOT(config, "isa5", "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false);
at_softlists(config);
}