diff options
Diffstat (limited to 'src/devices/bus/lpci')
-rw-r--r-- | src/devices/bus/lpci/cirrus.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/cirrus.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82371ab.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82371ab.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82371sb.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82371sb.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82439tx.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/i82439tx.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/mpc105.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/mpc105.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/northbridge.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/northbridge.h | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/pci.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/lpci/pci.h | 6 | ||||
-rw-r--r-- | src/devices/bus/lpci/southbridge.cpp | 18 | ||||
-rw-r--r-- | src/devices/bus/lpci/southbridge.h | 4 | ||||
-rw-r--r-- | src/devices/bus/lpci/vt82c505.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/lpci/vt82c505.h | 2 |
18 files changed, 30 insertions, 30 deletions
diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp index 659d39677a9..5ed7602e1d2 100644 --- a/src/devices/bus/lpci/cirrus.cpp +++ b/src/devices/bus/lpci/cirrus.cpp @@ -83,7 +83,7 @@ DEFINE_DEVICE_TYPE(PCI_CIRRUS_SVGA, pci_cirrus_svga_device, "pci_cirrus_svga", " // pci_cirrus_svga_device - constructor //------------------------------------------------- -pci_cirrus_svga_device::pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pci_cirrus_svga_device::pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PCI_CIRRUS_SVGA, tag, owner, clock) , pci_device_interface(mconfig, *this) , m_vga(*this, "vga") diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index 9f158a79178..786132c1c7c 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -21,7 +21,7 @@ class pci_cirrus_svga_device : public device_t, public pci_device_interface { public: // construction/destruction - pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_vga(T &&tag) { m_vga.set_tag(std::forward<T>(tag)); } diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp index 6d9a1c72bc3..2ef0dda0839 100644 --- a/src/devices/bus/lpci/i82371ab.cpp +++ b/src/devices/bus/lpci/i82371ab.cpp @@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(I82371AB, i82371ab_device, "i82371ab", "Intel 82371AB") -i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : southbridge_extended_device(mconfig, I82371AB, tag, owner, clock) , pci_device_interface(mconfig, *this) { diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h index 5080c135145..7e570bda6c4 100644 --- a/src/devices/bus/lpci/i82371ab.h +++ b/src/devices/bus/lpci/i82371ab.h @@ -23,7 +23,7 @@ class i82371ab_device : public southbridge_extended_device, { public: // construction/destruction - i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override; diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp index 425fc563364..f38530f8f58 100644 --- a/src/devices/bus/lpci/i82371sb.cpp +++ b/src/devices/bus/lpci/i82371sb.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(I82371SB, i82371sb_device, "i82371sb", "Intel 82371SB") -i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : southbridge_device(mconfig, I82371SB, tag, owner, clock) , pci_device_interface( mconfig, *this ) , m_smi_callback(*this) diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h index 1b70d33857b..2f4a2e66c1b 100644 --- a/src/devices/bus/lpci/i82371sb.h +++ b/src/devices/bus/lpci/i82371sb.h @@ -22,7 +22,7 @@ class i82371sb_device : public southbridge_device, public pci_device_interface { public: // construction/destruction - i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_cpu(T &&tag) { m_cpu.set_tag(std::forward<T>(tag)); } diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index 0966456831a..4dd49dde714 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(I82439TX_LEGACY, i82439tx_device, "i82439tx_legacy", "Intel 82439TX") -i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : northbridge_device(mconfig, I82439TX_LEGACY, tag, owner, clock), pci_device_interface(mconfig, *this), m_region_tag(nullptr), diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h index af5a0dcf757..4c684124040 100644 --- a/src/devices/bus/lpci/i82439tx.h +++ b/src/devices/bus/lpci/i82439tx.h @@ -22,7 +22,7 @@ class i82439tx_device : public northbridge_device, public pci_device_interface { public: // construction/destruction - i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void set_region(const char *tag) { m_region_tag = tag; } diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp index de6eee2dcce..4f69fdb1f6f 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(MPC105, mpc105_device, "mpc105", "Motorola MPC105") // mpc105_device - constructor //------------------------------------------------- -mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MPC105, tag, owner, clock), pci_device_interface( mconfig, *this ), m_bank_base_default(0), diff --git a/src/devices/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h index e469168189d..c4642ad5f10 100644 --- a/src/devices/bus/lpci/mpc105.h +++ b/src/devices/bus/lpci/mpc105.h @@ -26,7 +26,7 @@ class mpc105_device : public device_t, { public: // construction/destruction - mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_cpu(T &&tag) { m_maincpu.set_tag(std::forward<T>(tag)); } void set_bank_base_default(int bank_base_default) { m_bank_base_default = bank_base_default; } diff --git a/src/devices/bus/lpci/northbridge.cpp b/src/devices/bus/lpci/northbridge.cpp index 0384a9637e4..1181929c872 100644 --- a/src/devices/bus/lpci/northbridge.cpp +++ b/src/devices/bus/lpci/northbridge.cpp @@ -13,7 +13,7 @@ // GLOBAL VARIABLES //************************************************************************** -northbridge_device::northbridge_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock) +northbridge_device::northbridge_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock), m_cpu(*this, finder_base::DUMMY_TAG), m_ram(*this, ":" RAM_TAG) diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h index 36282d93a9c..49174e07575 100644 --- a/src/devices/bus/lpci/northbridge.h +++ b/src/devices/bus/lpci/northbridge.h @@ -22,7 +22,7 @@ public: protected: // construction/destruction - northbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + northbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index 34470bfa4f9..56a9da9f2a9 100644 --- a/src/devices/bus/lpci/pci.cpp +++ b/src/devices/bus/lpci/pci.cpp @@ -89,7 +89,7 @@ DEFINE_DEVICE_TYPE(PCI_BUS, pci_bus_device, "pci_bus", "PCI Bus") //------------------------------------------------- // pci_bus_device - constructor //------------------------------------------------- -pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PCI_BUS, tag, owner, clock), m_busnum(0), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr), m_father(*this, finder_base::DUMMY_TAG) @@ -328,7 +328,7 @@ pci_device_interface::~pci_device_interface() DEFINE_DEVICE_TYPE(PCI_CONNECTOR, pci_connector_device, "pci_connector", "PCI device connector abstraction") -pci_connector_device::pci_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +pci_connector_device::pci_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PCI_CONNECTOR, tag, owner, clock), device_single_card_slot_interface<pci_device_interface>(mconfig, *this) { diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h index f962ddd6ff7..b9a647852f5 100644 --- a/src/devices/bus/lpci/pci.h +++ b/src/devices/bus/lpci/pci.h @@ -45,14 +45,14 @@ class pci_connector_device : public device_t, public: template <typename T> pci_connector_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt, bool fixed) - : pci_connector_device(mconfig, tag, owner, (uint32_t)0) + : pci_connector_device(mconfig, tag, owner) { option_reset(); opts(*this); set_default_option(dflt); set_fixed(fixed); } - pci_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + pci_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~pci_connector_device(); pci_device_interface *get_device(); @@ -69,7 +69,7 @@ class pci_bus_device : public device_t { public: // construction/destruction - pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint32_t read(offs_t offset, uint32_t mem_mask = ~0); void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 2f9faa4aab0..33ded5cf5d4 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -27,7 +27,7 @@ void southbridge_device::device_add_mconfig(machine_config &config) { - PIT8254(config, m_pit8254, 0); + PIT8254(config, m_pit8254); m_pit8254->set_clk<0>(4772720/4); // heartbeat IRQ m_pit8254->out_handler<0>().set(FUNC(southbridge_device::at_pit8254_out0_changed)); m_pit8254->set_clk<1>(4772720/4); // DRAM refresh @@ -68,12 +68,12 @@ void southbridge_device::device_add_mconfig(machine_config &config) m_dma8237_2->out_dack_callback<2>().set(FUNC(southbridge_device::pc_dack6_w)); m_dma8237_2->out_dack_callback<3>().set(FUNC(southbridge_device::pc_dack7_w)); - PIC8259(config, m_pic8259_master, 0); + PIC8259(config, m_pic8259_master); m_pic8259_master->out_int_callback().set_inputline(m_maincpu, 0); m_pic8259_master->in_sp_callback().set_constant(1); m_pic8259_master->read_slave_ack_callback().set(FUNC(southbridge_device::get_slave_ack)); - PIC8259(config, m_pic8259_slave, 0); + PIC8259(config, m_pic8259_slave); m_pic8259_slave->out_int_callback().set(m_pic8259_master, FUNC(pic8259_device::ir2_w)); m_pic8259_slave->in_sp_callback().set_constant(0); @@ -89,7 +89,7 @@ void southbridge_device::device_add_mconfig(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); - ISA16(config, m_isabus, 0); + ISA16(config, m_isabus); m_isabus->set_memspace(":maincpu", AS_PROGRAM); m_isabus->set_iospace(":maincpu", AS_IO); m_isabus->irq3_callback().set("pic8259_master", FUNC(pic8259_device::ir3_w)); @@ -113,7 +113,7 @@ void southbridge_device::device_add_mconfig(machine_config &config) m_isabus->iochck_callback().set(FUNC(southbridge_device::iochck_w)); } -southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock), m_maincpu(*this, ":maincpu"), m_pic8259_master(*this, "pic8259_master"), @@ -536,12 +536,12 @@ void southbridge_extended_device::device_add_mconfig(machine_config &config) rtc.set_century_index(0x32); // on board devices - ISA16_SLOT(config, "board1", 0, "isabus", pc_isa_onboard, "fdcsmc", true); // FIXME: determine ISA bus clock - ISA16_SLOT(config, "board2", 0, "isabus", pc_isa_onboard, "comat", true); - ISA16_SLOT(config, "board3", 0, "isabus", pc_isa_onboard, "lpt", true); + ISA16_SLOT(config, "board1", "isabus", pc_isa_onboard, "fdcsmc", true); // FIXME: determine ISA bus clock + ISA16_SLOT(config, "board2", "isabus", pc_isa_onboard, "comat", true); + ISA16_SLOT(config, "board3", "isabus", pc_isa_onboard, "lpt", true); } -southbridge_extended_device::southbridge_extended_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +southbridge_extended_device::southbridge_extended_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : southbridge_device(mconfig, type, tag, owner, clock), m_keybc(*this, "keybc"), m_ds12885(*this, "rtc"), diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 92953a5df0f..d4871ba1651 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -42,7 +42,7 @@ public: protected: // construction/destruction - southbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + southbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; @@ -146,7 +146,7 @@ public: protected: // construction/destruction - southbridge_extended_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + southbridge_extended_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp index a7bad9cc0a2..6de6e9b7cf0 100644 --- a/src/devices/bus/lpci/vt82c505.cpp +++ b/src/devices/bus/lpci/vt82c505.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(VT82C505, vt82c505_device, "vt82c505_device", "VIA VT82C505 PCI bridge") -vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, VT82C505, tag, owner, clock) , pci_device_interface(mconfig, *this) { diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h index bbe790781d2..28138781f92 100644 --- a/src/devices/bus/lpci/vt82c505.h +++ b/src/devices/bus/lpci/vt82c505.h @@ -15,7 +15,7 @@ class vt82c505_device : public device_t, public pci_device_interface { public: // construction/destruction - vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override; |