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/coco | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/coco')
43 files changed, 104 insertions, 104 deletions
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index fc26e61fb1f..611821a23ad 100644 --- a/src/devices/bus/coco/coco_dcmodem.cpp +++ b/src/devices/bus/coco/coco_dcmodem.cpp @@ -37,7 +37,7 @@ namespace { public: // construction/destruction - coco_dc_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_dc_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_DCMODEM, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_uart(*this, UART_TAG) @@ -92,7 +92,7 @@ namespace void coco_dc_modem_device::device_add_mconfig(machine_config &config) { - MOS6551(config, m_uart, 0); + MOS6551(config, m_uart); m_uart->set_xtal(1.8432_MHz_XTAL); m_uart->irq_handler().set(FUNC(coco_dc_modem_device::uart_irq_w)); m_uart->txd_handler().set(PORT_TAG, FUNC(rs232_port_device::write_txd)); diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp index b72783eed8d..3a1b794fb04 100644 --- a/src/devices/bus/coco/coco_dwsock.cpp +++ b/src/devices/bus/coco/coco_dwsock.cpp @@ -62,7 +62,7 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed) // beckerport_device - constructor / destructor //------------------------------------------------- -beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_DWSOCK, tag, owner, clock) , m_hostname(nullptr), m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0) { diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h index 6cbcc106488..d608d56fb9d 100644 --- a/src/devices/bus/coco/coco_dwsock.h +++ b/src/devices/bus/coco/coco_dwsock.h @@ -24,7 +24,7 @@ class beckerport_device : public device_t { public: - beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~beckerport_device(); // optional information overrides diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 94d83954d59..d02ed33c06f 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -117,7 +117,7 @@ class coco_fdc_device_base : public coco_family_fdc_device_base { protected: // construction/destruction - coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); enum class rtc_type { @@ -202,7 +202,7 @@ void coco_fdc_device_base::device_add_mconfig(machine_config &config) MSM6242(config, m_disto_msm6242, 32.768_kHz_XTAL); - DS1315(config, CLOUD9_TAG, 0); + DS1315(config, CLOUD9_TAG); RAM(config, "cachebuffer").set_default_size("256").set_default_value(0); } @@ -264,7 +264,7 @@ memory_region *coco_family_fdc_device_base::get_cart_memregion() // coco_fdc_device_base - constructor //------------------------------------------------- -coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : coco_family_fdc_device_base(mconfig, type, tag, owner, clock) , m_wd17xx(*this, WD_TAG) , m_ds1315(*this, CLOUD9_TAG) @@ -639,7 +639,7 @@ namespace { public: // construction/destruction - coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, COCO_FDC, tag, owner, clock) { } @@ -676,7 +676,7 @@ namespace { public: // construction/destruction - coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, COCO_FDC_V11, tag, owner, clock) { } @@ -711,7 +711,7 @@ namespace { public: // construction/destruction - coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, COCO3_HDB1, tag, owner, clock) { } @@ -745,7 +745,7 @@ namespace { public: // construction/destruction - coco2_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco2_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, COCO2_HDB1, tag, owner, clock) { } @@ -781,7 +781,7 @@ namespace { public: // construction/destruction - cp450_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + cp450_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, CP450_FDC, tag, owner, clock) { } @@ -815,7 +815,7 @@ namespace { public: // construction/destruction - cd6809_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + cd6809_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_fdc_device_base(mconfig, CD6809_FDC, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index 786d30c2f68..0851238f5cd 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -33,7 +33,7 @@ public: protected: // construction/destruction - coco_family_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) + coco_family_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this) { diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp index 122450ace26..b801224e527 100644 --- a/src/devices/bus/coco/coco_gmc.cpp +++ b/src/devices/bus/coco/coco_gmc.cpp @@ -38,7 +38,7 @@ namespace { public: // construction/destruction - coco_pak_gmc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_pak_gmc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void device_add_mconfig(machine_config &config) override; protected: @@ -68,7 +68,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_GMC, device_cococart_interface, coco_pak_gmc // coco_pak_device - constructor //------------------------------------------------- -coco_pak_gmc_device::coco_pak_gmc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_pak_gmc_device::coco_pak_gmc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_pak_banked_device(mconfig, COCO_PAK_GMC, tag, owner, clock) , m_psg(*this, SN76489AN_TAG) { diff --git a/src/devices/bus/coco/coco_ide.cpp b/src/devices/bus/coco/coco_ide.cpp index 0d261e2be3b..3d3b99780b0 100644 --- a/src/devices/bus/coco/coco_ide.cpp +++ b/src/devices/bus/coco/coco_ide.cpp @@ -47,7 +47,7 @@ ioport_constructor coco_ide_device::device_input_ports() const // coco_ide_device - constructor //------------------------------------------------- -coco_ide_device::coco_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_ide_device::coco_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_IDE, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_ata(*this, "ata") diff --git a/src/devices/bus/coco/coco_ide.h b/src/devices/bus/coco/coco_ide.h index 465a4b0b8f6..fcbae3f3fe7 100644 --- a/src/devices/bus/coco/coco_ide.h +++ b/src/devices/bus/coco/coco_ide.h @@ -22,7 +22,7 @@ class coco_ide_device : { public: // construction/destruction - coco_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_ide_device(const machine_config &mconfig, 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/coco/coco_max.cpp b/src/devices/bus/coco/coco_max.cpp index 611e4aad39f..948dfa37a8f 100644 --- a/src/devices/bus/coco/coco_max.cpp +++ b/src/devices/bus/coco/coco_max.cpp @@ -47,7 +47,7 @@ namespace { public: // construction/destruction - coco_pak_max_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_pak_max_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -80,7 +80,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_MAX, device_cococart_interface, coco_pak_max // coco_pak_device - constructor //------------------------------------------------- -coco_pak_max_device::coco_pak_max_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_pak_max_device::coco_pak_max_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_PAK_MAX, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_mouse_x(*this, COCOMAX_X_TAG) diff --git a/src/devices/bus/coco/coco_midi.cpp b/src/devices/bus/coco/coco_midi.cpp index 0e6e38b839b..b803edcae0b 100644 --- a/src/devices/bus/coco/coco_midi.cpp +++ b/src/devices/bus/coco/coco_midi.cpp @@ -26,10 +26,10 @@ class coco_midi_device : { public: // construction/destruction - coco_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - coco_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; // optional information overrides @@ -45,14 +45,14 @@ class dragon_midi_device : public coco_midi_device { public: // construction/destruction - dragon_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - dragon_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + dragon_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; }; -coco_midi_device::coco_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_midi_device::coco_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_acia(*this, "mc6850") @@ -60,7 +60,7 @@ coco_midi_device::coco_midi_device(const machine_config &mconfig, device_type ty { } -coco_midi_device::coco_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_midi_device::coco_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_midi_device(mconfig, COCO_MIDI, tag, owner, clock) { } @@ -76,7 +76,7 @@ void coco_midi_device::device_add_mconfig(machine_config &config) MIDI_PORT(config, m_mdthru, midiout_slot, "midiout"); MIDI_PORT(config, "mdout", midiout_slot, "midiout"); - clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); + clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16))); acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc)); acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc)); } @@ -93,12 +93,12 @@ WRITE_LINE_MEMBER(coco_midi_device::acia_irq_w) set_line_value(line::CART, state == 0); } -dragon_midi_device::dragon_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +dragon_midi_device::dragon_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : coco_midi_device(mconfig, type, tag, owner, clock) { } -dragon_midi_device::dragon_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_midi_device::dragon_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : dragon_midi_device(mconfig, DRAGON_MIDI, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 2061c905b3f..860daf0c9da 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -96,12 +96,12 @@ namespace { public: // construction/destruction - coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); INPUT_CHANGED_MEMBER( switch_changed ); protected: - coco_multipak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_multipak_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; @@ -152,7 +152,7 @@ class dragon_multipak_device : public coco_multipak_device { public: // construction/destruction - dragon_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -264,19 +264,19 @@ ioport_constructor coco_multipak_device::device_input_ports() const // coco_multipak_device - constructor //------------------------------------------------- -coco_multipak_device::coco_multipak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_multipak_device::coco_multipak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_slots(*this, "slot%u", 1), m_select(0), m_block(0) { } -coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_multipak_device(mconfig, COCO_MULTIPAK, tag, owner, clock) { } -dragon_multipak_device::dragon_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_multipak_device::dragon_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_multipak_device(mconfig, DRAGON_MULTIPAK, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index 7d149f36a26..0f1f02b126f 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -57,7 +57,7 @@ namespace { public: // construction/destruction - coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_ORCH90, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_eprom(*this, "eprom") @@ -118,8 +118,8 @@ namespace { SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - DAC_8BIT_R2R(config, m_ldac, 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // ls374.ic5 + r7 (8x20k) + r9 (8x10k) - DAC_8BIT_R2R(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // ls374.ic4 + r6 (8x20k) + r8 (8x10k) + DAC_8BIT_R2R(config, m_ldac).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // ls374.ic5 + r7 (8x20k) + r9 (8x10k) + DAC_8BIT_R2R(config, m_rdac).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // ls374.ic4 + r6 (8x20k) + r8 (8x10k) } //------------------------------------------------- diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp index b01698633eb..72561d2a93c 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -55,14 +55,14 @@ DEFINE_DEVICE_TYPE(COCO_PAK, coco_pak_device, "cocopak", "CoCo Program PAK") //------------------------------------------------- // coco_pak_device - constructor //------------------------------------------------- -coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_cart(nullptr), m_eprom(*this, CARTSLOT_TAG), m_autostart(*this, CART_AUTOSTART_TAG) { } -coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_pak_device(mconfig, COCO_PAK, tag, owner, clock) { } @@ -171,12 +171,12 @@ DEFINE_DEVICE_TYPE(COCO_PAK_BANKED, coco_pak_banked_device, "cocopak_banked", "C // coco_pak_device - constructor //------------------------------------------------- -coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : coco_pak_device(mconfig, type, tag, owner, clock) , m_pos(0) { } -coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_pak_banked_device(mconfig, COCO_PAK_BANKED, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h index 2add297bbc6..7787c57f39d 100644 --- a/src/devices/bus/coco/coco_pak.h +++ b/src/devices/bus/coco/coco_pak.h @@ -19,7 +19,7 @@ class coco_pak_device : { public: // construction/destruction - coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -30,7 +30,7 @@ public: virtual memory_region *get_cart_memregion() override; protected: - coco_pak_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_pak_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; @@ -50,10 +50,10 @@ class coco_pak_banked_device : public coco_pak_device { public: // construction/destruction - coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - coco_pak_banked_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_pak_banked_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/coco/coco_psg.cpp b/src/devices/bus/coco/coco_psg.cpp index 5f3d84c98da..ade232da48f 100644 --- a/src/devices/bus/coco/coco_psg.cpp +++ b/src/devices/bus/coco/coco_psg.cpp @@ -104,7 +104,7 @@ void coco_psg_device::device_add_mconfig(machine_config &config) // coco_psg_device - constructor //------------------------------------------------- -coco_psg_device::coco_psg_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_psg_device::coco_psg_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_PSG, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_psg(*this, "psg") diff --git a/src/devices/bus/coco/coco_psg.h b/src/devices/bus/coco/coco_psg.h index 34c344c26e7..83bd13a86c1 100644 --- a/src/devices/bus/coco/coco_psg.h +++ b/src/devices/bus/coco/coco_psg.h @@ -22,7 +22,7 @@ class coco_psg_device : { public: // construction/destruction - coco_psg_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_psg_device(const machine_config &mconfig, 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/coco/coco_ram.cpp b/src/devices/bus/coco/coco_ram.cpp index 885cc55a34d..5d227acd528 100644 --- a/src/devices/bus/coco/coco_ram.cpp +++ b/src/devices/bus/coco/coco_ram.cpp @@ -41,7 +41,7 @@ namespace { public: // construction/destruction - coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void device_add_mconfig(machine_config &config) override; protected: @@ -71,7 +71,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_RAM, device_cococart_interface, coco_pak_ram // coco_pak_device - constructor //------------------------------------------------- -coco_pak_ram_device::coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_pak_ram_device::coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_PAK_RAM, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_staticram(*this, STATICRAM_TAG) diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp index 90f7c6f7be7..326f4547bd7 100644 --- a/src/devices/bus/coco/coco_rs232.cpp +++ b/src/devices/bus/coco/coco_rs232.cpp @@ -36,7 +36,7 @@ namespace { public: // construction/destruction - coco_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_RS232, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_eprom(*this, "eprom") @@ -90,7 +90,7 @@ IMPLEMENTATION void coco_rs232_device::device_add_mconfig(machine_config &config) { - MOS6551(config, m_uart, 0); + MOS6551(config, m_uart); m_uart->set_xtal(1.8432_MHz_XTAL); m_uart->irq_handler().set(FUNC(coco_rs232_device::uart_irq_w)); m_uart->txd_handler().set(PORT_TAG, FUNC(rs232_port_device::write_txd)); diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index 7c8d497a224..b2890fa4349 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -85,7 +85,7 @@ namespace { public: // construction/destruction - coco_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -126,7 +126,7 @@ namespace public device_sound_interface { public: - cocossc_sac_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cocossc_sac_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~cocossc_sac_device() { } bool sound_activity_circuit_output(); @@ -200,7 +200,7 @@ ROM_END // coco_ssc_device - constructor //------------------------------------------------- -coco_ssc_device::coco_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_ssc_device::coco_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_SSC, tag, owner, clock), device_cococart_interface(mconfig, *this ), m_tms7040(*this, PIC_TAG), @@ -475,7 +475,7 @@ void coco_ssc_device::ssc_port_d_w(u8 data) // cocossc_sac_device - constructor //------------------------------------------------- -cocossc_sac_device::cocossc_sac_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cocossc_sac_device::cocossc_sac_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCOSSC_SAC, tag, owner, clock), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/bus/coco/coco_stecomp.cpp b/src/devices/bus/coco/coco_stecomp.cpp index 412f4e3f865..ef277c55e9a 100644 --- a/src/devices/bus/coco/coco_stecomp.cpp +++ b/src/devices/bus/coco/coco_stecomp.cpp @@ -35,7 +35,7 @@ namespace { public: // construction/destruction - coco_stereo_composer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_stereo_composer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_STEREO_COMPOSER, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_pia(*this, "sc_pia") @@ -70,10 +70,10 @@ namespace { SPEAKER(config, "sc_lspeaker").front_left(); SPEAKER(config, "sc_rspeaker").front_right(); - DAC_8BIT_R2R(config, m_ldac, 0).add_route(ALL_OUTPUTS, "sc_lspeaker", 0.5); - DAC_8BIT_R2R(config, m_rdac, 0).add_route(ALL_OUTPUTS, "sc_rspeaker", 0.5); + DAC_8BIT_R2R(config, m_ldac).add_route(ALL_OUTPUTS, "sc_lspeaker", 0.5); + DAC_8BIT_R2R(config, m_rdac).add_route(ALL_OUTPUTS, "sc_rspeaker", 0.5); - pia6821_device &pia(PIA6821(config, "sc_pia", 0)); + pia6821_device &pia(PIA6821(config, "sc_pia")); pia.writepa_handler().set("sc_ldac", FUNC(dac_byte_interface::data_w)); pia.writepb_handler().set("sc_rdac", FUNC(dac_byte_interface::data_w)); } diff --git a/src/devices/bus/coco/coco_sym12.cpp b/src/devices/bus/coco/coco_sym12.cpp index 1edbb27fccc..75ebe8ba3da 100644 --- a/src/devices/bus/coco/coco_sym12.cpp +++ b/src/devices/bus/coco/coco_sym12.cpp @@ -36,7 +36,7 @@ namespace { public: // construction/destruction - coco_symphony_twelve_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + coco_symphony_twelve_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_SYM12, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_pia(*this, "s12_pia") @@ -72,7 +72,7 @@ namespace void coco_symphony_twelve_device::device_add_mconfig(machine_config &config) { - pia6821_device &pia(PIA6821(config, "s12_pia", 0)); + pia6821_device &pia(PIA6821(config, "s12_pia")); pia.writepa_handler().set(*this, FUNC(coco_symphony_twelve_device::write_porta)); pia.readpa_handler().set(*this, FUNC(coco_symphony_twelve_device::read_porta)); pia.writepb_handler().set(*this, FUNC(coco_symphony_twelve_device::write_portb)); diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index bf236f5b7b8..219f31cedf2 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -95,7 +95,7 @@ namespace { public: // construction/destruction - coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; @@ -117,7 +117,7 @@ namespace DECLARE_WRITE_LINE_MEMBER (write_f13_clock){ write_acia_clocks(mc14411_device::TIMER_F13, state); } DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } protected: - coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_t4426_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; @@ -151,10 +151,10 @@ namespace void coco_t4426_device::device_add_mconfig(machine_config &config) { - PIA6821(config, m_pia, 0); + PIA6821(config, m_pia); m_pia->writepa_handler().set(FUNC(coco_t4426_device::pia_A_w)); - ACIA6850(config, m_uart, 0); + ACIA6850(config, m_uart); m_uart->txd_handler().set(SERIAL_TAG, FUNC(rs232_port_device::write_txd)); m_uart->rts_handler().set(SERIAL_TAG, FUNC(rs232_port_device::write_rts)); @@ -236,7 +236,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_T4426, device_cococart_interface, coco_t4426_dev // coco_t4426_device - constructor //------------------------------------------------- -coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_cart(nullptr) @@ -251,7 +251,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type { } -coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_t4426_device(mconfig, COCO_T4426, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_wpk.cpp b/src/devices/bus/coco/coco_wpk.cpp index e2750428227..69d36d8be8c 100644 --- a/src/devices/bus/coco/coco_wpk.cpp +++ b/src/devices/bus/coco/coco_wpk.cpp @@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(COCO_WPKRS, coco_wpkrs_device, "coco_wpkrs", "CoCo WordPak RS // coco_wpk_device - constructor //------------------------------------------------- -coco_wpk_device::coco_wpk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +coco_wpk_device::coco_wpk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_crtc(*this, "crtc") @@ -54,17 +54,17 @@ coco_wpk_device::coco_wpk_device(const machine_config &mconfig, device_type type { } -coco_wpk_device::coco_wpk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_wpk_device::coco_wpk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_wpk_device(mconfig, COCO_WPK, tag, owner, clock) { } -coco_wpk2_device::coco_wpk2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_wpk2_device::coco_wpk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_wpk_device(mconfig, COCO_WPK2, tag, owner, clock) { } -coco_wpkrs_device::coco_wpkrs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_wpkrs_device::coco_wpkrs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : coco_wpk_device(mconfig, COCO_WPKRS, tag, owner, clock) { } diff --git a/src/devices/bus/coco/coco_wpk.h b/src/devices/bus/coco/coco_wpk.h index 33db6c4be73..8c9fdfc121d 100644 --- a/src/devices/bus/coco/coco_wpk.h +++ b/src/devices/bus/coco/coco_wpk.h @@ -24,11 +24,11 @@ public: static constexpr feature_type imperfect_features() { return feature::GRAPHICS; } // construction/destruction - coco_wpk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_wpk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // construction/destruction - coco_wpk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + coco_wpk_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; @@ -58,7 +58,7 @@ class coco_wpk2_device : public coco_wpk_device { public: // construction/destruction - coco_wpk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + coco_wpk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -76,7 +76,7 @@ class coco_wpkrs_device : public coco_wpk_device { public: // construction/destruction - coco_wpkrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + coco_wpkrs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/coco/coco_wpk2p.cpp b/src/devices/bus/coco/coco_wpk2p.cpp index 62fb2504bf7..25009d8b9a9 100644 --- a/src/devices/bus/coco/coco_wpk2p.cpp +++ b/src/devices/bus/coco/coco_wpk2p.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(COCO_WPK2P, coco_wpk2p_device, "coco_wpk2p", "CoCo WordPak 2+ // coco_wpk2p_device - constructor //------------------------------------------------- -coco_wpk2p_device::coco_wpk2p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +coco_wpk2p_device::coco_wpk2p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCO_WPK2P, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_v9958(*this, "v9958") diff --git a/src/devices/bus/coco/coco_wpk2p.h b/src/devices/bus/coco/coco_wpk2p.h index f6c3debc766..87da0b44e32 100644 --- a/src/devices/bus/coco/coco_wpk2p.h +++ b/src/devices/bus/coco/coco_wpk2p.h @@ -21,7 +21,7 @@ class coco_wpk2p_device : { public: // construction/destruction - coco_wpk2p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + coco_wpk2p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index ec387378fb8..737f6203e53 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -123,7 +123,7 @@ ALLOW_SAVE_TYPE(cococart_slot_device::line_value); //------------------------------------------------- // cococart_slot_device - constructor //------------------------------------------------- -cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, COCOCART_SLOT, tag, owner, clock), device_single_card_slot_interface<device_cococart_interface>(mconfig, *this), device_cartrom_image_interface(mconfig, *this), diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h index b686ac0748d..33ee3f2d9df 100644 --- a/src/devices/bus/coco/cococart.h +++ b/src/devices/bus/coco/cococart.h @@ -53,7 +53,7 @@ public: // construction/destruction template <typename T> - cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&opts, const char *dflt) + cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt) : cococart_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -61,7 +61,7 @@ public: set_default_option(dflt); set_fixed(false); } - cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto cart_callback() { return m_cart_callback.bind(); } auto nmi_callback() { return m_nmi_callback.bind(); } diff --git a/src/devices/bus/coco/dragon_amtor.cpp b/src/devices/bus/coco/dragon_amtor.cpp index 7ce51671153..5eff8fd2842 100644 --- a/src/devices/bus/coco/dragon_amtor.cpp +++ b/src/devices/bus/coco/dragon_amtor.cpp @@ -53,7 +53,7 @@ INPUT_PORTS_END // dragon_amtor_device - constructor //------------------------------------------------- -dragon_amtor_device::dragon_amtor_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_amtor_device::dragon_amtor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_AMTOR, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_eprom(*this, "eprom") diff --git a/src/devices/bus/coco/dragon_amtor.h b/src/devices/bus/coco/dragon_amtor.h index 3d6e73fc40a..931d2388921 100644 --- a/src/devices/bus/coco/dragon_amtor.h +++ b/src/devices/bus/coco/dragon_amtor.h @@ -19,7 +19,7 @@ class dragon_amtor_device : { public: // construction/destruction - dragon_amtor_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_amtor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/coco/dragon_claw.cpp b/src/devices/bus/coco/dragon_claw.cpp index a4c00b0f71a..affcfeaa40b 100644 --- a/src/devices/bus/coco/dragon_claw.cpp +++ b/src/devices/bus/coco/dragon_claw.cpp @@ -59,7 +59,7 @@ ioport_constructor dragon_claw_device::device_input_ports() const // dragon_claw_device - constructor //------------------------------------------------- -dragon_claw_device::dragon_claw_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_claw_device::dragon_claw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_CLAW, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_via(*this, "via") diff --git a/src/devices/bus/coco/dragon_claw.h b/src/devices/bus/coco/dragon_claw.h index 9743b5b0b3c..f31dcc6e12f 100644 --- a/src/devices/bus/coco/dragon_claw.h +++ b/src/devices/bus/coco/dragon_claw.h @@ -22,7 +22,7 @@ class dragon_claw_device : { public: // construction/destruction - dragon_claw_device(const machine_config& mconfig, const char* tag, device_t* owner, u32 clock); + dragon_claw_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index 5a70433e559..611a48ab091 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -96,7 +96,7 @@ namespace { protected: // construction/destruction - dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual u8 cts_read(offs_t offset) override; @@ -118,7 +118,7 @@ namespace { protected: // construction/destruction - premier_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + premier_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual u8 cts_read(offs_t offset) override; @@ -178,7 +178,7 @@ void premier_fdc_device_base::device_add_mconfig(machine_config &config) //------------------------------------------------- // dragon_fdc_device_base - constructor //------------------------------------------------- -dragon_fdc_device_base::dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +dragon_fdc_device_base::dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : coco_family_fdc_device_base(mconfig, type, tag, owner, clock) , m_wd2797(*this, "wd2797") , m_floppies(*this, "wd2797:%u", 0) @@ -186,7 +186,7 @@ dragon_fdc_device_base::dragon_fdc_device_base(const machine_config &mconfig, de } -premier_fdc_device_base::premier_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +premier_fdc_device_base::premier_fdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : coco_family_fdc_device_base(mconfig, type, tag, owner, clock) , m_wd2791(*this, "wd2791") , m_floppies(*this, "wd2791:%u", 0) @@ -395,7 +395,7 @@ namespace { public: // construction/destruction - dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : dragon_fdc_device_base(mconfig, DRAGON_FDC, tag, owner, clock) { } @@ -427,7 +427,7 @@ namespace { public: // construction/destruction - premier_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + premier_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : premier_fdc_device_base(mconfig, PREMIER_FDC, tag, owner, clock) { } @@ -459,7 +459,7 @@ namespace { public: // construction/destruction - sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : dragon_fdc_device_base(mconfig, SDTANDY_FDC, tag, owner, clock) { } diff --git a/src/devices/bus/coco/dragon_jcbsnd.cpp b/src/devices/bus/coco/dragon_jcbsnd.cpp index fc5b8390f89..cf91ddc46cd 100644 --- a/src/devices/bus/coco/dragon_jcbsnd.cpp +++ b/src/devices/bus/coco/dragon_jcbsnd.cpp @@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(DRAGON_JCBSND, dragon_jcbsnd_device, "dragon_jcbsnd", "Dragon // dragon_jcbsnd_device - constructor //------------------------------------------------- -dragon_jcbsnd_device::dragon_jcbsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_jcbsnd_device::dragon_jcbsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_JCBSND, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_eprom(*this, "eprom") diff --git a/src/devices/bus/coco/dragon_jcbsnd.h b/src/devices/bus/coco/dragon_jcbsnd.h index 6ded5d6c601..9e13ff7b483 100644 --- a/src/devices/bus/coco/dragon_jcbsnd.h +++ b/src/devices/bus/coco/dragon_jcbsnd.h @@ -20,7 +20,7 @@ class dragon_jcbsnd_device : { public: // construction/destruction - dragon_jcbsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_jcbsnd_device(const machine_config &mconfig, 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/coco/dragon_jcbspch.cpp b/src/devices/bus/coco/dragon_jcbspch.cpp index a82d122d275..94445a29e90 100644 --- a/src/devices/bus/coco/dragon_jcbspch.cpp +++ b/src/devices/bus/coco/dragon_jcbspch.cpp @@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(DRAGON_JCBSPCH, dragon_jcbspch_device, "dragon_jcbspch", "Dra // dragon_jcbspch_device - constructor //------------------------------------------------- -dragon_jcbspch_device::dragon_jcbspch_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_jcbspch_device::dragon_jcbspch_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_JCBSPCH, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_eprom(*this, "eprom") @@ -83,7 +83,7 @@ memory_region *dragon_jcbspch_device::get_cart_memregion() void dragon_jcbspch_device::device_add_mconfig(machine_config &config) { - PIA6821(config, m_pia, 0); + PIA6821(config, m_pia); m_pia->writepb_handler().set(m_nsp, FUNC(sp0256_device::ald_w)).mask(0x3f); m_pia->cb2_handler().set(FUNC(dragon_jcbspch_device::pia_cb2_w)); m_pia->irqb_handler().set(FUNC(dragon_jcbspch_device::nmi_w)); diff --git a/src/devices/bus/coco/dragon_jcbspch.h b/src/devices/bus/coco/dragon_jcbspch.h index e8761dec2d8..51187678623 100644 --- a/src/devices/bus/coco/dragon_jcbspch.h +++ b/src/devices/bus/coco/dragon_jcbspch.h @@ -21,7 +21,7 @@ class dragon_jcbspch_device : { public: // construction/destruction - dragon_jcbspch_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_jcbspch_device(const machine_config &mconfig, 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/coco/dragon_msx2.cpp b/src/devices/bus/coco/dragon_msx2.cpp index a8da5565991..2b8f2195f88 100644 --- a/src/devices/bus/coco/dragon_msx2.cpp +++ b/src/devices/bus/coco/dragon_msx2.cpp @@ -63,7 +63,7 @@ ioport_constructor dragon_msx2_device::device_input_ports() const // dragon_msx2_device - constructor //------------------------------------------------- -dragon_msx2_device::dragon_msx2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_msx2_device::dragon_msx2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_MSX2, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_ym2413(*this, "ym2413") diff --git a/src/devices/bus/coco/dragon_msx2.h b/src/devices/bus/coco/dragon_msx2.h index 3eb1fcaa64b..cee2edd73cd 100644 --- a/src/devices/bus/coco/dragon_msx2.h +++ b/src/devices/bus/coco/dragon_msx2.h @@ -23,7 +23,7 @@ class dragon_msx2_device : { public: // construction/destruction - dragon_msx2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_msx2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/coco/dragon_serial.cpp b/src/devices/bus/coco/dragon_serial.cpp index 8967bed816c..d018abeec09 100644 --- a/src/devices/bus/coco/dragon_serial.cpp +++ b/src/devices/bus/coco/dragon_serial.cpp @@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(DRAGON_SERIAL, dragon_serial_device, "dragon_serial", "Dragon // dragon_serial_device - constructor //------------------------------------------------- -dragon_serial_device::dragon_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_serial_device::dragon_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_SERIAL, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_eprom(*this, "eprom") @@ -84,7 +84,7 @@ memory_region *dragon_serial_device::get_cart_memregion() void dragon_serial_device::device_add_mconfig(machine_config &config) { - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd)); m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts)); m_acia->irq_handler().set([this](int state) { set_line_value(line::NMI, state); }); diff --git a/src/devices/bus/coco/dragon_serial.h b/src/devices/bus/coco/dragon_serial.h index 7f33a61de67..3d162c75e78 100644 --- a/src/devices/bus/coco/dragon_serial.h +++ b/src/devices/bus/coco/dragon_serial.h @@ -20,7 +20,7 @@ class dragon_serial_device : { public: // construction/destruction - dragon_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type imperfect_features() { return feature::COMMS; } diff --git a/src/devices/bus/coco/dragon_sprites.cpp b/src/devices/bus/coco/dragon_sprites.cpp index a33d9648715..55bfb59ed68 100644 --- a/src/devices/bus/coco/dragon_sprites.cpp +++ b/src/devices/bus/coco/dragon_sprites.cpp @@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(DRAGON_SPRITES, dragon_sprites_device, "dragon_sprites", "Dra // dragon_sprites_device - constructor //------------------------------------------------- -dragon_sprites_device::dragon_sprites_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +dragon_sprites_device::dragon_sprites_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DRAGON_SPRITES, tag, owner, clock) , device_cococart_interface(mconfig, *this ) , m_eprom(*this, "eprom") diff --git a/src/devices/bus/coco/dragon_sprites.h b/src/devices/bus/coco/dragon_sprites.h index 1236912396e..e5b221c1ebf 100644 --- a/src/devices/bus/coco/dragon_sprites.h +++ b/src/devices/bus/coco/dragon_sprites.h @@ -21,7 +21,7 @@ class dragon_sprites_device : { public: // construction/destruction - dragon_sprites_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + dragon_sprites_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; |