diff options
author | 2022-06-16 12:47:52 +0200 | |
---|---|---|
committer | 2025-04-29 23:06:41 +0200 | |
commit | 45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch) | |
tree | 4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/acorn | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/acorn')
32 files changed, 42 insertions, 42 deletions
diff --git a/src/devices/bus/acorn/atom/discpack.cpp b/src/devices/bus/acorn/atom/discpack.cpp index 2f2024b86b0..6b5e185d1bf 100644 --- a/src/devices/bus/acorn/atom/discpack.cpp +++ b/src/devices/bus/acorn/atom/discpack.cpp @@ -67,7 +67,7 @@ const tiny_rom_entry *atom_discpack_device::device_rom_region() const // atom_discpack_device - constructor //------------------------------------------------- -atom_discpack_device::atom_discpack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atom_discpack_device::atom_discpack_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ATOM_DISCPACK, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_dos_rom(*this, "dos_rom") diff --git a/src/devices/bus/acorn/atom/discpack.h b/src/devices/bus/acorn/atom/discpack.h index cff8a09005d..b679d1d04f0 100644 --- a/src/devices/bus/acorn/atom/discpack.h +++ b/src/devices/bus/acorn/atom/discpack.h @@ -27,7 +27,7 @@ class atom_discpack_device : { public: // construction/destruction - atom_discpack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atom_discpack_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/acorn/atom/econet.cpp b/src/devices/bus/acorn/atom/econet.cpp index 70c92ff3489..e91ef84c2c0 100644 --- a/src/devices/bus/acorn/atom/econet.cpp +++ b/src/devices/bus/acorn/atom/econet.cpp @@ -29,12 +29,12 @@ void atom_econet_device::device_add_mconfig(machine_config &config) m_adlc->out_txd_cb().set(m_econet, FUNC(econet_device::host_data_w)); m_adlc->out_irq_cb().set(FUNC(atom_econet_device::bus_irq_w)); - ECONET(config, m_econet, 0); + ECONET(config, m_econet); m_econet->clk_wr_callback().set(m_adlc, FUNC(mc6854_device::txc_w)); m_econet->clk_wr_callback().append(m_adlc, FUNC(mc6854_device::rxc_w)); m_econet->data_wr_callback().set(m_adlc, FUNC(mc6854_device::set_rx)); - econet_slot_device &slot(ECONET_SLOT(config, "econet254", 0)); + econet_slot_device &slot(ECONET_SLOT(config, "econet254")); econet_devices(slot); slot.set_slot(254); } @@ -47,7 +47,7 @@ void atom_econet_device::device_add_mconfig(machine_config &config) // atom_econet_device - constructor //------------------------------------------------- -atom_econet_device::atom_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atom_econet_device::atom_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ATOM_ECONET, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_adlc(*this, "mc6854") diff --git a/src/devices/bus/acorn/atom/econet.h b/src/devices/bus/acorn/atom/econet.h index 114dc76bbeb..a9f428c9107 100644 --- a/src/devices/bus/acorn/atom/econet.h +++ b/src/devices/bus/acorn/atom/econet.h @@ -26,7 +26,7 @@ class atom_econet_device : { public: // construction/destruction - atom_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atom_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/atom/sid.cpp b/src/devices/bus/acorn/atom/sid.cpp index 4b0e1f7ff4d..f1fe9e0781d 100644 --- a/src/devices/bus/acorn/atom/sid.cpp +++ b/src/devices/bus/acorn/atom/sid.cpp @@ -39,7 +39,7 @@ void atom_sid_device::device_add_mconfig(machine_config &config) // atom_sid_device - constructor //------------------------------------------------- -atom_sid_device::atom_sid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atom_sid_device::atom_sid_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ATOM_SID, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_sid(*this, "sid6581") diff --git a/src/devices/bus/acorn/atom/sid.h b/src/devices/bus/acorn/atom/sid.h index 8383bbdf9c8..f52841eb9ff 100644 --- a/src/devices/bus/acorn/atom/sid.h +++ b/src/devices/bus/acorn/atom/sid.h @@ -25,7 +25,7 @@ class atom_sid_device : { public: // construction/destruction - atom_sid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atom_sid_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/bus.cpp b/src/devices/bus/acorn/bus.cpp index 55f332e6581..4c0b40bfc13 100644 --- a/src/devices/bus/acorn/bus.cpp +++ b/src/devices/bus/acorn/bus.cpp @@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(ACORN_BUS_SLOT, acorn_bus_slot_device, "acorn_bus_slot", "Aco //------------------------------------------------- // acorn_bus_slot_device - constructor //------------------------------------------------- -acorn_bus_slot_device::acorn_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_bus_slot_device::acorn_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_BUS_SLOT, tag, owner, clock) , device_single_card_slot_interface<device_acorn_bus_interface>(mconfig, *this) , m_bus(*this, finder_base::DUMMY_TAG) @@ -62,7 +62,7 @@ DEFINE_DEVICE_TYPE(ACORN_BUS, acorn_bus_device, "acorn_bus", "Acorn Bus") // acorn_bus_device - constructor //------------------------------------------------- -acorn_bus_device::acorn_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_bus_device::acorn_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_BUS, tag, owner, clock) , m_space(*this, finder_base::DUMMY_TAG, -1) , m_out_irq_cb(*this) diff --git a/src/devices/bus/acorn/bus.h b/src/devices/bus/acorn/bus.h index bfd9a980304..6422fd5df88 100644 --- a/src/devices/bus/acorn/bus.h +++ b/src/devices/bus/acorn/bus.h @@ -32,7 +32,7 @@ public: // construction/destruction template <typename T, typename U> acorn_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&bus_tag, U &&opts, const char *dflt) - : acorn_bus_slot_device(mconfig, tag, owner, 0) + : acorn_bus_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -40,7 +40,7 @@ public: set_fixed(false); m_bus.set_tag(std::forward<T>(bus_tag)); } - acorn_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: // device-level overrides @@ -60,7 +60,7 @@ class acorn_bus_device : public device_t { public: // construction/destruction - acorn_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); // inline configuration template <typename T> void set_space(T &&tag, int spacenum) { m_space.set_tag(std::forward<T>(tag), spacenum); } diff --git a/src/devices/bus/acorn/cms/4080term.cpp b/src/devices/bus/acorn/cms/4080term.cpp index 97946af1406..a7fa28b6be8 100644 --- a/src/devices/bus/acorn/cms/4080term.cpp +++ b/src/devices/bus/acorn/cms/4080term.cpp @@ -77,7 +77,7 @@ void cms_4080term_device::device_add_mconfig(machine_config &config) GFXDECODE(config, "gfxdecode", "palette", gfx_cms_4080term); PALETTE(config, "palette", palette_device::RGB_3BIT); - EF9345(config, m_ef9345, 0); + EF9345(config, m_ef9345); m_ef9345->set_screen("screen"); m_ef9345->set_palette_tag("palette"); @@ -88,7 +88,7 @@ void cms_4080term_device::device_add_mconfig(machine_config &config) m_via->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe)); m_via->irq_handler().set(FUNC(cms_4080term_device::bus_irq_w)); - MOS6551(config, m_acia, 0); + MOS6551(config, m_acia); m_acia->set_xtal(1.8432_MHz_XTAL); m_acia->txd_handler().set(m_rs232, FUNC(rs232_port_device::write_txd)); m_acia->rts_handler().set(m_rs232, FUNC(rs232_port_device::write_rts)); @@ -123,7 +123,7 @@ const tiny_rom_entry *cms_4080term_device::device_rom_region() const // cms_4080term_device - constructor //------------------------------------------------- -cms_4080term_device::cms_4080term_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cms_4080term_device::cms_4080term_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CMS_4080TERM, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_via(*this, "via") diff --git a/src/devices/bus/acorn/cms/4080term.h b/src/devices/bus/acorn/cms/4080term.h index 14d1beacd43..7d98c67d76c 100644 --- a/src/devices/bus/acorn/cms/4080term.h +++ b/src/devices/bus/acorn/cms/4080term.h @@ -30,7 +30,7 @@ class cms_4080term_device : { public: // construction/destruction - cms_4080term_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cms_4080term_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); TIMER_DEVICE_CALLBACK_MEMBER(update_scanline); diff --git a/src/devices/bus/acorn/cms/fdc.cpp b/src/devices/bus/acorn/cms/fdc.cpp index f918309bb76..40c4637059d 100644 --- a/src/devices/bus/acorn/cms/fdc.cpp +++ b/src/devices/bus/acorn/cms/fdc.cpp @@ -56,7 +56,7 @@ void cms_fdc_device::device_add_mconfig(machine_config &config) // cms_fdc_device - constructor //------------------------------------------------- -cms_fdc_device::cms_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cms_fdc_device::cms_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CMS_FDC, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_fdc(*this, "wd1770") diff --git a/src/devices/bus/acorn/cms/fdc.h b/src/devices/bus/acorn/cms/fdc.h index 99a92c34dc7..4b26fbe261c 100644 --- a/src/devices/bus/acorn/cms/fdc.h +++ b/src/devices/bus/acorn/cms/fdc.h @@ -27,7 +27,7 @@ class cms_fdc_device : { public: // construction/destruction - cms_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cms_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/acorn/cms/hires.cpp b/src/devices/bus/acorn/cms/hires.cpp index de42be218cd..080801881fa 100644 --- a/src/devices/bus/acorn/cms/hires.cpp +++ b/src/devices/bus/acorn/cms/hires.cpp @@ -53,7 +53,7 @@ void cms_hires_device::device_add_mconfig(machine_config &config) // cms_hires_device - constructor //------------------------------------------------- -cms_hires_device::cms_hires_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cms_hires_device::cms_hires_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CMS_HIRES, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_screen(*this, "screen") diff --git a/src/devices/bus/acorn/cms/hires.h b/src/devices/bus/acorn/cms/hires.h index f79d7af383b..d02018e2f9d 100644 --- a/src/devices/bus/acorn/cms/hires.h +++ b/src/devices/bus/acorn/cms/hires.h @@ -26,7 +26,7 @@ class cms_hires_device : { public: // construction/destruction - cms_hires_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cms_hires_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/cms/ieee.cpp b/src/devices/bus/acorn/cms/ieee.cpp index 06d9b47f0dd..b53a265aed5 100644 --- a/src/devices/bus/acorn/cms/ieee.cpp +++ b/src/devices/bus/acorn/cms/ieee.cpp @@ -58,7 +58,7 @@ void cms_ieee_device::device_add_mconfig(machine_config &config) // cms_ieee_device - constructor //------------------------------------------------- -cms_ieee_device::cms_ieee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cms_ieee_device::cms_ieee_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CMS_IEEE, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_ieee(*this, IEEE488_TAG) diff --git a/src/devices/bus/acorn/cms/ieee.h b/src/devices/bus/acorn/cms/ieee.h index 48352d4a100..c77abce6dd1 100644 --- a/src/devices/bus/acorn/cms/ieee.h +++ b/src/devices/bus/acorn/cms/ieee.h @@ -24,7 +24,7 @@ class cms_ieee_device: { public: // construction/destruction - cms_ieee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cms_ieee_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/32k.cpp b/src/devices/bus/acorn/system/32k.cpp index 00eb80050e9..6d6673fb00a 100644 --- a/src/devices/bus/acorn/system/32k.cpp +++ b/src/devices/bus/acorn/system/32k.cpp @@ -60,7 +60,7 @@ ioport_constructor acorn_32k_device::device_input_ports() const // acorn_32k_device - constructor //------------------------------------------------- -acorn_32k_device::acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_32k_device::acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_32K, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_links(*this, "LINKS") diff --git a/src/devices/bus/acorn/system/32k.h b/src/devices/bus/acorn/system/32k.h index f3d3b76be5c..9dc5ba37b51 100644 --- a/src/devices/bus/acorn/system/32k.h +++ b/src/devices/bus/acorn/system/32k.h @@ -26,7 +26,7 @@ class acorn_32k_device : { public: // construction/destruction - acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/8k.cpp b/src/devices/bus/acorn/system/8k.cpp index b2e1c7bb3d2..e48d9f908a6 100644 --- a/src/devices/bus/acorn/system/8k.cpp +++ b/src/devices/bus/acorn/system/8k.cpp @@ -83,7 +83,7 @@ void acorn_8k_device::device_add_mconfig(machine_config &config) // acorn_8k_device - constructor //------------------------------------------------- -acorn_8k_device::acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_8k_device::acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_8K, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_rom(*this, "rom%u", 0) diff --git a/src/devices/bus/acorn/system/8k.h b/src/devices/bus/acorn/system/8k.h index 09f089c1563..6420f6383fe 100644 --- a/src/devices/bus/acorn/system/8k.h +++ b/src/devices/bus/acorn/system/8k.h @@ -29,7 +29,7 @@ class acorn_8k_device : { public: // construction/destruction - acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/cass.cpp b/src/devices/bus/acorn/system/cass.cpp index 6e5b8faf40c..98f239ea930 100644 --- a/src/devices/bus/acorn/system/cass.cpp +++ b/src/devices/bus/acorn/system/cass.cpp @@ -30,7 +30,7 @@ void acorn_cass_device::device_add_mconfig(machine_config &config) SPEAKER(config, "mono").front_center(); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - CASSETTE(config, "cassette", 0); + CASSETTE(config, "cassette"); TIMER(config, "cass_c").configure_periodic(FUNC(acorn_cass_device::cass_c), attotime::from_hz(4800)); TIMER(config, "cass_p").configure_periodic(FUNC(acorn_cass_device::cass_p), attotime::from_hz(40000)); } @@ -44,7 +44,7 @@ void acorn_cass_device::device_add_mconfig(machine_config &config) // acorn_cass_device - constructor //------------------------------------------------- -acorn_cass_device::acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_cass_device::acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_CASS, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_cass(*this, "cassette") diff --git a/src/devices/bus/acorn/system/cass.h b/src/devices/bus/acorn/system/cass.h index 02a323bb994..23e6b79eb8d 100644 --- a/src/devices/bus/acorn/system/cass.h +++ b/src/devices/bus/acorn/system/cass.h @@ -28,7 +28,7 @@ class acorn_cass_device : { public: // construction/destruction - acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/econet.cpp b/src/devices/bus/acorn/system/econet.cpp index f8a0737e456..e24fb7ea53d 100644 --- a/src/devices/bus/acorn/system/econet.cpp +++ b/src/devices/bus/acorn/system/econet.cpp @@ -30,7 +30,7 @@ void acorn_econet_device::device_add_mconfig(machine_config &config) m_adlc->out_txd_cb().set(m_econet, FUNC(econet_device::host_data_w)); m_adlc->out_irq_cb().set(FUNC(acorn_econet_device::bus_irq_w)); - ECONET(config, m_econet, 0); + ECONET(config, m_econet); m_econet->clk_wr_callback().set(m_adlc, FUNC(mc6854_device::txc_w)); m_econet->clk_wr_callback().append(m_adlc, FUNC(mc6854_device::rxc_w)); m_econet->data_wr_callback().set(m_adlc, FUNC(mc6854_device::set_rx)); @@ -46,7 +46,7 @@ void acorn_econet_device::device_add_mconfig(machine_config &config) // acorn_econet_device - constructor //------------------------------------------------- -acorn_econet_device::acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_econet_device::acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_ECONET, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_adlc(*this, "mc6854") diff --git a/src/devices/bus/acorn/system/econet.h b/src/devices/bus/acorn/system/econet.h index b5e470975c9..07d3e15ce8c 100644 --- a/src/devices/bus/acorn/system/econet.h +++ b/src/devices/bus/acorn/system/econet.h @@ -28,7 +28,7 @@ class acorn_econet_device : { public: // construction/destruction - acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/fdc.cpp b/src/devices/bus/acorn/system/fdc.cpp index 397fbb9ac50..a77bd3c933b 100644 --- a/src/devices/bus/acorn/system/fdc.cpp +++ b/src/devices/bus/acorn/system/fdc.cpp @@ -61,7 +61,7 @@ void acorn_fdc_device::device_add_mconfig(machine_config &config) // acorn_fdc_device - constructor //------------------------------------------------- -acorn_fdc_device::acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_fdc_device::acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_FDC, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_fdc(*this, "i8271") diff --git a/src/devices/bus/acorn/system/fdc.h b/src/devices/bus/acorn/system/fdc.h index f943b1f6767..60c68f670e9 100644 --- a/src/devices/bus/acorn/system/fdc.h +++ b/src/devices/bus/acorn/system/fdc.h @@ -29,7 +29,7 @@ class acorn_fdc_device : { public: // construction/destruction - acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/acorn/system/vdu40.cpp b/src/devices/bus/acorn/system/vdu40.cpp index 7bc8629ac35..236848d5294 100644 --- a/src/devices/bus/acorn/system/vdu40.cpp +++ b/src/devices/bus/acorn/system/vdu40.cpp @@ -53,7 +53,7 @@ void acorn_vdu40_device::device_add_mconfig(machine_config &config) // acorn_vdu40_device - constructor //------------------------------------------------- -acorn_vdu40_device::acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vdu40_device::acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VDU40, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_screen(*this, "screen") diff --git a/src/devices/bus/acorn/system/vdu40.h b/src/devices/bus/acorn/system/vdu40.h index ff80a76d1ea..1b961343cb4 100644 --- a/src/devices/bus/acorn/system/vdu40.h +++ b/src/devices/bus/acorn/system/vdu40.h @@ -30,7 +30,7 @@ class acorn_vdu40_device : { public: // construction/destruction - acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/vdu80.cpp b/src/devices/bus/acorn/system/vdu80.cpp index 77bad0bf32c..e3bb1f6fb43 100644 --- a/src/devices/bus/acorn/system/vdu80.cpp +++ b/src/devices/bus/acorn/system/vdu80.cpp @@ -118,7 +118,7 @@ const tiny_rom_entry *acorn_vdu80_device::device_rom_region() const // acorn_vdu80_device - constructor //------------------------------------------------- -acorn_vdu80_device::acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vdu80_device::acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VDU80, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_chargen(*this, "chargen") diff --git a/src/devices/bus/acorn/system/vdu80.h b/src/devices/bus/acorn/system/vdu80.h index 8ebb7e0a327..2f1c33d7d76 100644 --- a/src/devices/bus/acorn/system/vdu80.h +++ b/src/devices/bus/acorn/system/vdu80.h @@ -29,7 +29,7 @@ class acorn_vdu80_device : { public: // construction/destruction - acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp index bf685daac95..4a4be409e40 100644 --- a/src/devices/bus/acorn/system/vib.cpp +++ b/src/devices/bus/acorn/system/vib.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ACORN_VIB, acorn_vib_device, "acorn_vib", "Acorn Versatile In // acorn_vib_device - constructor //------------------------------------------------- -acorn_vib_device::acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vib_device::acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VIB, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_ppi8255(*this, "ppi8255") @@ -149,7 +149,7 @@ void acorn_vib_device::device_add_mconfig(machine_config &config) { INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(FUNC(acorn_vib_device::irq_w)); - MOS6522(config, m_via6522, 1'000'000); // TODO: derive clock from bus (pin 29 = ϕ2) + MOS6522(config, m_via6522, XTAL::u(1'000'000)); // TODO: derive clock from bus (pin 29 = ϕ2) m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write)); m_via6522->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe)); m_via6522->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>)); diff --git a/src/devices/bus/acorn/system/vib.h b/src/devices/bus/acorn/system/vib.h index bd4d886e281..e5d6ad34ccd 100644 --- a/src/devices/bus/acorn/system/vib.h +++ b/src/devices/bus/acorn/system/vib.h @@ -33,7 +33,7 @@ class acorn_vib_device : { public: // construction/destruction - acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |