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/nes_ctrl | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/nes_ctrl')
44 files changed, 84 insertions, 84 deletions
diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp index d786124d1a5..7d401826098 100644 --- a/src/devices/bus/nes_ctrl/4score.cpp +++ b/src/devices/bus/nes_ctrl/4score.cpp @@ -111,21 +111,21 @@ ioport_constructor nes_4score_p2p4_device::device_input_ports() const // nes_4score_device - constructor //------------------------------------------------- -nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_4score_device::nes_4score_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_nes_control_port_interface(mconfig, *this) , m_latch(0) { } -nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_4score_device(mconfig, NES_4SCORE_P1P3, tag, owner, clock) , m_joypad1(*this, "PAD1") , m_joypad3(*this, "PAD3") { } -nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_4score_device(mconfig, NES_4SCORE_P2P4, tag, owner, clock) , m_joypad2(*this, "PAD2") , m_joypad4(*this, "PAD4") diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h index 64e5cba8002..81e416b77c9 100644 --- a/src/devices/bus/nes_ctrl/4score.h +++ b/src/devices/bus/nes_ctrl/4score.h @@ -28,7 +28,7 @@ public: protected: // construction/destruction - nes_4score_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_4score_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; @@ -43,7 +43,7 @@ class nes_4score_p1p3_device : public nes_4score_device { public: // construction/destruction - nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write(uint8_t data) override; @@ -62,7 +62,7 @@ class nes_4score_p2p4_device : public nes_4score_device { public: // construction/destruction - nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp index cad203bc45e..80e32c93072 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.cpp +++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp @@ -84,7 +84,7 @@ void nes_vausfc_device::device_add_mconfig(machine_config &config) // nes_vaus_device - constructor //------------------------------------------------- -nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_vaus_device::nes_vaus_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_nes_control_port_interface(mconfig, *this) , m_paddle(*this, "PADDLE") @@ -93,12 +93,12 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type { } -nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_vaus_device(mconfig, NES_ARKPADDLE, tag, owner, clock) { } -nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_vaus_device(mconfig, NES_ARKPADDLE_FC, tag, owner, clock) , m_daisychain(*this, "subexp") { diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h index 7ac48917adb..71ff66668e7 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.h +++ b/src/devices/bus/nes_ctrl/arkpaddle.h @@ -25,13 +25,13 @@ class nes_vaus_device : public device_t, public device_nes_control_port_interfac { public: // construction/destruction - nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit34() override; virtual void write(u8 data) override; protected: - nes_vaus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_vaus_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; @@ -49,7 +49,7 @@ class nes_vausfc_device : public nes_vaus_device { public: // construction/destruction - nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit34() override { return 0; } virtual u8 read_exp(offs_t offset) override; diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 26973cfc51c..5e2b846877e 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(NES_BARCODE_BATTLER, nes_bcbattle_device, "nes_bcbattle", "Ep void nes_bcbattle_device::device_add_mconfig(machine_config &config) { - BARCODE_READER(config, "battler", 0); + BARCODE_READER(config, "battler"); } @@ -75,7 +75,7 @@ TIMER_CALLBACK_MEMBER(nes_bcbattle_device::scan_tick) // nes_bcbattle_device - constructor //------------------------------------------------- -nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_BARCODE_BATTLER, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_reader(*this, "battler") diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h index c51f2db64ac..f3d79c4063f 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.h +++ b/src/devices/bus/nes_ctrl/bcbattle.h @@ -26,7 +26,7 @@ class nes_bcbattle_device : public device_t, { public: // construction/destruction - nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_exp(offs_t offset) override; diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp index aaeec552b4e..7aa01cda926 100644 --- a/src/devices/bus/nes_ctrl/ctrl.cpp +++ b/src/devices/bus/nes_ctrl/ctrl.cpp @@ -108,7 +108,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface() // nes_control_port_device - constructor //------------------------------------------------- -nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_CONTROL_PORT, tag, owner, clock), device_single_card_slot_interface<device_nes_control_port_interface>(mconfig, *this), m_screen(*this, finder_base::DUMMY_TAG), diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h index 01777358cda..e424913099b 100644 --- a/src/devices/bus/nes_ctrl/ctrl.h +++ b/src/devices/bus/nes_ctrl/ctrl.h @@ -60,14 +60,14 @@ public: // construction/destruction template <typename T> nes_control_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : nes_control_port_device(mconfig, tag, owner, (u32)0) + : nes_control_port_device(mconfig, tag, owner) { option_reset(); opts(*this); set_default_option(dflt); set_fixed(false); } - nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~nes_control_port_device(); u8 read_bit0(); diff --git a/src/devices/bus/nes_ctrl/dorepiano.cpp b/src/devices/bus/nes_ctrl/dorepiano.cpp index 6fd4179d2f0..71391e98515 100644 --- a/src/devices/bus/nes_ctrl/dorepiano.cpp +++ b/src/devices/bus/nes_ctrl/dorepiano.cpp @@ -93,7 +93,7 @@ ioport_constructor nes_dorepiano_device::device_input_ports() const // nes_dorepiano_device - constructor //------------------------------------------------- -nes_dorepiano_device::nes_dorepiano_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_dorepiano_device::nes_dorepiano_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_DOREPIANO, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_port(*this, "PIANO.%u", 0) diff --git a/src/devices/bus/nes_ctrl/dorepiano.h b/src/devices/bus/nes_ctrl/dorepiano.h index 63f6c1eb7af..2a68ed21422 100644 --- a/src/devices/bus/nes_ctrl/dorepiano.h +++ b/src/devices/bus/nes_ctrl/dorepiano.h @@ -26,7 +26,7 @@ class nes_dorepiano_device : { public: // construction/destruction - nes_dorepiano_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_dorepiano_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index 3fd78131bc7..58f312103cd 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -142,7 +142,7 @@ void nes_fckeybrd_device::device_add_mconfig(machine_config &config) // nes_fckeybrd_device - constructor //------------------------------------------------- -nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_FCKEYBOARD, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_cassette(*this, "tape") diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h index 137ff90fc1f..f6d13cee4d8 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.h +++ b/src/devices/bus/nes_ctrl/fckeybrd.h @@ -26,7 +26,7 @@ class nes_fckeybrd_device : public device_t, { public: // construction/destruction - nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/fcmat.cpp b/src/devices/bus/nes_ctrl/fcmat.cpp index f40bb9df48a..35669e37cab 100644 --- a/src/devices/bus/nes_ctrl/fcmat.cpp +++ b/src/devices/bus/nes_ctrl/fcmat.cpp @@ -117,7 +117,7 @@ ioport_constructor nes_taptapmat_device::device_input_ports() const // constructor //------------------------------------------------- -nes_fcmat_device::nes_fcmat_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_fcmat_device::nes_fcmat_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_nes_control_port_interface(mconfig, *this) , m_mat(*this, "MAT_COL.%u", 0) @@ -125,12 +125,12 @@ nes_fcmat_device::nes_fcmat_device(const machine_config &mconfig, device_type ty { } -nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcmat_device(mconfig, NES_FTRAINER, tag, owner, clock) { } -nes_taptapmat_device::nes_taptapmat_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_taptapmat_device::nes_taptapmat_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcmat_device(mconfig, NES_TAPTAPMAT, tag, owner, clock) { } diff --git a/src/devices/bus/nes_ctrl/fcmat.h b/src/devices/bus/nes_ctrl/fcmat.h index 0ed731c9067..d9406aefc90 100644 --- a/src/devices/bus/nes_ctrl/fcmat.h +++ b/src/devices/bus/nes_ctrl/fcmat.h @@ -31,7 +31,7 @@ public: protected: // construction/destruction - nes_fcmat_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_fcmat_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; @@ -48,7 +48,7 @@ class nes_ftrainer_device : public nes_fcmat_device { public: // construction/destruction - nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -62,7 +62,7 @@ class nes_taptapmat_device : public nes_fcmat_device { public: // construction/destruction - nes_taptapmat_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_taptapmat_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp index 7b1351af3fd..3ac9c815a30 100644 --- a/src/devices/bus/nes_ctrl/hori.cpp +++ b/src/devices/bus/nes_ctrl/hori.cpp @@ -93,14 +93,14 @@ void nes_hori4p_device::device_add_mconfig(machine_config &config) // nes_horitwin_device - constructor //------------------------------------------------- -nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_HORITWIN, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_subexp(*this, "subexp%u", 0) { } -nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_HORI4P, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_subexp(*this, "subexp%u", 0) diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h index 6146aa90d52..3e08d2c3a6b 100644 --- a/src/devices/bus/nes_ctrl/hori.h +++ b/src/devices/bus/nes_ctrl/hori.h @@ -25,7 +25,7 @@ class nes_horitwin_device : public device_t, { public: // construction/destruction - nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; @@ -47,7 +47,7 @@ class nes_hori4p_device : public device_t, { public: // construction/destruction - nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index c4972912d78..dcf52df6601 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -203,7 +203,7 @@ void nes_arcstick_device::device_add_mconfig(machine_config &config) // nes_joypad_device - constructor //------------------------------------------------- -nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill) +nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u32 latch_fill) : device_t(mconfig, type, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_joypad(*this, "JOYPAD") @@ -212,45 +212,45 @@ nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type { } -nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_joypad_device(mconfig, NES_JOYPAD, tag, owner, clock) { } -nes_fcpadexp_device::nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill) +nes_fcpadexp_device::nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u32 latch_fill) : nes_joypad_device(mconfig, type, tag, owner, clock, latch_fill) { } -nes_fcpadexp_device::nes_fcpadexp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_fcpadexp_device::nes_fcpadexp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcpadexp_device(mconfig, NES_FCPAD_EXP, tag, owner, clock) { } -nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_joypad_device(mconfig, NES_FCPAD_P2, tag, owner, clock) , m_mic(*this, "MIC") { } -nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_joypad_device(mconfig, NES_CCPAD_LEFT, tag, owner, clock) { } -nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_joypad_device(mconfig, NES_CCPAD_RIGHT, tag, owner, clock) { } -nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcpadexp_device(mconfig, NES_ARCSTICK, tag, owner, clock) , m_daisychain(*this, "subexp") , m_cfg(*this, "CONFIG") { } -nes_vboyctrl_device::nes_vboyctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_vboyctrl_device::nes_vboyctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_joypad_device(mconfig, NES_VBOYCTRL, tag, owner, clock, 0x8000) { } diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h index 5e54f26a079..fbead0ff6a6 100644 --- a/src/devices/bus/nes_ctrl/joypad.h +++ b/src/devices/bus/nes_ctrl/joypad.h @@ -26,13 +26,13 @@ class nes_joypad_device : public device_t, { public: // construction/destruction - nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit0() override; virtual void write(u8 data) override; protected: - nes_joypad_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill = 0x80); + nes_joypad_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u32 latch_fill = 0x80); // device-level overrides virtual void device_start() override; @@ -52,13 +52,13 @@ class nes_fcpadexp_device : public nes_joypad_device { public: // construction/destruction - nes_fcpadexp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_fcpadexp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit0() override { return 0; } virtual u8 read_exp(offs_t offset) override; protected: - nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill = 0x80); + nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u32 latch_fill = 0x80); }; @@ -68,7 +68,7 @@ class nes_fcpad2_device : public nes_joypad_device { public: // construction/destruction - nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit2() override; @@ -87,7 +87,7 @@ class nes_ccpadl_device : public nes_joypad_device { public: // construction/destruction - nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -101,7 +101,7 @@ class nes_ccpadr_device : public nes_joypad_device { public: // construction/destruction - nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -115,7 +115,7 @@ class nes_arcstick_device : public nes_fcpadexp_device { public: // construction/destruction - nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; @@ -137,7 +137,7 @@ class nes_vboyctrl_device : public nes_joypad_device { public: // construction/destruction - nes_vboyctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_vboyctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/nes_ctrl/konamibag.cpp b/src/devices/bus/nes_ctrl/konamibag.cpp index bef79cfde60..77038bafbfe 100644 --- a/src/devices/bus/nes_ctrl/konamibag.cpp +++ b/src/devices/bus/nes_ctrl/konamibag.cpp @@ -50,7 +50,7 @@ ioport_constructor nes_konamibag_device::device_input_ports() const // nes_konamibag_device - constructor //------------------------------------------------- -nes_konamibag_device::nes_konamibag_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konamibag_device::nes_konamibag_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_KONAMIBAG, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_sensor(*this, "BAG.%u", 0) diff --git a/src/devices/bus/nes_ctrl/konamibag.h b/src/devices/bus/nes_ctrl/konamibag.h index ff98808c058..c5062493ff2 100644 --- a/src/devices/bus/nes_ctrl/konamibag.h +++ b/src/devices/bus/nes_ctrl/konamibag.h @@ -28,7 +28,7 @@ public: static constexpr feature_type imperfect_features() { return feature::CONTROLS; } // construction/destruction - nes_konamibag_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konamibag_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp index d8d95c9bbd6..7113ab9d0ef 100644 --- a/src/devices/bus/nes_ctrl/konamihs.cpp +++ b/src/devices/bus/nes_ctrl/konamihs.cpp @@ -43,7 +43,7 @@ ioport_constructor nes_konamihs_device::device_input_ports() const // nes_konamihs_device - constructor //------------------------------------------------- -nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_KONAMIHS, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_ipt(*this, "P%u", 1) diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h index 9e8f94b6823..5fe08ce9bec 100644 --- a/src/devices/bus/nes_ctrl/konamihs.h +++ b/src/devices/bus/nes_ctrl/konamihs.h @@ -25,7 +25,7 @@ class nes_konamihs_device : public device_t, { public: // construction/destruction - nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index 4945358c028..839e9d709c5 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -47,7 +47,7 @@ TIMER_CALLBACK_MEMBER(nes_miracle_device::strobe_tick) // nes_miracle_device - constructor //------------------------------------------------- -nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_MIRACLE, tag, owner, clock), device_serial_interface(mconfig, *this), device_nes_control_port_interface(mconfig, *this), @@ -86,8 +86,8 @@ void nes_miracle_device::device_reset() // set standard MIDI parameters set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); - set_rcv_rate(31250); - set_tra_rate(31250); + set_rcv_rate(XTAL::u(31250)); + set_tra_rate(XTAL::u(31250)); m_xmit_read = m_xmit_write = 0; m_recv_read = m_recv_write = 0; diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h index f06480d9a43..462ef7afc10 100644 --- a/src/devices/bus/nes_ctrl/miracle.h +++ b/src/devices/bus/nes_ctrl/miracle.h @@ -28,7 +28,7 @@ class nes_miracle_device : public device_t, { public: // construction/destruction - nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_bit0() override; virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp index 9624ff95226..c08ef5507c4 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.cpp +++ b/src/devices/bus/nes_ctrl/mjpanel.cpp @@ -77,7 +77,7 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const // nes_mjpanel_device - constructor //------------------------------------------------- -nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_MJPANEL, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_panel(*this, "MJPANEL.%u", 0) diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h index bbe18208426..557368cd313 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.h +++ b/src/devices/bus/nes_ctrl/mjpanel.h @@ -25,7 +25,7 @@ class nes_mjpanel_device : public device_t, { public: // construction/destruction - nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp index e5b7dd5a6ac..f9462578099 100644 --- a/src/devices/bus/nes_ctrl/pachinko.cpp +++ b/src/devices/bus/nes_ctrl/pachinko.cpp @@ -40,7 +40,7 @@ ioport_constructor nes_pachinko_device::device_input_ports() const // nes_pachinko_device - constructor //------------------------------------------------- -nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcpadexp_device(mconfig, NES_PACHINKO, tag, owner, clock, 0) , m_trigger(*this, "TRIGGER") { diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h index d70503c6fcf..e546de49228 100644 --- a/src/devices/bus/nes_ctrl/pachinko.h +++ b/src/devices/bus/nes_ctrl/pachinko.h @@ -24,7 +24,7 @@ class nes_pachinko_device : public nes_fcpadexp_device { public: // construction/destruction - nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp index b06be261e49..63de3ae0d0d 100644 --- a/src/devices/bus/nes_ctrl/partytap.cpp +++ b/src/devices/bus/nes_ctrl/partytap.cpp @@ -44,7 +44,7 @@ ioport_constructor nes_partytap_device::device_input_ports() const // nes_partytap_device - constructor //------------------------------------------------- -nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_PARTYTAP, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_inputs(*this, "INPUTS") diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h index a8531a2b84d..ef03e1feb56 100644 --- a/src/devices/bus/nes_ctrl/partytap.h +++ b/src/devices/bus/nes_ctrl/partytap.h @@ -25,7 +25,7 @@ class nes_partytap_device : public device_t, { public: // construction/destruction - nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp index 688e73e3b12..64da7402259 100644 --- a/src/devices/bus/nes_ctrl/powerpad.cpp +++ b/src/devices/bus/nes_ctrl/powerpad.cpp @@ -78,7 +78,7 @@ ioport_constructor nes_powerpad_device::device_input_ports() const // nes_powerpad_device - constructor //------------------------------------------------- -nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_POWERPAD, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_ipt(*this, "POWERPAD.%u", 0) diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h index a6d76c81192..75099fc0305 100644 --- a/src/devices/bus/nes_ctrl/powerpad.h +++ b/src/devices/bus/nes_ctrl/powerpad.h @@ -25,7 +25,7 @@ class nes_powerpad_device : public device_t, { public: // construction/destruction - nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit34() override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/rob.cpp b/src/devices/bus/nes_ctrl/rob.cpp index 24747e6a088..11128900a35 100644 --- a/src/devices/bus/nes_ctrl/rob.cpp +++ b/src/devices/bus/nes_ctrl/rob.cpp @@ -51,7 +51,7 @@ ioport_constructor nes_rob_device::device_input_ports() const // constructor //------------------------------------------------- -nes_rob_device::nes_rob_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_rob_device::nes_rob_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_ROB, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_maincpu(*this, "maincpu") @@ -121,7 +121,7 @@ void nes_rob_device::device_add_mconfig(machine_config &config) m_maincpu->write_r<2>().set(FUNC(nes_rob_device::output_w)); m_maincpu->write_r<3>().set(FUNC(nes_rob_device::output_w)); - NES_ZAPPER_SENSOR(config, m_sensor, 0); + NES_ZAPPER_SENSOR(config, m_sensor); if (m_port != nullptr) m_sensor->set_screen_tag(m_port->m_screen); diff --git a/src/devices/bus/nes_ctrl/rob.h b/src/devices/bus/nes_ctrl/rob.h index 05e529f45e2..24cb03939ea 100644 --- a/src/devices/bus/nes_ctrl/rob.h +++ b/src/devices/bus/nes_ctrl/rob.h @@ -27,7 +27,7 @@ class nes_rob_device : public device_t, { public: // construction/destruction - nes_rob_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_rob_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/nes_ctrl/snesadapter.cpp b/src/devices/bus/nes_ctrl/snesadapter.cpp index 8b26824a80d..e7f36497e00 100644 --- a/src/devices/bus/nes_ctrl/snesadapter.cpp +++ b/src/devices/bus/nes_ctrl/snesadapter.cpp @@ -45,7 +45,7 @@ void nes_snesadapter_device::device_add_mconfig(machine_config &config) // nes_snesadapter_device - constructor //------------------------------------------------- -nes_snesadapter_device::nes_snesadapter_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_snesadapter_device::nes_snesadapter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_SNESADAPTER, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_snesctrl(*this, "port") diff --git a/src/devices/bus/nes_ctrl/snesadapter.h b/src/devices/bus/nes_ctrl/snesadapter.h index 903581466c7..cf99a3e4885 100644 --- a/src/devices/bus/nes_ctrl/snesadapter.h +++ b/src/devices/bus/nes_ctrl/snesadapter.h @@ -25,7 +25,7 @@ class nes_snesadapter_device : public device_t, public device_nes_control_port_i { public: // construction/destruction - nes_snesadapter_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_snesadapter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit0() override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp index ce752762913..b335b9376e1 100644 --- a/src/devices/bus/nes_ctrl/suborkey.cpp +++ b/src/devices/bus/nes_ctrl/suborkey.cpp @@ -161,7 +161,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const // nes_suborkey_device - constructor //------------------------------------------------- -nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_SUBORKEYBOARD, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_kbd(*this, "SUBOR.%u", 0) diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h index a72c1dbaca7..20b31023869 100644 --- a/src/devices/bus/nes_ctrl/suborkey.h +++ b/src/devices/bus/nes_ctrl/suborkey.h @@ -25,7 +25,7 @@ class nes_suborkey_device : public device_t, { public: // construction/destruction - nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_exp(offs_t offset) override; virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/turbofile.cpp b/src/devices/bus/nes_ctrl/turbofile.cpp index 5f4db5c1641..1197b38b0dd 100644 --- a/src/devices/bus/nes_ctrl/turbofile.cpp +++ b/src/devices/bus/nes_ctrl/turbofile.cpp @@ -62,7 +62,7 @@ void nes_turbofile_device::device_add_mconfig(machine_config &config) // nes_turbofile_device - constructor //------------------------------------------------- -nes_turbofile_device::nes_turbofile_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_turbofile_device::nes_turbofile_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_TURBOFILE, tag, owner, clock) , device_nes_control_port_interface(mconfig, *this) , m_nvram(*this, "nvram") diff --git a/src/devices/bus/nes_ctrl/turbofile.h b/src/devices/bus/nes_ctrl/turbofile.h index ba8545082d4..d9fda2a2154 100644 --- a/src/devices/bus/nes_ctrl/turbofile.h +++ b/src/devices/bus/nes_ctrl/turbofile.h @@ -26,7 +26,7 @@ class nes_turbofile_device : public device_t, { public: // construction/destruction - nes_turbofile_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_turbofile_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp index 5d55b1f2d3f..837ecbe4d43 100644 --- a/src/devices/bus/nes_ctrl/zapper.cpp +++ b/src/devices/bus/nes_ctrl/zapper.cpp @@ -63,7 +63,7 @@ ioport_constructor nes_bandaihs_device::device_input_ports() const void nes_zapper_device::device_add_mconfig(machine_config &config) { - NES_ZAPPER_SENSOR(config, m_sensor, 0); + NES_ZAPPER_SENSOR(config, m_sensor); if (m_port != nullptr) m_sensor->set_screen_tag(m_port->m_screen); } @@ -77,7 +77,7 @@ void nes_zapper_device::device_add_mconfig(machine_config &config) // constructor //------------------------------------------------- -nes_zapper_device::nes_zapper_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_zapper_device::nes_zapper_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_nes_control_port_interface(mconfig, *this) , m_sensor(*this, "sensor") @@ -87,12 +87,12 @@ nes_zapper_device::nes_zapper_device(const machine_config &mconfig, device_type { } -nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_zapper_device(mconfig, NES_ZAPPER, tag, owner, clock) { } -nes_bandaihs_device::nes_bandaihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bandaihs_device::nes_bandaihs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_zapper_device(mconfig, NES_BANDAIHS, tag, owner, clock) , m_joypad(*this, "JOYPAD") , m_latch(0) diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h index d3ca9a298bf..8f3ecedfe59 100644 --- a/src/devices/bus/nes_ctrl/zapper.h +++ b/src/devices/bus/nes_ctrl/zapper.h @@ -27,14 +27,14 @@ class nes_zapper_device : public device_t, { public: // construction/destruction - nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_bit34() override; virtual u8 read_exp(offs_t offset) override; protected: // construction/destruction - nes_zapper_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_zapper_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; @@ -55,7 +55,7 @@ class nes_bandaihs_device : public nes_zapper_device { public: // construction/destruction - nes_bandaihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bandaihs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_exp(offs_t offset) override; virtual void write(u8 data) override; diff --git a/src/devices/bus/nes_ctrl/zapper_sensor.cpp b/src/devices/bus/nes_ctrl/zapper_sensor.cpp index 6d0bf53fc6d..1e3054a1aa9 100644 --- a/src/devices/bus/nes_ctrl/zapper_sensor.cpp +++ b/src/devices/bus/nes_ctrl/zapper_sensor.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(NES_ZAPPER_SENSOR, nes_zapper_sensor_device, "nes_zapper_sens // constructor //------------------------------------------------- -nes_zapper_sensor_device::nes_zapper_sensor_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_zapper_sensor_device::nes_zapper_sensor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_ZAPPER_SENSOR, tag, owner, clock) , m_screen(*this, finder_base::DUMMY_TAG) { diff --git a/src/devices/bus/nes_ctrl/zapper_sensor.h b/src/devices/bus/nes_ctrl/zapper_sensor.h index f63a38e6b01..5f795d79473 100644 --- a/src/devices/bus/nes_ctrl/zapper_sensor.h +++ b/src/devices/bus/nes_ctrl/zapper_sensor.h @@ -25,7 +25,7 @@ class nes_zapper_sensor_device : public device_t { public: // construction/destruction - nes_zapper_sensor_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_zapper_sensor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); } |