diff options
Diffstat (limited to 'src/devices/bus/wangpc')
-rw-r--r-- | src/devices/bus/wangpc/emb.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/emb.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/lic.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/lic.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/lvc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/lvc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/mcc.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/wangpc/mcc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/mvc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/mvc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/rtc.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/wangpc/rtc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/tig.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/tig.h | 2 | ||||
-rw-r--r-- | src/devices/bus/wangpc/wangpc.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/wangpc/wangpc.h | 6 | ||||
-rw-r--r-- | src/devices/bus/wangpc/wdc.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/wangpc/wdc.h | 2 |
18 files changed, 31 insertions, 31 deletions
diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp index 6a69c1a0fee..4aaba0da0da 100644 --- a/src/devices/bus/wangpc/emb.cpp +++ b/src/devices/bus/wangpc/emb.cpp @@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(WANGPC_EMB, wangpc_emb_device, "wangpc_emb", "Wang PC-PM031-B // wangpc_emb_device - constructor //------------------------------------------------- -wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_EMB, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_ram(*this, "ram", RAM_SIZE, ENDIANNESS_LITTLE), diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h index 1f23fed9f09..10ad045bf06 100644 --- a/src/devices/bus/wangpc/emb.h +++ b/src/devices/bus/wangpc/emb.h @@ -26,7 +26,7 @@ class wangpc_emb_device : public device_t, { public: // construction/destruction - wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp index f56c673fd26..1ae230fa8c2 100644 --- a/src/devices/bus/wangpc/lic.cpp +++ b/src/devices/bus/wangpc/lic.cpp @@ -63,7 +63,7 @@ void wangpc_lic_device::device_add_mconfig(machine_config &config) // wangpc_lic_device - constructor //------------------------------------------------- -wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_LIC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h index 8ead2c65f0a..e798f0c1de5 100644 --- a/src/devices/bus/wangpc/lic.h +++ b/src/devices/bus/wangpc/lic.h @@ -26,7 +26,7 @@ class wangpc_lic_device : public device_t, { public: // construction/destruction - wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index 2eb45e47db0..948e8c074c0 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -160,7 +160,7 @@ inline void wangpc_lvc_device::set_irq(int state) // wangpc_lvc_device - constructor //------------------------------------------------- -wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_LVC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h index 7f0cb5ac816..9947ec7c3e8 100644 --- a/src/devices/bus/wangpc/lvc.h +++ b/src/devices/bus/wangpc/lvc.h @@ -27,7 +27,7 @@ class wangpc_lvc_device : public device_t, { public: // construction/destruction - wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index 7eb56eb479e..aaf89f9be24 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -57,8 +57,8 @@ DEFINE_DEVICE_TYPE(WANGPC_MCC, wangpc_mcc_device, "wangpc_mcc", "Wang PC-PM043 M void wangpc_mcc_device::device_add_mconfig(machine_config &config) { - Z80SIO(config, m_sio, 4000000); // SIO/2? - Z80DART(config, m_dart, 4000000); + Z80SIO(config, m_sio, XTAL::u(4000000)); // SIO/2? + Z80DART(config, m_dart, XTAL::u(4000000)); } @@ -93,7 +93,7 @@ inline void wangpc_mcc_device::set_irq(int state) // wangpc_mcc_device - constructor //------------------------------------------------- -wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_MCC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_sio(*this, Z80SIO2_TAG), diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h index 9aa0d4adee1..02ec34cf05b 100644 --- a/src/devices/bus/wangpc/mcc.h +++ b/src/devices/bus/wangpc/mcc.h @@ -27,7 +27,7 @@ class wangpc_mcc_device : public device_t, { public: // construction/destruction - wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index 12aae997900..8d88773b9ac 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -182,7 +182,7 @@ inline void wangpc_mvc_device::set_irq(int state) // wangpc_mvc_device - constructor //------------------------------------------------- -wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_MVC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_crtc(*this, MC6845_TAG), diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index 9911952f6ac..49c3f483367 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -27,7 +27,7 @@ class wangpc_mvc_device : public device_t, { public: // construction/destruction - wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index 8cd5e055ac6..1449fbd38c3 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -107,20 +107,20 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] = void wangpc_rtc_device::device_add_mconfig(machine_config &config) { - Z80(config, m_maincpu, 2000000); + Z80(config, m_maincpu, XTAL::u(2000000)); m_maincpu->set_daisy_config(wangpc_rtc_daisy_chain); m_maincpu->set_addrmap(AS_PROGRAM, &wangpc_rtc_device::wangpc_rtc_mem); m_maincpu->set_addrmap(AS_IO, &wangpc_rtc_device::wangpc_rtc_io); - AM9517A(config, m_dmac, 2000000); + AM9517A(config, m_dmac, XTAL::u(2000000)); - Z80CTC(config, m_ctc0, 2000000); + Z80CTC(config, m_ctc0, XTAL::u(2000000)); m_ctc0->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - Z80CTC(config, m_ctc1, 2000000); + Z80CTC(config, m_ctc1, XTAL::u(2000000)); m_ctc1->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - Z80SIO(config, m_sio, 2000000); // SIO/0? + Z80SIO(config, m_sio, XTAL::u(2000000)); // SIO/0? m_sio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); } @@ -178,7 +178,7 @@ ioport_constructor wangpc_rtc_device::device_input_ports() const // wangpc_rtc_device - constructor //------------------------------------------------- -wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_RTC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index 4366536ccdf..b0cfd3953ee 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -30,7 +30,7 @@ class wangpc_rtc_device : public device_t, { public: // construction/destruction - wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index f0c00ed3cc3..45c6f540e20 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -145,7 +145,7 @@ void wangpc_tig_device::device_add_mconfig(machine_config &config) // wangpc_tig_device - constructor //------------------------------------------------- -wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_TIG, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_hgdc0(*this, UPD7720_0_TAG), diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h index 0e95eb42676..80146296d6b 100644 --- a/src/devices/bus/wangpc/tig.h +++ b/src/devices/bus/wangpc/tig.h @@ -28,7 +28,7 @@ class wangpc_tig_device : public device_t, { public: // construction/destruction - wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index 7f209465d2d..efbe327fdb0 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(WANGPC_BUS_SLOT, wangpcbus_slot_device, "wangpcbus_slot", "Wa // wangpcbus_slot_device - constructor //------------------------------------------------- -wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_BUS_SLOT, tag, owner, clock), device_single_card_slot_interface<device_wangpcbus_card_interface>(mconfig, *this), m_bus(*this, finder_base::DUMMY_TAG), @@ -51,7 +51,7 @@ void wangpcbus_slot_device::device_start() // wangpcbus_device - constructor //------------------------------------------------- -wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_BUS, tag, owner, clock), m_write_irq2(*this), m_write_irq3(*this), diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h index 05ca1908f75..db1edd72564 100644 --- a/src/devices/bus/wangpc/wangpc.h +++ b/src/devices/bus/wangpc/wangpc.h @@ -33,7 +33,7 @@ public: // construction/destruction template <typename T, typename U> wangpcbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus, U &&opts, char const *dflt, int sid) - : wangpcbus_slot_device(mconfig, tag, owner, 0) + : wangpcbus_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -42,7 +42,7 @@ public: set_bus(std::forward<T>(bus)); set_bus_slot(sid); } - wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); // inline configuration template <typename T> void set_bus(T &&tag) { m_bus.set_tag(std::forward<T>(tag)); } @@ -69,7 +69,7 @@ class wangpcbus_device : public device_t { public: // construction/destruction - wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~wangpcbus_device() { m_device_list.detach_all(); } auto irq2_wr_callback() { return m_write_irq2.bind(); } diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index ddb6d07163b..10dc18cbca7 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -94,15 +94,15 @@ void wangpc_wdc_device::wangpc_wdc_io(address_map &map) void wangpc_wdc_device::device_add_mconfig(machine_config &config) { - Z80(config, m_maincpu, 2000000); // XTAL(10'000'000) / ? + Z80(config, m_maincpu, XTAL::u(2000000)); // XTAL(10'000'000) / ? //m_maincpu->set_daisy_config(wangpc_wdc_daisy_chain); m_maincpu->set_addrmap(AS_PROGRAM, &wangpc_wdc_device::wangpc_wdc_mem); m_maincpu->set_addrmap(AS_IO, &wangpc_wdc_device::wangpc_wdc_io); - Z80CTC(config, m_ctc, 2000000); + Z80CTC(config, m_ctc, XTAL::u(2000000)); m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - SCSIHD(config, "harddisk0", 0); + SCSIHD(config, "harddisk0"); } @@ -134,7 +134,7 @@ inline void wangpc_wdc_device::set_irq(int state) // wangpc_wdc_device - constructor //------------------------------------------------- -wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WANGPC_WDC, tag, owner, clock), device_wangpcbus_card_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index cb09025e13e..32762fc5b85 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -29,7 +29,7 @@ class wangpc_wdc_device : public device_t, { public: // construction/destruction - wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |