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 | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/nes')
110 files changed, 917 insertions, 917 deletions
diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp index 9105c518844..40e71fea88c 100644 --- a/src/devices/bus/nes/2a03pur.cpp +++ b/src/devices/bus/nes/2a03pur.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(NES_2A03PURITANS, nes_2a03pur_device, "nes_2a03pur", "NES Cart 2A03 Puritans Album PCB") -nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_2A03PURITANS, tag, owner, clock) { } diff --git a/src/devices/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h index 27b4127b5f1..0284000c5dd 100644 --- a/src/devices/bus/nes/2a03pur.h +++ b/src/devices/bus/nes/2a03pur.h @@ -14,7 +14,7 @@ class nes_2a03pur_device : public nes_nrom_device { public: // construction/destruction - nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp index 9fd4ced2a6b..94cb7f4adf3 100644 --- a/src/devices/bus/nes/act53.cpp +++ b/src/devices/bus/nes/act53.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(NES_ACTION53, nes_action53_device, "nes_action53", "NES Cart Action 53 PCB") -nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_ACTION53, tag, owner, clock) , m_sel(0) { diff --git a/src/devices/bus/nes/act53.h b/src/devices/bus/nes/act53.h index ead18a54ad6..5e101217b40 100644 --- a/src/devices/bus/nes/act53.h +++ b/src/devices/bus/nes/act53.h @@ -12,7 +12,7 @@ class nes_action53_device : public nes_nrom_device { public: // construction/destruction - nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 00b444cd395..2bac94c91e3 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -66,7 +66,7 @@ uint8_t aladdin_cart_interface::read(offs_t offset) DEFINE_DEVICE_TYPE(NES_ALADDIN_SLOT, nes_aladdin_slot_device, "nes_ade_slot", "NES Aladdin Deck Enhancer Cartridge Slot") -nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_ALADDIN_SLOT, tag, owner, clock) , device_cartrom_image_interface(mconfig, *this) , device_single_card_slot_interface<aladdin_cart_interface>(mconfig, *this) @@ -176,18 +176,18 @@ ROM_END DEFINE_DEVICE_TYPE(NES_ALGN_ROM, nes_algn_rom_device, "nes_algn_rom", "NES Aladdin Deck Enhancer ALGN ROM") DEFINE_DEVICE_TYPE(NES_ALGQ_ROM, nes_algq_rom_device, "nes_algq_rom", "NES Aladdin Deck Enhancer ALGQ ROM") -nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , aladdin_cart_interface(mconfig, *this) { } -nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_algn_rom_device(mconfig, NES_ALGN_ROM, tag, owner, clock) { } -nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_algn_rom_device(mconfig, NES_ALGQ_ROM, tag, owner, clock) , m_bank_base(0) { @@ -263,7 +263,7 @@ void nes_algq_rom_device::write_prg(uint32_t offset, uint8_t data) DEFINE_DEVICE_TYPE(NES_ALADDIN, nes_aladdin_device, "nes_aladdin", "NES Cart Camerica Aladdin PCB") -nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_ALADDIN, tag, owner, clock) , m_subslot(*this, "ade_slot") { diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index 170649fdd30..f9891c5700a 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -52,7 +52,7 @@ public: // construction/destruction template <typename T> nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts) - : nes_aladdin_slot_device(mconfig, tag, owner, (uint32_t)0) + : nes_aladdin_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -60,7 +60,7 @@ public: set_fixed(false); } - nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~nes_aladdin_slot_device(); // image-level overrides @@ -100,7 +100,7 @@ class nes_algn_rom_device : public device_t, { public: // construction/destruction - nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_algn_rom_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; @@ -108,7 +108,7 @@ public: virtual void write_prg(uint32_t offset, uint8_t data) override; protected: - nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_algn_rom_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; @@ -122,7 +122,7 @@ class nes_algq_rom_device : public nes_algn_rom_device { public: // construction/destruction - nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void write_prg(uint32_t offset, uint8_t data) override; @@ -152,7 +152,7 @@ class nes_aladdin_device : public nes_nrom_device { public: // construction/destruction - nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_h(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index f0f1196191c..d88468f2767 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -38,17 +38,17 @@ DEFINE_DEVICE_TYPE(NES_NINA006, nes_nina006_device, "nes_nina006", "NES Cart AVE DEFINE_DEVICE_TYPE(NES_MAXI15, nes_maxi15_device, "nes_maxi15", "NES Cart AVE Maxi 15 PCB") -nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NINA001, tag, owner, clock) { } -nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NINA006, tag, owner, clock) { } -nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_MAXI15, tag, owner, clock) { } diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h index b21a99ac4f2..3e447d15d7b 100644 --- a/src/devices/bus/nes/ave.h +++ b/src/devices/bus/nes/ave.h @@ -14,7 +14,7 @@ class nes_nina001_device : public nes_nrom_device { public: // construction/destruction - nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; }; @@ -26,7 +26,7 @@ class nes_nina006_device : public nes_nrom_device { public: // construction/destruction - nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; }; @@ -38,7 +38,7 @@ class nes_maxi15_device : public nes_nrom_device { public: // construction/destruction - nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 5954aacff62..26e6c5c6489 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -56,47 +56,47 @@ DEFINE_DEVICE_TYPE(NES_LZ93D50_24C02, nes_lz93d50_24c02_device, "nes_lz93d50_ep2 DEFINE_DEVICE_TYPE(NES_FJUMP2, nes_fjump2_device, "nes_fjump2", "NES Cart Bandai Famicom Jump II PCB") -nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_OEKAKIDS, tag, owner, clock), m_reg(0), m_latch(0) { } -nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fcg_device(mconfig, NES_FCG, tag, owner, clock) { } -nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_fcg_device(mconfig, type, tag, owner, clock) { } -nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_device(mconfig, NES_LZ93D50, tag, owner, clock) { } -nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_device(mconfig, type, tag, owner, clock), m_i2cmem(*this, "i2cmem"), m_i2c_dir(0) { } -nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_24c01_device(mconfig, NES_LZ93D50_24C01, tag, owner, clock) { } -nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_24c01_device(mconfig, NES_LZ93D50_24C02, tag, owner, clock) { } -nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_device(mconfig, NES_FJUMP2, tag, owner, clock) { } diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h index 1a21f8a3052..6e5308fd158 100644 --- a/src/devices/bus/nes/bandai.h +++ b/src/devices/bus/nes/bandai.h @@ -15,7 +15,7 @@ class nes_oekakids_device : public nes_nrom_device { public: // construction/destruction - nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual uint8_t nt_r(offs_t offset) override; @@ -43,7 +43,7 @@ class nes_fcg_device : public nes_nrom_device { public: // construction/destruction - nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void fcg_write(offs_t offset, uint8_t data); virtual void write_m(offs_t offset, uint8_t data) override; @@ -51,7 +51,7 @@ public: virtual void pcb_reset() override; protected: - nes_fcg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_fcg_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; @@ -71,12 +71,12 @@ class nes_lz93d50_device : public nes_fcg_device { public: // construction/destruction - nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override { fcg_write(offset, data); } protected: - nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -86,7 +86,7 @@ class nes_lz93d50_24c01_device : public nes_lz93d50_device { public: // construction/destruction - nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -94,7 +94,7 @@ public: virtual void pcb_reset() override; protected: - nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_lz93d50_24c01_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; @@ -113,7 +113,7 @@ class nes_lz93d50_24c02_device : public nes_lz93d50_24c01_device { public: // construction/destruction - nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -127,7 +127,7 @@ class nes_fjump2_device : public nes_lz93d50_device { public: // construction/destruction - nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/batlab.cpp b/src/devices/bus/nes/batlab.cpp index e117e6fbf5e..ae4643effca 100644 --- a/src/devices/bus/nes/batlab.cpp +++ b/src/devices/bus/nes/batlab.cpp @@ -37,12 +37,12 @@ DEFINE_DEVICE_TYPE(NES_BATMAP_000, nes_batmap_000_device, "nes_batmap_000", " DEFINE_DEVICE_TYPE(NES_BATMAP_SRRX, nes_batmap_srrx_device, "nes_batmap_srrx", "NES Cart Batlab BATMAP-SRR-X PCB") -nes_batmap_000_device::nes_batmap_000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_batmap_000_device::nes_batmap_000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BATMAP_000, tag, owner, clock) { } -nes_batmap_srrx_device::nes_batmap_srrx_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_batmap_srrx_device::nes_batmap_srrx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BATMAP_SRRX, tag, owner, clock), m_reg(0), m_dpcm_addr(0), m_dpcm_ctrl(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) { } diff --git a/src/devices/bus/nes/batlab.h b/src/devices/bus/nes/batlab.h index 9861afe8a87..2a5e2f09ea1 100644 --- a/src/devices/bus/nes/batlab.h +++ b/src/devices/bus/nes/batlab.h @@ -14,7 +14,7 @@ class nes_batmap_000_device : public nes_txrom_device { public: // construction/destruction - nes_batmap_000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_batmap_000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -28,7 +28,7 @@ class nes_batmap_srrx_device : public nes_nrom_device { public: // construction/destruction - nes_batmap_srrx_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_batmap_srrx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual u8 read_m(offs_t offset) override; diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp index 9fadad83386..5284b8a45a9 100644 --- a/src/devices/bus/nes/benshieng.cpp +++ b/src/devices/bus/nes/benshieng.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(NES_BENSHIENG, nes_benshieng_device, "nes_benshieng", "NES Cart Benshieng PCB") -nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BENSHIENG, tag, owner, clock), m_dipsetting(0) { } diff --git a/src/devices/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h index 2292b57a270..92d5bdfe11e 100644 --- a/src/devices/bus/nes/benshieng.h +++ b/src/devices/bus/nes/benshieng.h @@ -14,7 +14,7 @@ class nes_benshieng_device : public nes_nrom_device { public: // construction/destruction - nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index c0ac3e1a35c..5ae2aa88406 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -72,167 +72,167 @@ DEFINE_DEVICE_TYPE(NES_RT01, nes_rt01_device, "nes_rt01", "N DEFINE_DEVICE_TYPE(NES_YUNG08, nes_yung08_device, "nes_yung08", "NES Cart Super Mario Bros. 2 YUNG-08 PCB") -nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SC127, tag, owner, clock), m_irq_count(0), m_irq_enable(0) { } -nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_MARIOBABY, tag, owner, clock), m_irq_count(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr) { } -nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_ASN, tag, owner, clock), m_latch(0) { } -nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SMB3PIRATE, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_btl_cj_device::nes_btl_cj_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_btl_cj_device::nes_btl_cj_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BTL_CONTRAJ, tag, owner, clock) { } -nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BTL_DNINJA, tag, owner, clock), m_irq_count(0) { } -nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SMB2J, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SMB2JA, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 bank67) +nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 bank67) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), m_reg(0), m_bank67(bank67), irq_timer(nullptr) { } -nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_smb2jb_device(mconfig, NES_SMB2JB, tag, owner, clock, 0x0f) { } -nes_n32_4in1_device::nes_n32_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_n32_4in1_device::nes_n32_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_smb2jb_device(mconfig, NES_N32_4IN1, tag, owner, clock, 0x07) { } -nes_0353_device::nes_0353_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_0353_device::nes_0353_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_0353, tag, owner, clock), m_reg(0) { } -nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_09034A, tag, owner, clock), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr) { } -nes_l001_device::nes_l001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_l001_device::nes_l001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_L001, tag, owner, clock), m_irq_count(0), irq_timer(nullptr) { } -nes_batmanfs_device::nes_batmanfs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_batmanfs_device::nes_batmanfs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BATMANFS, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_palthena_device::nes_palthena_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_palthena_device::nes_palthena_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_PALTHENA, tag, owner, clock), m_reg(0) { } -nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TOBIDASE, tag, owner, clock), m_latch(0) { } -nes_whirlwind_device::nes_whirlwind_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_whirlwind_device::nes_whirlwind_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_reg(0) { } -nes_dh08_device::nes_dh08_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_dh08_device::nes_dh08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_whirlwind_device(mconfig, NES_DH08, tag, owner, clock) { } -nes_le05_device::nes_le05_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_le05_device::nes_le05_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_whirlwind_device(mconfig, NES_LE05, tag, owner, clock) { } -nes_lh28_lh54_device::nes_lh28_lh54_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lh28_lh54_device::nes_lh28_lh54_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_whirlwind_device(mconfig, NES_LH28_LH54, tag, owner, clock) { } -nes_lh31_device::nes_lh31_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lh31_device::nes_lh31_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_whirlwind_device(mconfig, NES_LH31, tag, owner, clock) { } -nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LH32, tag, owner, clock), m_latch(0) { } -nes_lh42_device::nes_lh42_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lh42_device::nes_lh42_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LH42, tag, owner, clock), m_latch(0) { } -nes_lg25_device::nes_lg25_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lg25_device::nes_lg25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LG25, tag, owner, clock), m_latch(0) { } -nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LH10, tag, owner, clock), m_latch(0) { } -nes_lh51_device::nes_lh51_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lh51_device::nes_lh51_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LH51, tag, owner, clock) { } -nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LH53, tag, owner, clock), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr) { } -nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_2708, tag, owner, clock) { } -nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_AC08, tag, owner, clock), m_latch(0) { } -nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_MMALEE, tag, owner, clock) { } -nes_rt01_device::nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_rt01_device::nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_RT01, tag, owner, clock) { } -nes_yung08_device::nes_yung08_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_yung08_device::nes_yung08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_YUNG08, tag, owner, clock), m_irq_count(0), m_irq_latch(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h index 93cdaa2ec6f..0fbcef72aa0 100644 --- a/src/devices/bus/nes/bootleg.h +++ b/src/devices/bus/nes/bootleg.h @@ -12,7 +12,7 @@ class nes_sc127_device : public nes_nrom_device { public: // construction/destruction - nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void hblank_irq(int scanline, bool vblank, bool blanked) override; @@ -34,7 +34,7 @@ class nes_mbaby_device : public nes_nrom_device { public: // construction/destruction - nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -62,7 +62,7 @@ class nes_asn_device : public nes_nrom_device { public: // construction/destruction - nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -84,7 +84,7 @@ class nes_smb3p_device : public nes_nrom_device { public: // construction/destruction - nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -111,7 +111,7 @@ class nes_btl_cj_device : public nes_nrom_device { public: // construction/destruction - nes_btl_cj_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_btl_cj_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; @@ -124,7 +124,7 @@ class nes_btl_dn_device : public nes_nrom_device { public: // construction/destruction - nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void hblank_irq(int scanline, bool vblank, bool blanked) override; @@ -145,7 +145,7 @@ class nes_smb2j_device : public nes_nrom_device { public: // construction/destruction - nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual u8 read_m(offs_t offset) override; @@ -177,7 +177,7 @@ class nes_smb2ja_device : public nes_nrom_device { public: // construction/destruction - nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -204,7 +204,7 @@ class nes_smb2jb_device : public nes_nrom_device { public: // construction/destruction - nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -213,7 +213,7 @@ public: virtual void pcb_reset() override; protected: - nes_smb2jb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 bank67); + nes_smb2jb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 bank67); // device-level overrides virtual void device_start() override; @@ -238,7 +238,7 @@ class nes_n32_4in1_device : public nes_smb2jb_device { public: // construction/destruction - nes_n32_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_n32_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -252,7 +252,7 @@ class nes_0353_device : public nes_nrom_device { public: // construction/destruction - nes_0353_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_0353_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -274,7 +274,7 @@ class nes_09034a_device : public nes_nrom_device { public: // construction/destruction - nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_ex(offs_t offset, u8 data) override; virtual u8 read_ex(offs_t offset) override; @@ -303,7 +303,7 @@ class nes_l001_device : public nes_nrom_device { public: // construction/destruction - nes_l001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_l001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -328,7 +328,7 @@ class nes_batmanfs_device : public nes_nrom_device { public: // construction/destruction - nes_batmanfs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_batmanfs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -354,7 +354,7 @@ class nes_palthena_device : public nes_nrom_device { public: // construction/destruction - nes_palthena_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_palthena_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; @@ -378,7 +378,7 @@ class nes_tobidase_device : public nes_nrom_device { public: // construction/destruction - nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -405,7 +405,7 @@ public: protected: // construction/destruction - nes_whirlwind_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_whirlwind_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; @@ -420,7 +420,7 @@ class nes_dh08_device : public nes_whirlwind_device { public: // construction/destruction - nes_dh08_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_dh08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -432,7 +432,7 @@ class nes_le05_device : public nes_whirlwind_device { public: // construction/destruction - nes_le05_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_le05_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -444,7 +444,7 @@ class nes_lh28_lh54_device : public nes_whirlwind_device { public: // construction/destruction - nes_lh28_lh54_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lh28_lh54_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -456,7 +456,7 @@ class nes_lh31_device : public nes_whirlwind_device { public: // construction/destruction - nes_lh31_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lh31_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -468,7 +468,7 @@ class nes_lh32_device : public nes_nrom_device { public: // construction/destruction - nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; @@ -492,7 +492,7 @@ class nes_lh42_device : public nes_nrom_device { public: // construction/destruction - nes_lh42_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lh42_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -513,7 +513,7 @@ class nes_lg25_device : public nes_nrom_device { public: // construction/destruction - nes_lg25_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lg25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -534,7 +534,7 @@ class nes_lh10_device : public nes_nrom_device { public: // construction/destruction - nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual u8 read_m(offs_t offset) override; @@ -557,7 +557,7 @@ class nes_lh51_device : public nes_nrom_device { public: // construction/destruction - nes_lh51_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lh51_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -571,7 +571,7 @@ class nes_lh53_device : public nes_nrom_device { public: // construction/destruction - nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; @@ -602,7 +602,7 @@ class nes_2708_device : public nes_nrom_device { public: // construction/destruction - nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; @@ -626,7 +626,7 @@ class nes_ac08_device : public nes_nrom_device { public: // nes_ac08_device/destruction - nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_ex(offs_t offset, uint8_t data) override; @@ -649,7 +649,7 @@ class nes_mmalee_device : public nes_nrom_device { public: // construction/destruction - nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -662,7 +662,7 @@ class nes_rt01_device : public nes_nrom_device { public: // construction/destruction - nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_h(offs_t offset) override; @@ -676,7 +676,7 @@ class nes_yung08_device : public nes_nrom_device { public: // construction/destruction - nes_yung08_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_yung08_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual u8 read_m(offs_t offset) override; diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index fd80dca08b0..577f2bce2aa 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -46,27 +46,27 @@ DEFINE_DEVICE_TYPE(NES_BF9096A, nes_bf9096a_device, "nes_bf9096a", "NES Cart Cam DEFINE_DEVICE_TYPE(NES_GOLDEN5, nes_golden5_device, "nes_golden5", "NES Cart Camerica Golden 5 PCB") -nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BF9093, tag, owner, clock) { } -nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool page_swap) +nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool page_swap) : nes_nrom_device(mconfig, type, tag, owner, clock), m_reg(0), m_page_swap(page_swap) { } -nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bf9096_device(mconfig, NES_BF9096, tag, owner, clock, false) { } -nes_bf9096a_device::nes_bf9096a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bf9096a_device::nes_bf9096a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bf9096_device(mconfig, NES_BF9096A, tag, owner, clock, true) { } -nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_GOLDEN5, tag, owner, clock), m_lock(0), m_reg(0) { } diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h index 0c2c2487361..9a060383dff 100644 --- a/src/devices/bus/nes/camerica.h +++ b/src/devices/bus/nes/camerica.h @@ -14,7 +14,7 @@ class nes_bf9093_device : public nes_nrom_device { public: // construction/destruction - nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -28,14 +28,14 @@ class nes_bf9096_device : public nes_nrom_device { public: // construction/destruction - nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; protected: - nes_bf9096_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool page_swap); + nes_bf9096_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool page_swap); // device-level overrides virtual void device_start() override; @@ -52,7 +52,7 @@ class nes_bf9096a_device : public nes_bf9096_device { public: // construction/destruction - nes_bf9096a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bf9096a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -62,7 +62,7 @@ class nes_golden5_device : public nes_nrom_device { public: // construction/destruction - nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp index 8300c56928c..f78c69ad698 100644 --- a/src/devices/bus/nes/cne.cpp +++ b/src/devices/bus/nes/cne.cpp @@ -37,17 +37,17 @@ DEFINE_DEVICE_TYPE(NES_CNE_FSB, nes_cne_fsb_device, "nes_cne_fsb", "NES DEFINE_DEVICE_TYPE(NES_CNE_SHLZ, nes_cne_shlz_device, "nes_cne_shlz", "NES Cart C&E Sheng Huo Lie Zhuan PCB") -nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CNE_DECATHL, tag, owner, clock) { } -nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CNE_FSB, tag, owner, clock) { } -nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CNE_SHLZ, tag, owner, clock) { } diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h index 9e704443503..be3765c88e0 100644 --- a/src/devices/bus/nes/cne.h +++ b/src/devices/bus/nes/cne.h @@ -14,7 +14,7 @@ class nes_cne_decathl_device : public nes_nrom_device { public: // construction/destruction - nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -26,7 +26,7 @@ class nes_cne_fsb_device : public nes_nrom_device { public: // construction/destruction - nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -41,7 +41,7 @@ class nes_cne_shlz_device : public nes_nrom_device { public: // construction/destruction - nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; }; diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index 3e73f35a4bf..d174cf8406b 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -36,22 +36,22 @@ DEFINE_DEVICE_TYPE(NES_CONY1K, nes_cony1k_device, "nes_cony1k", "NES Cart Cony 1 DEFINE_DEVICE_TYPE(NES_YOKO, nes_yoko_device, "nes_yoko", "NES Cart Yoko PCB") -nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u16 extra_addr, u8 mask) +nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u16 extra_addr, u8 mask) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_extra_addr(extra_addr), m_mask(mask), m_mode_reg(0), m_outer_reg(0) { } -nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_cony_device(mconfig, NES_CONY, tag, owner, clock, 0x1100, 0x1f) { } -nes_cony1k_device::nes_cony1k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cony1k_device::nes_cony1k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_cony_device(mconfig, NES_CONY1K, tag, owner, clock, 0x1100, 0x1f) { } -nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_cony_device(mconfig, NES_YOKO, tag, owner, clock, 0x1400, 0x0f) { } diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index 8f2faea4a40..ebdfb615526 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -14,7 +14,7 @@ class nes_cony_device : public nes_nrom_device { public: // construction/destruction - nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual u8 read_m(offs_t offset) override; @@ -26,7 +26,7 @@ public: protected: // construction/destruction - nes_cony_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u16 extra_addr, u8 mask); + nes_cony_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u16 extra_addr, u8 mask); // device-level overrides virtual void device_start() override; @@ -57,7 +57,7 @@ class nes_cony1k_device : public nes_cony_device { public: // construction/destruction - nes_cony1k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cony1k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void set_chr() override; }; @@ -69,7 +69,7 @@ class nes_yoko_device : public nes_cony_device { public: // construction/destruction - nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index 5e71e0af6bc..a99de3a4063 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -66,7 +66,7 @@ uint8_t datach_cart_interface::read(offs_t offset) DEFINE_DEVICE_TYPE(NES_DATACH_SLOT, nes_datach_slot_device, "nes_datach_slot", "NES Datach Cartridge Slot") -nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_DATACH_SLOT, tag, owner, clock) , device_cartrom_image_interface(mconfig, *this) , device_single_card_slot_interface<datach_cart_interface>(mconfig, *this) @@ -162,18 +162,18 @@ ROM_END DEFINE_DEVICE_TYPE(NES_DATACH_ROM, nes_datach_rom_device, "nes_datach_rom", "NES Datach ROM") DEFINE_DEVICE_TYPE(NES_DATACH_24C01, nes_datach_24c01_device, "nes_datach_ep1", "NES Datach + 24C01 PCB") -nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , datach_cart_interface(mconfig, *this) { } -nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_datach_rom_device(mconfig, NES_DATACH_ROM, tag, owner, clock) { } -nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_datach_rom_device(mconfig, NES_DATACH_24C01, tag, owner, clock) { } @@ -216,7 +216,7 @@ void nes_datach_24c01_device::device_add_mconfig(machine_config &config) DEFINE_DEVICE_TYPE(NES_DATACH, nes_datach_device, "nes_datach", "NES Cart Bandai Datach PCB") -nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_lz93d50_device(mconfig, NES_DATACH, tag, owner, clock) , m_datach_latch(0) , m_i2cmem(*this, "i2cmem") @@ -370,7 +370,7 @@ static void datach_cart(device_slot_interface &device) void nes_datach_device::device_add_mconfig(machine_config &config) { - BARCODE_READER(config, m_reader, 0); + BARCODE_READER(config, m_reader); NES_DATACH_SLOT(config, m_subslot, 0, datach_cart); I2C_24C02(config, m_i2cmem); } diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index 80770904596..362654708ca 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -53,7 +53,7 @@ class nes_datach_slot_device : public device_t, public: // construction/destruction template <typename T> - nes_datach_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&opts) + nes_datach_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&opts) : nes_datach_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -61,7 +61,7 @@ public: set_default_option(nullptr); set_fixed(false); } - nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~nes_datach_slot_device(); // image-level overrides @@ -100,14 +100,14 @@ class nes_datach_rom_device : public device_t, public datach_cart_interface { public: // construction/destruction - nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_datach_rom_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; virtual uint8_t* get_cart_base(); protected: - nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_datach_rom_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; @@ -120,7 +120,7 @@ class nes_datach_24c01_device : public nes_datach_rom_device { public: // construction/destruction - nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -144,7 +144,7 @@ class nes_datach_device : public nes_lz93d50_device { public: // construction/destruction - nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp index 5b047a2daad..19b23431d45 100644 --- a/src/devices/bus/nes/discrete.cpp +++ b/src/devices/bus/nes/discrete.cpp @@ -38,22 +38,22 @@ DEFINE_DEVICE_TYPE(NES_74X377, nes_74x377_device, "nes_74x377", DEFINE_DEVICE_TYPE(NES_74X161X138, nes_74x161x138_device, "nes_bitcorp_dis", "NES Cart Discrete Logic (74*161/138) PCB") -nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_74X161X161X32, tag, owner, clock) { } -nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_74X139X74, tag, owner, clock) { } -nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_74X377, tag, owner, clock) { } -nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_74X161X138, tag, owner, clock) { } diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h index ec3ad88d824..4d99f881856 100644 --- a/src/devices/bus/nes/discrete.h +++ b/src/devices/bus/nes/discrete.h @@ -14,7 +14,7 @@ class nes_74x161x161x32_device : public nes_nrom_device { public: // construction/destruction - nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -28,7 +28,7 @@ class nes_74x139x74_device : public nes_nrom_device { public: // construction/destruction - nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; }; @@ -40,7 +40,7 @@ class nes_74x377_device : public nes_nrom_device { public: // construction/destruction - nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -52,7 +52,7 @@ class nes_74x161x138_device : public nes_nrom_device { public: // construction/destruction - nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; }; diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index d53a2be2aab..618fb0352fb 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -101,7 +101,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image) DEFINE_DEVICE_TYPE(NES_DISKSYS, nes_disksys_device, "fc_disksys", "FC RAM Expansion + Disk System PCB") -nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_DISKSYS, tag, owner, clock) , m_2c33_rom(*this, "drive") , m_fds_data(nullptr) diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h index 021be514029..99d8bff849c 100644 --- a/src/devices/bus/nes/disksys.h +++ b/src/devices/bus/nes/disksys.h @@ -16,7 +16,7 @@ class nes_disksys_device : public nes_nrom_device { public: // construction/destruction - nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_ex(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override; diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index 70aee4b90e0..dd30b5a64d4 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(NES_EVENT, nes_event_device, "nes_event", "NES Cart EVENT DEFINE_DEVICE_TYPE(NES_EVENT2, nes_event2_device, "nes_event2", "NES Cart EVENT2 PCB") -nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_EVENT, tag, owner, clock) , m_dsw(*this, "DIPSW") , m_nwc_init(0) @@ -46,7 +46,7 @@ nes_event_device::nes_event_device(const machine_config &mconfig, const char *ta { } -nes_event2_device::nes_event2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_event2_device::nes_event2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tqrom_device(mconfig, NES_EVENT2, tag, owner, clock) , m_dsw(*this, "DIPSW") , m_tqrom_mode(false) diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h index b10a3f95ee1..bb73beacd4f 100644 --- a/src/devices/bus/nes/event.h +++ b/src/devices/bus/nes/event.h @@ -15,7 +15,7 @@ class nes_event_device : public nes_sxrom_device { public: // construction/destruction - nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; @@ -45,7 +45,7 @@ class nes_event2_device : public nes_tqrom_device { public: // construction/destruction - nes_event2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_event2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index bddebcad512..b925a5d35d2 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(NES_GGENIE, nes_ggenie_device, "nes_ggenie", "NES Cart Game Genie PCB") -nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_GGENIE, tag, owner, clock) , m_ggslot(*this, "gg_slot") , m_gg_bypass(false) diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h index 6370301d19a..99b58770cc0 100644 --- a/src/devices/bus/nes/ggenie.h +++ b/src/devices/bus/nes/ggenie.h @@ -14,7 +14,7 @@ class nes_ggenie_device : public nes_nrom_device { public: // construction/destruction - nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual u8 read_m(offs_t offset) override; diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index a8de6e93783..243a2d0ea24 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -39,12 +39,12 @@ DEFINE_DEVICE_TYPE(NES_HENGG_SRICH, nes_hengg_srich_device, "nes_hengg_srich", " DEFINE_DEVICE_TYPE(NES_HENGG_XHZS, nes_hengg_xhzs_device, "nes_hengg_xhzs", "NES Cart Henggedianzi Xing He Zhan Shi PCB") -nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_HENGG_SRICH, tag, owner, clock) { } -nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_HENGG_XHZS, tag, owner, clock) { } diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h index fc5922a1c4e..3d5d8695dce 100644 --- a/src/devices/bus/nes/henggedianzi.h +++ b/src/devices/bus/nes/henggedianzi.h @@ -14,7 +14,7 @@ class nes_hengg_srich_device : public nes_nrom_device { public: // construction/destruction - nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -26,7 +26,7 @@ class nes_hengg_xhzs_device : public nes_nrom_device { public: // construction/destruction - nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp index b23ad6c9f74..9a6a3d3e630 100644 --- a/src/devices/bus/nes/hes.cpp +++ b/src/devices/bus/nes/hes.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(NES_HES, nes_hes_device, "nes_hes", "NES Cart HES PCB") -nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_HES, tag, owner, clock) { } diff --git a/src/devices/bus/nes/hes.h b/src/devices/bus/nes/hes.h index 24577f416cb..d0a36c5f4d4 100644 --- a/src/devices/bus/nes/hes.h +++ b/src/devices/bus/nes/hes.h @@ -14,7 +14,7 @@ class nes_hes_device : public nes_nrom_device { public: // construction/destruction - nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; }; diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index f90959825a9..ecd40733114 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -40,32 +40,32 @@ DEFINE_DEVICE_TYPE(NES_G101, nes_g101_device, "nes_g101", "NES Cart DEFINE_DEVICE_TYPE(NES_H3001, nes_h3001_device, "ns_h3001", "NES Cart Irem H-3001 PCB") -nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_LROG017, tag, owner, clock) { } -nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_HOLYDIVR, tag, owner, clock) { } -nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TAM_S1, tag, owner, clock) { } -nes_g101_device::nes_g101_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 prg_mask) +nes_g101_device::nes_g101_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 prg_mask) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_reg(0), m_prg_mask(prg_mask) { } -nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_g101_device(mconfig, NES_G101, tag, owner, clock, 0x1f) { } -nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_g101_device(mconfig, NES_H3001, tag, owner, clock, 0x3f), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h index eef809ca7b5..088bf52239d 100644 --- a/src/devices/bus/nes/irem.h +++ b/src/devices/bus/nes/irem.h @@ -14,7 +14,7 @@ class nes_lrog017_device : public nes_nrom_device { public: // construction/destruction - nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -28,7 +28,7 @@ class nes_holydivr_device : public nes_nrom_device { public: // construction/destruction - nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -42,7 +42,7 @@ class nes_tam_s1_device : public nes_nrom_device { public: // construction/destruction - nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -56,7 +56,7 @@ class nes_g101_device : public nes_nrom_device { public: // construction/destruction - nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -64,7 +64,7 @@ public: protected: // construction/destruction - nes_g101_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 prg_mask); + nes_g101_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 prg_mask); // device-level overrides virtual void device_start() override; @@ -84,7 +84,7 @@ class nes_h3001_device : public nes_g101_device { public: // construction/destruction - nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index a83ebfb5a04..6375e17615b 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -51,23 +51,23 @@ DEFINE_DEVICE_TYPE(NES_JF29, nes_jf29_device, "nes_jf29", "NES C DEFINE_DEVICE_TYPE(NES_JF33, nes_jf33_device, "nes_jf33", "NES Cart Jaleco JF-33 (Moe Pro! Saikyou-hen) PCB") -nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JF11, tag, owner, clock) { } -nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JF13, tag, owner, clock) , m_samples(*this, "samples") { } -nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JF16, tag, owner, clock) { } -nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool prg_flip) +nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool prg_flip) : nes_nrom_device(mconfig, type, tag, owner, clock) , m_samples(*this, "samples") , m_latch(0) @@ -75,27 +75,27 @@ nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type { } -nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jf17_device(mconfig, NES_JF17, tag, owner, clock, false) { } -nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jf17_device(mconfig, NES_JF17_ADPCM, tag, owner, clock, false) { } -nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jf17_device(mconfig, NES_JF19, tag, owner, clock, true) { } -nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jf17_device(mconfig, NES_JF19_ADPCM, tag, owner, clock, true) { } -nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock) , m_samples(*this, "samples") , m_irq_count(0) @@ -107,27 +107,27 @@ nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_typ { } -nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ss88006_device(mconfig, NES_SS88006, tag, owner, clock) { } -nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ss88006_device(mconfig, NES_JF23, tag, owner, clock) { } -nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ss88006_device(mconfig, NES_JF24, tag, owner, clock) { } -nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ss88006_device(mconfig, NES_JF29, tag, owner, clock) { } -nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ss88006_device(mconfig, NES_JF33, tag, owner, clock) { } diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index 7ed1b13d25a..134af0bd4d5 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -15,7 +15,7 @@ class nes_jf11_device : public nes_nrom_device { public: // construction/destruction - nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; }; @@ -27,7 +27,7 @@ class nes_jf13_device : public nes_nrom_device { public: // construction/destruction - nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -46,7 +46,7 @@ class nes_jf16_device : public nes_nrom_device { public: // construction/destruction - nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -60,14 +60,14 @@ class nes_jf17_device : public nes_nrom_device { public: // construction/destruction - nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; protected: - nes_jf17_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool m_prg_flip); + nes_jf17_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool m_prg_flip); // device-level overrides virtual void device_start() override; @@ -86,7 +86,7 @@ class nes_jf17_adpcm_device : public nes_jf17_device { public: // construction/destruction - nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -99,7 +99,7 @@ class nes_jf19_device : public nes_jf17_device { public: // construction/destruction - nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -109,7 +109,7 @@ class nes_jf19_adpcm_device : public nes_jf17_device { public: // construction/destruction - nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -122,7 +122,7 @@ class nes_ss88006_device : public nes_nrom_device { public: // construction/destruction - nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -131,7 +131,7 @@ public: virtual void pcb_reset() override; protected: - nes_ss88006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_ss88006_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; @@ -159,7 +159,7 @@ class nes_jf23_device : public nes_ss88006_device { public: // construction/destruction - nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -172,7 +172,7 @@ class nes_jf24_device : public nes_ss88006_device { public: // construction/destruction - nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -185,7 +185,7 @@ class nes_jf29_device : public nes_ss88006_device { public: // construction/destruction - nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -198,7 +198,7 @@ class nes_jf33_device : public nes_ss88006_device { public: // construction/destruction - nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nes/jncota.cpp b/src/devices/bus/nes/jncota.cpp index 1206a0dd79b..f81068b60ab 100644 --- a/src/devices/bus/nes/jncota.cpp +++ b/src/devices/bus/nes/jncota.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(NES_JNCOTA_KT1001, nes_jncota_kt1001_device, "nes_jncota_kt1001", "NES Cart Shenzhen Jncota KT-1001 PCB") -nes_jncota_kt1001_device::nes_jncota_kt1001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jncota_kt1001_device::nes_jncota_kt1001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JNCOTA_KT1001, tag, owner, clock) { } diff --git a/src/devices/bus/nes/jncota.h b/src/devices/bus/nes/jncota.h index 441e6723969..3e8af2e0257 100644 --- a/src/devices/bus/nes/jncota.h +++ b/src/devices/bus/nes/jncota.h @@ -14,7 +14,7 @@ class nes_jncota_kt1001_device : public nes_nrom_device { public: // construction/destruction - nes_jncota_kt1001_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jncota_kt1001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 655634f22ef..2c8553a05c1 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -41,28 +41,28 @@ DEFINE_DEVICE_TYPE(NES_JY_TYPEB, nes_jy_typeb_device, "nes_jyb", "NES Cart JY Co DEFINE_DEVICE_TYPE(NES_JY_TYPEC, nes_jy_typec_device, "nes_jyc", "NES Cart JY Company Type C PCB") -nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr) { } -nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JY_TYPEA, tag, owner, clock) { } -nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_jy_typea_device(mconfig, type, tag, owner, clock) { } -nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jy_typeb_device(mconfig, NES_JY_TYPEB, tag, owner, clock) { } -nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_jy_typeb_device(mconfig, NES_JY_TYPEC, tag, owner, clock) { } diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index 69c4ea8b04e..99db06bfe17 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -14,7 +14,7 @@ class nes_jy_typea_device : public nes_nrom_device { public: // construction/destruction - nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override; @@ -28,7 +28,7 @@ public: virtual void pcb_reset() override; protected: - nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_jy_typea_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; @@ -73,10 +73,10 @@ class nes_jy_typeb_device : public nes_jy_typea_device { public: // construction/destruction - nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); void update_mirror_typeb(); virtual void update_mirror() override { update_mirror_typeb(); } @@ -88,7 +88,7 @@ class nes_jy_typec_device : public nes_jy_typeb_device { public: // construction/destruction - nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t chr_r(offs_t offset) override; diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 4635c699895..a69a058f304 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -63,92 +63,92 @@ DEFINE_DEVICE_TYPE(NES_KS7057, nes_ks7057_device, "nes_ks7057", "NES Cart Kai DEFINE_DEVICE_TYPE(NES_KS7058, nes_ks7058_device, "nes_ks7058", "NES Cart Kaiser KS-7058 PCB") -nes_ks106c_device::nes_ks106c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks106c_device::nes_ks106c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS106C, tag, owner, clock), m_latch(0) { } -nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7058, tag, owner, clock) { } -nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7022, tag, owner, clock), m_latch(0) { } -nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ks7032_device(mconfig, NES_KS7032, tag, owner, clock) { } -nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ks7032_device(mconfig, NES_KS202, tag, owner, clock) { } -nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 a15_flip) +nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 a15_flip) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_a15_flip(a15_flip) { } -nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ks7016_device(mconfig, NES_KS7016, tag, owner, clock, 0x00) { } -nes_ks7016b_device::nes_ks7016b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7016b_device::nes_ks7016b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ks7016_device(mconfig, NES_KS7016B, tag, owner, clock, 0x04) { } -nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7017, tag, owner, clock), m_latch(0), m_irq_count(0), m_irq_status(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ks7021a_device::nes_ks7021a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7021a_device::nes_ks7021a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7021A, tag, owner, clock) { } -nes_ks7010_device::nes_ks7010_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7010_device::nes_ks7010_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7010, tag, owner, clock), m_latch(0) { } -nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7012, tag, owner, clock) { } -nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7013B, tag, owner, clock) { } -nes_ks7030_device::nes_ks7030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7030_device::nes_ks7030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7030, tag, owner, clock) { } -nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7031, tag, owner, clock) { } -nes_ks7037_device::nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7037_device::nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7037, tag, owner, clock), m_reg(0) { } -nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KS7057, tag, owner, clock) { } diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index bfed01f40f9..e01a8e51446 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -14,7 +14,7 @@ class nes_ks106c_device : public nes_nrom_device { public: // construction/destruction - nes_ks106c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks106c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; @@ -33,7 +33,7 @@ class nes_ks7058_device : public nes_nrom_device { public: // construction/destruction - nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -45,7 +45,7 @@ class nes_ks7022_device : public nes_nrom_device { public: // construction/destruction - nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -67,7 +67,7 @@ class nes_ks7032_device : public nes_nrom_device { public: // construction/destruction - nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -76,7 +76,7 @@ public: protected: // construction/destruction - nes_ks7032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_ks7032_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; @@ -102,7 +102,7 @@ class nes_ks202_device : public nes_ks7032_device { public: // construction/destruction - nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -115,7 +115,7 @@ class nes_ks7016_device : public nes_nrom_device { public: // construction/destruction - nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -124,7 +124,7 @@ public: protected: // construction/destruction - nes_ks7016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 a15_flip); + nes_ks7016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 a15_flip); // device-level overrides virtual void device_start() override; @@ -141,7 +141,7 @@ class nes_ks7016b_device : public nes_ks7016_device { public: // construction/destruction - nes_ks7016b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7016b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -151,7 +151,7 @@ class nes_ks7017_device : public nes_nrom_device { public: // construction/destruction - nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_ex(offs_t offset) override; virtual void write_ex(offs_t offset, u8 data) override; @@ -182,7 +182,7 @@ class nes_ks7021a_device : public nes_nrom_device { public: // construction/destruction - nes_ks7021a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7021a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -196,7 +196,7 @@ class nes_ks7010_device : public nes_nrom_device { public: // construction/destruction - nes_ks7010_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7010_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; @@ -218,7 +218,7 @@ class nes_ks7012_device : public nes_nrom_device { public: // construction/destruction - nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -232,7 +232,7 @@ class nes_ks7013b_device : public nes_nrom_device { public: // construction/destruction - nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -247,7 +247,7 @@ class nes_ks7030_device : public nes_nrom_device { public: // construction/destruction - nes_ks7030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; @@ -271,7 +271,7 @@ class nes_ks7031_device : public nes_nrom_device { public: // construction/destruction - nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; @@ -294,7 +294,7 @@ class nes_ks7037_device : public nes_nrom_device { public: // construction/destruction - nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; @@ -318,7 +318,7 @@ class nes_ks7057_device : public nes_nrom_device { public: // construction/destruction - nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual u8 read_h(offs_t offset) override; diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index 3b8801bbf52..ce734a36183 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -70,7 +70,7 @@ uint8_t kstudio_cart_interface::read(offs_t offset) DEFINE_DEVICE_TYPE(NES_KSEXPANSION_SLOT, nes_kstudio_slot_device, "nes_ks_slot", "NES Karaoke Studio Expansion Slot") -nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_KSEXPANSION_SLOT, tag, owner, clock) , device_cartrom_image_interface(mconfig, *this) , device_single_card_slot_interface<kstudio_cart_interface>(mconfig, *this) @@ -144,7 +144,7 @@ ROM_END DEFINE_DEVICE_TYPE(NES_KSEXPANSION_ROM, nes_kstudio_rom_device, "nes_ks_rom", "NES Karaoke Studio Expansion ROM") -nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_KSEXPANSION_ROM, tag, owner, clock) , kstudio_cart_interface( mconfig, *this ) { @@ -181,7 +181,7 @@ uint8_t *nes_kstudio_rom_device::get_cart_base() DEFINE_DEVICE_TYPE(NES_KARAOKESTUDIO, nes_karaokestudio_device, "nes_karaoke", "NES Cart Bandai Karaoke Studio PCB") -nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KARAOKESTUDIO, tag, owner, clock) , m_exp_active(0) , m_subslot(*this, "exp_slot") diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h index 95ea9b14881..0b2219d7a96 100644 --- a/src/devices/bus/nes/karastudio.h +++ b/src/devices/bus/nes/karastudio.h @@ -51,7 +51,7 @@ public: // construction/destruction template <typename T> nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts) - : nes_kstudio_slot_device(mconfig, tag, owner, (uint32_t)0) + : nes_kstudio_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -59,7 +59,7 @@ public: set_fixed(false); } - nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~nes_kstudio_slot_device(); // image-level overrides @@ -99,7 +99,7 @@ class nes_kstudio_rom_device : public device_t, { public: // construction/destruction - nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_kstudio_rom_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; @@ -127,7 +127,7 @@ class nes_karaokestudio_device : public nes_nrom_device { public: // construction/destruction - nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index 64835930218..498c9cfcef9 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -45,42 +45,42 @@ DEFINE_DEVICE_TYPE(NES_VRC6, nes_konami_vrc6_device, "nes_vrc6", "NES Cart Konam DEFINE_DEVICE_TYPE(NES_VRC7, nes_konami_vrc7_device, "nes_vrc7", "NES Cart Konami VRC-7 PCB") -nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_VRC1, tag, owner, clock) { } -nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0) { } -nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc2_device(mconfig, NES_VRC2, tag, owner, clock) { } -nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_VRC3, tag, owner, clock), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), irq_timer(nullptr) { } -nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_prg_flip(0), m_wram_enable(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr) { } -nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_VRC4, tag, owner, clock) { } -nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_VRC6, tag, owner, clock), m_vrc6snd(*this, "vrc6snd") { } -nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_VRC7, tag, owner, clock), m_vrc7snd(*this, "vrc7snd") { } diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h index ced0f7f4648..f7ec85929e2 100644 --- a/src/devices/bus/nes/konami.h +++ b/src/devices/bus/nes/konami.h @@ -16,7 +16,7 @@ class nes_konami_vrc1_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -37,7 +37,7 @@ class nes_konami_vrc2_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -47,7 +47,7 @@ public: protected: // construction/destruction - nes_konami_vrc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc2_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; @@ -64,7 +64,7 @@ class nes_konami_vrc3_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -91,7 +91,7 @@ class nes_konami_vrc4_device : public nes_nrom_device { public: // construction/destruction - nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -101,7 +101,7 @@ public: protected: // construction/destruction - nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc4_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; @@ -137,7 +137,7 @@ class nes_konami_vrc6_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -156,7 +156,7 @@ class nes_konami_vrc7_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 8625c4fab97..12cc5178d45 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -37,22 +37,22 @@ DEFINE_DEVICE_TYPE(NES_FFE4, nes_ffe4_device, "nes_ff4", "NES Cart FFE-4 PCB") DEFINE_DEVICE_TYPE(NES_FFE8, nes_ffe8_device, "nes_ff8", "NES Cart FFE-8 PCB") -nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_FFE3, tag, owner, clock) { } -nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0) { } -nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ffe4_device(mconfig, NES_FFE4, tag, owner, clock) { } -nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_ffe4_device(mconfig, NES_FFE8, tag, owner, clock) { } diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index 191a718da45..be2b093f4f1 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -14,7 +14,7 @@ class nes_ffe3_device : public nes_nrom_device { public: // construction/destruction - nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -26,7 +26,7 @@ class nes_ffe4_device : public nes_nrom_device { public: // construction/destruction - nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -36,7 +36,7 @@ public: virtual void pcb_reset() override; protected: - nes_ffe4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_ffe4_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; @@ -61,7 +61,7 @@ class nes_ffe8_device : public nes_ffe4_device { public: // construction/destruction - nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override {} diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index 221b81e294e..722e879ceb2 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -45,22 +45,22 @@ DEFINE_DEVICE_TYPE(NES_SZROM, nes_szrom_device, "nes_szrom", "NES Cart SZROM (MM -nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_reg_write_enable(0), m_latch(0), m_count(0) { } -nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_SXROM, tag, owner, clock) { } -nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_SOROM, tag, owner, clock) { } -nes_szrom_device::nes_szrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_szrom_device::nes_szrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_SZROM, tag, owner, clock) { } diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h index cdeee5056c6..665558997b0 100644 --- a/src/devices/bus/nes/mmc1.h +++ b/src/devices/bus/nes/mmc1.h @@ -14,7 +14,7 @@ class nes_sxrom_device : public nes_nrom_device { public: // construction/destruction - nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -23,7 +23,7 @@ public: virtual void pcb_reset() override; protected: - nes_sxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_sxrom_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; @@ -53,7 +53,7 @@ class nes_sorom_device : public nes_sxrom_device { public: // construction/destruction - nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -66,7 +66,7 @@ class nes_szrom_device : public nes_sxrom_device { public: // construction/destruction - nes_szrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_szrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/mmc1_clones.cpp b/src/devices/bus/nes/mmc1_clones.cpp index 58ee73330cd..c19ae14b802 100644 --- a/src/devices/bus/nes/mmc1_clones.cpp +++ b/src/devices/bus/nes/mmc1_clones.cpp @@ -37,37 +37,37 @@ DEFINE_DEVICE_TYPE(NES_SRPG_5IN1, nes_srpg5in1_device, "nes_srpg5in1", DEFINE_DEVICE_TYPE(NES_TXC_22110, nes_txc_22110_device, "nes_txc_22110", "NES Cart TXC 01-22110-000 PCB") -nes_bmc_jy012005_device::nes_bmc_jy012005_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_jy012005_device::nes_bmc_jy012005_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_BMC_JY012005, tag, owner, clock), m_latch0(0) { } -nes_bmc_jy820845c_device::nes_bmc_jy820845c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_jy820845c_device::nes_bmc_jy820845c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_BMC_JY820845C, tag, owner, clock), m_latch0(0), m_mode(0) { } -nes_farid_slrom_device::nes_farid_slrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_farid_slrom_device::nes_farid_slrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_FARID_SLROM, tag, owner, clock), m_outer(0) { } -nes_ninjaryu_device::nes_ninjaryu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ninjaryu_device::nes_ninjaryu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_NINJARYU, tag, owner, clock) { } -nes_resetsxrom_device::nes_resetsxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_resetsxrom_device::nes_resetsxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_RESETSXROM, tag, owner, clock), m_reset_count(-1) { } -nes_srpg5in1_device::nes_srpg5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_srpg5in1_device::nes_srpg5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_SRPG_5IN1, tag, owner, clock), m_outer(0), m_outer_count(0), m_outer_latch(0) { } -nes_txc_22110_device::nes_txc_22110_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_txc_22110_device::nes_txc_22110_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sxrom_device(mconfig, NES_TXC_22110, tag, owner, clock), m_latch0(0), m_mode(0) { } diff --git a/src/devices/bus/nes/mmc1_clones.h b/src/devices/bus/nes/mmc1_clones.h index 993a0c1366d..35b4f1dfb2f 100644 --- a/src/devices/bus/nes/mmc1_clones.h +++ b/src/devices/bus/nes/mmc1_clones.h @@ -14,7 +14,7 @@ class nes_bmc_jy012005_device : public nes_sxrom_device { public: // construction/destruction - nes_bmc_jy012005_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_jy012005_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -38,7 +38,7 @@ class nes_bmc_jy820845c_device : public nes_sxrom_device { public: // construction/destruction - nes_bmc_jy820845c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_jy820845c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -64,7 +64,7 @@ class nes_farid_slrom_device : public nes_sxrom_device { public: // construction/destruction - nes_farid_slrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_farid_slrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -88,7 +88,7 @@ class nes_ninjaryu_device : public nes_sxrom_device { public: // construction/destruction - nes_ninjaryu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ninjaryu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -104,7 +104,7 @@ class nes_resetsxrom_device : public nes_sxrom_device { public: // construction/destruction - nes_resetsxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_resetsxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; @@ -126,7 +126,7 @@ class nes_srpg5in1_device : public nes_sxrom_device { public: // construction/destruction - nes_srpg5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_srpg5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -152,7 +152,7 @@ class nes_txc_22110_device : public nes_sxrom_device { public: // construction/destruction - nes_txc_22110_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_txc_22110_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index 02da59b7aad..4d2ab7556ca 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -32,17 +32,17 @@ DEFINE_DEVICE_TYPE(NES_PXROM, nes_pxrom_device, "nes_pxrom", "NES Cart PxROM (MM DEFINE_DEVICE_TYPE(NES_FXROM, nes_fxrom_device, "nes_fxrom", "NES Cart FxROM (MMC-2) PCB") -nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch1(0), m_latch2(0) { } -nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_pxrom_device(mconfig, NES_PXROM, tag, owner, clock) { } -nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_pxrom_device(mconfig, NES_FXROM, tag, owner, clock) { } diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h index 1a6c8963826..4de5dc5d4a2 100644 --- a/src/devices/bus/nes/mmc2.h +++ b/src/devices/bus/nes/mmc2.h @@ -14,7 +14,7 @@ class nes_pxrom_device : public nes_nrom_device { public: // construction/destruction - nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pxrom_write(offs_t offset, uint8_t data); virtual void write_h(offs_t offset, uint8_t data) override { pxrom_write(offset, data); } @@ -23,7 +23,7 @@ public: virtual void pcb_reset() override; protected: - nes_pxrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_pxrom_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; @@ -39,7 +39,7 @@ class nes_fxrom_device : public nes_pxrom_device { public: // construction/destruction - nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index ff9774882fd..4a2201f84a0 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -51,48 +51,48 @@ DEFINE_DEVICE_TYPE(NES_QJ_PCB, nes_qj_device, "nes_qj", "NES Cart NES-QJ DEFINE_DEVICE_TYPE(NES_ZZ_PCB, nes_zz_device, "nes_zz", "NES Cart PAL-ZZ PCB") -nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_mmc_mirror(0), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0) , m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0) { } -nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_TXROM, tag, owner, clock) { } -nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_HKROM, tag, owner, clock), m_wram_enable(0), m_mmc6_reg(0) { } -nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock) { } -nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txsrom_device(mconfig, NES_TXSROM, tag, owner, clock) { } -nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock) { } -nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tqrom_device(mconfig, NES_TQROM, tag, owner, clock) { } -nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_QJ_PCB, tag, owner, clock) { } -nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_ZZ_PCB, tag, owner, clock) { } diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h index 1bc3cc0536c..fba36a9e2c7 100644 --- a/src/devices/bus/nes/mmc3.h +++ b/src/devices/bus/nes/mmc3.h @@ -14,7 +14,7 @@ class nes_txrom_device : public nes_nrom_device { public: // construction/destruction - nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -27,7 +27,7 @@ public: virtual void pcb_reset() override; protected: - nes_txrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_txrom_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 { mmc3_start(); } @@ -61,7 +61,7 @@ class nes_hkrom_device : public nes_txrom_device { public: // construction/destruction - nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -87,13 +87,13 @@ class nes_txsrom_device : public nes_txrom_device { public: // construction/destruction - nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; protected: // construction/destruction - nes_txsrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_txsrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void set_chr(u8 chr, int chr_base, int chr_mask) override; }; @@ -105,13 +105,13 @@ class nes_tqrom_device : public nes_txrom_device { public: // construction/destruction - nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; protected: // construction/destruction - nes_tqrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_tqrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -121,7 +121,7 @@ class nes_qj_device : public nes_txrom_device { public: // construction/destruction - nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -135,7 +135,7 @@ class nes_zz_device : public nes_txrom_device { public: // construction/destruction - nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index b74ec375e55..f8a9721e556 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -157,338 +157,338 @@ ioport_constructor nes_bmc_kc885_device::device_input_ports() const // LIVE DEVICE //************************************************************************** -nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_NITRA, tag, owner, clock) { } -nes_bmw8544_device::nes_bmw8544_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmw8544_device::nes_bmw8544_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMW8544, tag, owner, clock), m_reg(0) { } -nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_FS6, tag, owner, clock) { } -nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SBROS11, tag, owner, clock) { } -nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_MALISB, tag, owner, clock) { } -nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_FAMILY4646, tag, owner, clock) { } -nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_PIKAY2K, tag, owner, clock) { } -nes_8237_device::nes_8237_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 board) +nes_8237_device::nes_8237_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 board) : nes_txrom_device(mconfig, type, tag, owner, clock), m_board(board) { } -nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_8237_device(mconfig, NES_8237, tag, owner, clock, 0) { } -nes_8237a_device::nes_8237a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_8237a_device::nes_8237a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_8237_device(mconfig, NES_8237A, tag, owner, clock, 1) { } -nes_158b_device::nes_158b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_158b_device::nes_158b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_8237_device(mconfig, NES_158B, tag, owner, clock, 0) { } -nes_kasing_device::nes_kasing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_kasing_device::nes_kasing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock), m_mmc3_mode(true) { } -nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_kasing_device(mconfig, NES_KASING, tag, owner, clock) { } -nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 board) +nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 board) : nes_kasing_device(mconfig, type, tag, owner, clock), m_board(board) { } -nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sglionk_device(mconfig, NES_SG_LIONK, tag, owner, clock, 0) { } -nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sglionk_device(mconfig, NES_SG_BOOG, tag, owner, clock, 1) { } -nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_KAY, tag, owner, clock), m_low_reg(0) { } -nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_H2288, tag, owner, clock), m_mmc3_mode(true) { } -nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_6035052, tag, owner, clock), m_prot(0) { } -nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_TXC_TW, tag, owner, clock) { } -nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_KOF97, tag, owner, clock) { } -nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_KOF96, tag, owner, clock), m_mmc3_mode(true) { } -nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SF3, tag, owner, clock) { } -nes_cocoma_device::nes_cocoma_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cocoma_device::nes_cocoma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_COCOMA, tag, owner, clock) { } -nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_GOUDER, tag, owner, clock) { } -nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SA9602B, tag, owner, clock), m_reg(0), m_prg_chip(0) { } -nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SACHEN_SHERO, tag, owner, clock) , m_jumper(*this, "JUMPER") , m_reg(0) { } -nes_sachen_zgdh_device::nes_sachen_zgdh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sachen_zgdh_device::nes_sachen_zgdh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SACHEN_ZGDH, tag, owner, clock), m_reg(0) { } -nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_A9746, tag, owner, clock) { } -nes_a88s1_device::nes_a88s1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_a88s1_device::nes_a88s1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_A88S1, tag, owner, clock) { } -nes_bmc_el86xc_device::nes_bmc_el86xc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_el86xc_device::nes_bmc_el86xc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_EL86XC, tag, owner, clock) { } -nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock), m_mmc_cmd1(0) { } -nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fk23c_device(mconfig, NES_FK23C, tag, owner, clock) { } -nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_fk23c_device(mconfig, NES_FK23CA, tag, owner, clock) { } -nes_nt639_device::nes_nt639_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_nt639_device::nes_nt639_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_NT639, tag, owner, clock) { } -nes_resettxrom_device::nes_resettxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_resettxrom_device::nes_resettxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_RESETTXROM, tag, owner, clock), m_count(-1) { } -nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_S24IN1SC03, tag, owner, clock) { } -nes_tech9in1_device::nes_tech9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tech9in1_device::nes_tech9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_TECHLINE9IN1, tag, owner, clock) { } -nes_bmc_5in1_device::nes_bmc_5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_5in1_device::nes_bmc_5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_5IN1, tag, owner, clock) , m_jumper(*this, "JUMPER") { } -nes_bmc_8in1_device::nes_bmc_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_8in1_device::nes_bmc_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_8IN1, tag, owner, clock) { } -nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_15IN1, tag, owner, clock), m_jumper(0) { } -nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_SBIG7, tag, owner, clock) { } -nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock), m_count(0) { } -nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_hik8_device(mconfig, NES_BMC_HIK8, tag, owner, clock) { } -nes_bmc_jy208_device::nes_bmc_jy208_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_jy208_device::nes_bmc_jy208_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_hik8_device(mconfig, NES_BMC_JY208, tag, owner, clock) { } -nes_bmc_jy302_device::nes_bmc_jy302_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_jy302_device::nes_bmc_jy302_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_hik8_device(mconfig, NES_BMC_JY302, tag, owner, clock) { } -nes_bmc_kc885_device::nes_bmc_kc885_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_kc885_device::nes_bmc_kc885_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_hik8_device(mconfig, NES_BMC_KC885, tag, owner, clock) , m_jumper(*this, "JUMPER") { } -nes_bmc_sfc12_device::nes_bmc_sfc12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_sfc12_device::nes_bmc_sfc12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_hik8_device(mconfig, NES_BMC_SFC12, tag, owner, clock) { } -nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_HIK4, tag, owner, clock), m_mmc3_mode(true) { } -nes_bmc_f15_device::nes_bmc_f15_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_f15_device::nes_bmc_f15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_F15, tag, owner, clock) { } -nes_bmc_f600_device::nes_bmc_f600_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_f600_device::nes_bmc_f600_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txsrom_device(mconfig, NES_BMC_F600, tag, owner, clock) , m_jumper(*this, "JUMPER") , m_reg(0) { } -nes_bmc_gn45_device::nes_bmc_gn45_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gn45_device::nes_bmc_gn45_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_GN45, tag, owner, clock), m_lock(false) { } -nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, tag, owner, clock), m_lock(false) { } -nes_bmc_k3006_device::nes_bmc_k3006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k3006_device::nes_bmc_k3006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_K3006, tag, owner, clock) { } -nes_bmc_k3033_device::nes_bmc_k3033_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k3033_device::nes_bmc_k3033_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_K3033, tag, owner, clock), m_mmc3_mode(false) { } -nes_bmc_l6in1_device::nes_bmc_l6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_l6in1_device::nes_bmc_l6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_L6IN1, tag, owner, clock), m_reg(0) { } -nes_bmc_00202650_device::nes_bmc_00202650_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_00202650_device::nes_bmc_00202650_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_00202650, tag, owner, clock), m_mmc3_mode(false) { } -nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_411120C, tag, owner, clock), m_reg(0) { } -nes_bmc_810305c_device::nes_bmc_810305c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_810305c_device::nes_bmc_810305c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txsrom_device(mconfig, NES_BMC_810305C, tag, owner, clock), m_outer(0) { } -nes_bmc_820720c_device::nes_bmc_820720c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_820720c_device::nes_bmc_820720c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_820720C, tag, owner, clock), m_reg(0) { } -nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_830118C, tag, owner, clock) { } -nes_bmc_830832c_device::nes_bmc_830832c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_830832c_device::nes_bmc_830832c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_830832C, tag, owner, clock) { } -nes_bmc_yy841101c_device::nes_bmc_yy841101c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_yy841101c_device::nes_bmc_yy841101c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_YY841101C, tag, owner, clock) { } -nes_bmc_yy841155c_device::nes_bmc_yy841155c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_yy841155c_device::nes_bmc_yy841155c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_BMC_YY841155C, tag, owner, clock) { } -nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_PJOY84, tag, owner, clock) { } -nes_smd133_device::nes_smd133_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_smd133_device::nes_smd133_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_SMD133, tag, owner, clock) { } diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h index 47f0d4cff5f..1f9d001d1a2 100644 --- a/src/devices/bus/nes/mmc3_clones.h +++ b/src/devices/bus/nes/mmc3_clones.h @@ -14,7 +14,7 @@ class nes_nitra_device : public nes_txrom_device { public: // construction/destruction - nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -26,7 +26,7 @@ class nes_bmw8544_device : public nes_txrom_device { public: // construction/destruction - nes_bmw8544_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmw8544_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -50,7 +50,7 @@ class nes_fs6_device : public nes_txrom_device { public: // construction/destruction - nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -62,7 +62,7 @@ class nes_sbros11_device : public nes_txrom_device { public: // construction/destruction - nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -74,7 +74,7 @@ class nes_malisb_device : public nes_txrom_device { public: // construction/destruction - nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -88,7 +88,7 @@ class nes_family4646_device : public nes_txrom_device { public: // construction/destruction - nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -110,7 +110,7 @@ class nes_pikay2k_device : public nes_txrom_device { public: // construction/destruction - nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -133,7 +133,7 @@ class nes_8237_device : public nes_txrom_device { public: // construction/destruction - nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -143,7 +143,7 @@ public: protected: // construction/destruction - nes_8237_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 board); + nes_8237_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 board); // device-level overrides virtual void device_start() override; @@ -161,7 +161,7 @@ class nes_8237a_device : public nes_8237_device { public: // construction/destruction - nes_8237a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_8237a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -171,7 +171,7 @@ class nes_158b_device : public nes_8237_device { public: // construction/destruction - nes_158b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_158b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -193,7 +193,7 @@ class nes_kasing_device : public nes_txrom_device { public: // construction/destruction - nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -202,7 +202,7 @@ public: protected: // construction/destruction - nes_kasing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_kasing_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; @@ -218,13 +218,13 @@ class nes_sglionk_device : public nes_kasing_device { public: // construction/destruction - nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; protected: // construction/destruction - nes_sglionk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 board); + nes_sglionk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 board); private: const u8 m_board; @@ -237,7 +237,7 @@ class nes_sgboog_device : public nes_sglionk_device { public: // construction/destruction - nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -247,7 +247,7 @@ class nes_kay_device : public nes_txrom_device { public: // construction/destruction - nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -274,7 +274,7 @@ class nes_h2288_device : public nes_txrom_device { public: // construction/destruction - nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // FIXME: This is a hack and should be removed once open bus behavior is properly working. UMK3 depends on an open bus read (F51F: lda $5f74) at bootup. virtual u8 read_l(offs_t offset) override { return 0x5f; } @@ -300,7 +300,7 @@ class nes_6035052_device : public nes_txrom_device { public: // construction/destruction - nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_ex(offs_t offset) override; virtual void write_ex(offs_t offset, uint8_t data) override; @@ -326,7 +326,7 @@ class nes_txc_tw_device : public nes_txrom_device { public: // construction/destruction - nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_m(offs_t offset, uint8_t data) override { write_l(offset & 0xff, data); } // offset does not really count for this mapper } @@ -340,7 +340,7 @@ class nes_kof97_device : public nes_txrom_device { public: // construction/destruction - nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -352,7 +352,7 @@ class nes_kof96_device : public nes_txrom_device { public: // construction/destruction - nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -376,7 +376,7 @@ class nes_sf3_device : public nes_txrom_device { public: // construction/destruction - nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -391,7 +391,7 @@ class nes_cocoma_device : public nes_txrom_device { public: // construction/destruction - nes_cocoma_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cocoma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -405,7 +405,7 @@ class nes_gouder_device : public nes_txrom_device { public: // construction/destruction - nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -428,7 +428,7 @@ class nes_sa9602b_device : public nes_txrom_device { public: // construction/destruction - nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void prg_cb(int start, int bank) override; @@ -451,7 +451,7 @@ class nes_sachen_shero_device : public nes_txrom_device { public: // construction/destruction - nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -475,7 +475,7 @@ class nes_sachen_zgdh_device : public nes_txrom_device { public: // construction/destruction - nes_sachen_zgdh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_zgdh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual u8 nt_r(offs_t offset) override; @@ -499,7 +499,7 @@ class nes_a9746_device : public nes_txrom_device { public: // construction/destruction - nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -521,7 +521,7 @@ class nes_a88s1_device : public nes_txrom_device { public: // construction/destruction - nes_a88s1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_a88s1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -544,7 +544,7 @@ class nes_bmc_el86xc_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_el86xc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_el86xc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -558,7 +558,7 @@ class nes_fk23c_device : public nes_txrom_device { public: // construction/destruction - nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -568,7 +568,7 @@ public: virtual void pcb_reset() override; protected: - nes_fk23c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_fk23c_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; @@ -586,7 +586,7 @@ class nes_fk23ca_device : public nes_fk23c_device { public: // construction/destruction - nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; }; @@ -598,7 +598,7 @@ class nes_nt639_device : public nes_txrom_device { public: // construction/destruction - nes_nt639_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_nt639_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -612,7 +612,7 @@ class nes_resettxrom_device : public nes_txrom_device { public: // construction/destruction - nes_resettxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_resettxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; @@ -631,7 +631,7 @@ class nes_s24in1sc03_device : public nes_txrom_device { public: // construction/destruction - nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void prg_cb(int start, int bank) override; @@ -654,7 +654,7 @@ class nes_tech9in1_device : public nes_txrom_device { public: // construction/destruction - nes_tech9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tech9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; @@ -676,7 +676,7 @@ class nes_bmc_5in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_5in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -698,7 +698,7 @@ class nes_bmc_8in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -712,7 +712,7 @@ class nes_bmc_15in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -729,7 +729,7 @@ class nes_bmc_sbig7_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -743,7 +743,7 @@ class nes_bmc_hik8_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -751,7 +751,7 @@ public: protected: // construction/destruction - nes_bmc_hik8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_bmc_hik8_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; @@ -767,7 +767,7 @@ class nes_bmc_jy208_device : public nes_bmc_hik8_device { public: // construction/destruction - nes_bmc_jy208_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_jy208_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -782,7 +782,7 @@ class nes_bmc_jy302_device : public nes_bmc_hik8_device { public: // construction/destruction - nes_bmc_jy302_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_jy302_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void set_chr(u8 chr, int chr_base, int chr_mask) override; @@ -795,7 +795,7 @@ class nes_bmc_kc885_device : public nes_bmc_hik8_device { public: // construction/destruction - nes_bmc_kc885_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_kc885_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -817,7 +817,7 @@ class nes_bmc_sfc12_device : public nes_bmc_hik8_device { public: // construction/destruction - nes_bmc_sfc12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_sfc12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void set_chr(u8 chr, int chr_base, int chr_mask) override; @@ -830,7 +830,7 @@ class nes_bmc_hik4_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -852,7 +852,7 @@ class nes_bmc_f15_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_f15_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_f15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -867,7 +867,7 @@ class nes_bmc_f600_device : public nes_txsrom_device { public: // construction/destruction - nes_bmc_f600_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_f600_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -894,7 +894,7 @@ class nes_bmc_gn45_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_gn45_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gn45_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -915,7 +915,7 @@ class nes_bmc_gold7in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -936,7 +936,7 @@ class nes_bmc_k3006_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_k3006_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k3006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -950,7 +950,7 @@ class nes_bmc_k3033_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_k3033_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k3033_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -972,7 +972,7 @@ class nes_bmc_l6in1_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_l6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_l6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -997,7 +997,7 @@ class nes_bmc_00202650_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_00202650_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_00202650_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -1021,7 +1021,7 @@ class nes_bmc_411120c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -1043,7 +1043,7 @@ class nes_bmc_810305c_device : public nes_txsrom_device { public: // construction/destruction - nes_bmc_810305c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_810305c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1067,7 +1067,7 @@ class nes_bmc_820720c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_820720c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_820720c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -1092,7 +1092,7 @@ class nes_bmc_830118c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void prg_cb(int start, int bank) override; @@ -1107,7 +1107,7 @@ class nes_bmc_830832c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_830832c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_830832c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -1121,7 +1121,7 @@ class nes_bmc_yy841101c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_yy841101c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_yy841101c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -1135,7 +1135,7 @@ class nes_bmc_yy841155c_device : public nes_txrom_device { public: // construction/destruction - nes_bmc_yy841155c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_yy841155c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -1156,7 +1156,7 @@ class nes_pjoy84_device : public nes_txrom_device { public: // construction/destruction - nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, uint8_t data) override; virtual void prg_cb(int start, int bank) override; @@ -1180,7 +1180,7 @@ class nes_smd133_device : public nes_txrom_device { public: // construction/destruction - nes_smd133_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_smd133_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_m(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index f15b1a7658b..a2ae5b61f87 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -41,7 +41,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff}; DEFINE_DEVICE_TYPE(NES_EXROM, nes_exrom_device, "nes_exrom", "NES Cart ExROM (MMC-5) PCB") -nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_EXROM, tag, owner, clock), m_irq_count(0) , m_irq_status(0), m_irq_enable(0), m_mult1(0), m_mult2(0), m_mmc5_scanline(0), m_vrom_page_a(0), m_vrom_page_b(0), m_floodtile(0), m_floodattr(0) , m_prg_mode(0), m_chr_mode(0), m_wram_protect_1(0), m_wram_protect_2(0), m_exram_control(0), m_wram_base(0), m_last_chr(0), m_ex1_chr(0) diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h index a806c704883..1bdd4eaebe5 100644 --- a/src/devices/bus/nes/mmc5.h +++ b/src/devices/bus/nes/mmc5.h @@ -17,7 +17,7 @@ class nes_exrom_device : public nes_nrom_device { public: // construction/destruction - nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~nes_exrom_device(); virtual uint8_t read_l(offs_t offset) override; diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index 2e13e22a73e..8e2c0c13078 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -130,404 +130,404 @@ ioport_constructor nes_bmc_8157_device::device_input_ports() const // LIVE DEVICE //************************************************************************** -nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_ACTION52, tag, owner, clock) { } -nes_caltron6in1_device::nes_caltron6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_caltron6in1_device::nes_caltron6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CALTRON6IN1, tag, owner, clock), m_latch(0), m_reg(0) { } -nes_caltron9in1_device::nes_caltron9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_caltron9in1_device::nes_caltron9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CALTRON9IN1, tag, owner, clock) { } -nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_RUMBLESTATION, tag, owner, clock), m_prg(0), m_chr(0) { } -nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SVISION16, tag, owner, clock), m_latch1(0), m_latch2(0) { } -nes_farid_unrom_device::nes_farid_unrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_farid_unrom_device::nes_farid_unrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_FARID_UNROM, tag, owner, clock), m_reg(0) { } -nes_kn42_device::nes_kn42_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_kn42_device::nes_kn42_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_KN42, tag, owner, clock), m_latch(0) { } -nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_A65AS, tag, owner, clock) { } -nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_T262, tag, owner, clock), m_latch(0) { } -nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_STUDYNGAME, tag, owner, clock) { } -nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock) { } -nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sgun20in1_device(mconfig, NES_SUPERGUN20IN1, tag, owner, clock) { } -nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sgun20in1_device(mconfig, NES_BMC_190IN1, tag, owner, clock) { } -nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_VT5201, tag, owner, clock), m_latch(0), m_jumper(0) { } -nes_bmc_80013b_device::nes_bmc_80013b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_80013b_device::nes_bmc_80013b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_80013B, tag, owner, clock), m_latch(0) { } -nes_bmc_810544c_device::nes_bmc_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_810544c_device::nes_bmc_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_810544C, tag, owner, clock) { } -nes_bmc_830425c_device::nes_bmc_830425c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_830425c_device::nes_bmc_830425c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_830425C, tag, owner, clock), m_latch(0) { } -nes_bmc_830928c_device::nes_bmc_830928c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_830928c_device::nes_bmc_830928c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_830928C, tag, owner, clock), m_latch(0) { } -nes_bmc_850437c_device::nes_bmc_850437c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_850437c_device::nes_bmc_850437c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_850437C, tag, owner, clock) { } -nes_bmc_970630c_device::nes_bmc_970630c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_970630c_device::nes_bmc_970630c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_970630C, tag, owner, clock), m_latch(0) { } -nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NTD03, tag, owner, clock) { } -nes_bmc_ctc09_device::nes_bmc_ctc09_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_ctc09_device::nes_bmc_ctc09_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_CTC09, tag, owner, clock) { } -nes_bmc_ds927_device::nes_bmc_ds927_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_ds927_device::nes_bmc_ds927_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_DS927, tag, owner, clock), m_latch(0), m_mode(0) { } -nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_GKA, tag, owner, clock) { } -nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_GKB, tag, owner, clock) { } -nes_bmc_gkcxin1_device::nes_bmc_gkcxin1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gkcxin1_device::nes_bmc_gkcxin1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_GKCXIN1, tag, owner, clock) { } -nes_bmc_gn91b_device::nes_bmc_gn91b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gn91b_device::nes_bmc_gn91b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_GN91B, tag, owner, clock), m_latch(0) { } -nes_bmc_hp898f_device::nes_bmc_hp898f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_hp898f_device::nes_bmc_hp898f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_HP898F, tag, owner, clock) { } -nes_bmc_k3036_device::nes_bmc_k3036_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k3036_device::nes_bmc_k3036_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_K3036, tag, owner, clock) { } -nes_bmc_k3046_device::nes_bmc_k3046_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k3046_device::nes_bmc_k3046_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_K3046, tag, owner, clock) { } -nes_bmc_k3071_device::nes_bmc_k3071_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k3071_device::nes_bmc_k3071_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_K3071, tag, owner, clock) { } -nes_bmc_s009_device::nes_bmc_s009_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_s009_device::nes_bmc_s009_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_S009, tag, owner, clock), m_reg(0) { } -nes_bmc_sa005a_device::nes_bmc_sa005a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_sa005a_device::nes_bmc_sa005a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_SA005A, tag, owner, clock) { } -nes_bmc_tf2740_device::nes_bmc_tf2740_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_tf2740_device::nes_bmc_tf2740_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_TF2740, tag, owner, clock), m_jumper(0) { } -nes_bmc_th2348_device::nes_bmc_th2348_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_th2348_device::nes_bmc_th2348_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_TH2348, tag, owner, clock), m_latch(0) { } -nes_bmc_tj03_device::nes_bmc_tj03_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_tj03_device::nes_bmc_tj03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_TJ03, tag, owner, clock) { } -nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_WS, tag, owner, clock), m_latch(0) { } -nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_11160, tag, owner, clock) { } -nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_G146, tag, owner, clock) { } -nes_bmc_2751_device::nes_bmc_2751_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_2751_device::nes_bmc_2751_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_2751, tag, owner, clock) { } -nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_8157, tag, owner, clock) , m_jumper(*this, "JUMPER") , m_latch(0) { } -nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_HIK300, tag, owner, clock) { } -nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_S700, tag, owner, clock) { } -nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_BALL11, tag, owner, clock) { } -nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_22GAMES, tag, owner, clock), m_latch(0), m_reset(0) { } -nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_64Y2K, tag, owner, clock), m_reg_mask(0) { } -nes_bmc_420y2k_device::nes_bmc_420y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_420y2k_device::nes_bmc_420y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_420Y2K, tag, owner, clock), m_latch(0), m_reg(0) { } -nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_12IN1, tag, owner, clock) { } -nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_20IN1, tag, owner, clock) { } -nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_21IN1, tag, owner, clock) { } -nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_31IN1, tag, owner, clock) { } -nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_35IN1, tag, owner, clock) { } -nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_36IN1, tag, owner, clock) { } -nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_64IN1, tag, owner, clock) { } -nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_jumper(type == NES_BMC_70IN1 ? 0x0d : 0x06) { } -nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_70in1_device(mconfig, NES_BMC_70IN1, tag, owner, clock) { } -nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_70in1_device(mconfig, NES_BMC_800IN1, tag, owner, clock) { } -nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_72IN1, tag, owner, clock) { } -nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_76IN1, tag, owner, clock) { } -nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_150IN1, tag, owner, clock) { } -nes_bmc_500in1_device::nes_bmc_500in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_500in1_device::nes_bmc_500in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_500IN1, tag, owner, clock) { } -nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_1200IN1, tag, owner, clock), m_vram_protect(0) { } -nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_GOLD260, tag, owner, clock) { } -nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_4IN1RESET, tag, owner, clock), m_latch(0) { } -nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 mirror_flip) +nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 mirror_flip) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_mirror_flip(mirror_flip) { } -nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_42in1reset_device(mconfig, NES_BMC_42IN1RESET, tag, owner, clock, 0) { } -nes_bmc_nc20mb_device::nes_bmc_nc20mb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_nc20mb_device::nes_bmc_nc20mb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_42in1reset_device(mconfig, NES_BMC_NC20MB, tag, owner, clock, 1) { } -nes_bmc_lc160_device::nes_bmc_lc160_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_lc160_device::nes_bmc_lc160_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BMC_LC160, tag, owner, clock) { } -nes_vram_protect_device::nes_vram_protect_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_vram_protect_device::nes_vram_protect_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_vram_protect(false) { } -nes_bmc_60311c_device::nes_bmc_60311c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_60311c_device::nes_bmc_60311c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_vram_protect_device(mconfig, NES_BMC_60311C, tag, owner, clock) { } -nes_bmc_ctc12in1_device::nes_bmc_ctc12in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_bmc_ctc12in1_device::nes_bmc_ctc12in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_vram_protect_device(mconfig, type, tag, owner, clock) { } -nes_bmc_ctc12in1_device::nes_bmc_ctc12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_ctc12in1_device::nes_bmc_ctc12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_ctc12in1_device(mconfig, NES_BMC_CTC12IN1, tag, owner, clock) { } -nes_bmc_891227_device::nes_bmc_891227_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_891227_device::nes_bmc_891227_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_ctc12in1_device(mconfig, NES_BMC_891227, tag, owner, clock) { } -nes_bmc_k1029_device::nes_bmc_k1029_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_bmc_k1029_device::nes_bmc_k1029_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_vram_protect_device(mconfig, type, tag, owner, clock) { } -nes_bmc_k1029_device::nes_bmc_k1029_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_k1029_device::nes_bmc_k1029_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_k1029_device(mconfig, NES_BMC_K1029, tag, owner, clock) { } -nes_bmc_fam250_device::nes_bmc_fam250_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_fam250_device::nes_bmc_fam250_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_k1029_device(mconfig, NES_BMC_FAM250, tag, owner, clock), m_latch(0), m_reg(0) { } -nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_vram_protect_device(mconfig, NES_N625092, tag, owner, clock) { } -nes_bmc_th22913_device::nes_bmc_th22913_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 vram_prot_bit) +nes_bmc_th22913_device::nes_bmc_th22913_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 vram_prot_bit) : nes_vram_protect_device(mconfig, type, tag, owner, clock), m_vram_prot_bit(vram_prot_bit) { } -nes_bmc_th22913_device::nes_bmc_th22913_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_th22913_device::nes_bmc_th22913_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_th22913_device(mconfig, NES_BMC_TH22913, tag, owner, clock, 10) { } -nes_bmc_82ab_device::nes_bmc_82ab_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_82ab_device::nes_bmc_82ab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_bmc_th22913_device(mconfig, NES_BMC_82AB, tag, owner, clock, 9) { } diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h index e7c401ee3ab..3612691eeb8 100644 --- a/src/devices/bus/nes/multigame.h +++ b/src/devices/bus/nes/multigame.h @@ -14,7 +14,7 @@ class nes_action52_device : public nes_nrom_device { public: // construction/destruction - nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -26,7 +26,7 @@ class nes_caltron6in1_device : public nes_nrom_device { public: // construction/destruction - nes_caltron6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_caltron6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -49,7 +49,7 @@ class nes_caltron9in1_device : public nes_nrom_device { public: // construction/destruction - nes_caltron9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_caltron9in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -70,7 +70,7 @@ class nes_rumblestat_device : public nes_nrom_device { public: // construction/destruction - nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -92,7 +92,7 @@ class nes_svision16_device : public nes_nrom_device { public: // construction/destruction - nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -116,7 +116,7 @@ class nes_farid_unrom_device : public nes_nrom_device { public: // construction/destruction - nes_farid_unrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_farid_unrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -137,7 +137,7 @@ class nes_kn42_device : public nes_nrom_device { public: // construction/destruction - nes_kn42_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_kn42_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -158,7 +158,7 @@ class nes_a65as_device : public nes_nrom_device { public: // construction/destruction - nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -172,7 +172,7 @@ class nes_t262_device : public nes_nrom_device { public: // construction/destruction - nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -193,7 +193,7 @@ class nes_studyngame_device : public nes_nrom_device { public: // construction/destruction - nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -205,14 +205,14 @@ class nes_sgun20in1_device : public nes_nrom_device { public: // construction/destruction - nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; protected: - nes_sgun20in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_sgun20in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -222,7 +222,7 @@ class nes_bmc_190in1_device : public nes_sgun20in1_device { public: // construction/destruction - nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -234,7 +234,7 @@ class nes_vt5201_device : public nes_nrom_device { public: // construction/destruction - nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -256,7 +256,7 @@ class nes_bmc_80013b_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_80013b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_80013b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -278,7 +278,7 @@ class nes_bmc_810544c_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -292,7 +292,7 @@ class nes_bmc_830425c_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_830425c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_830425c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -313,7 +313,7 @@ class nes_bmc_830928c_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_830928c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_830928c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -334,7 +334,7 @@ class nes_bmc_850437c_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_850437c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_850437c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -355,7 +355,7 @@ class nes_bmc_970630c_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_970630c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_970630c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -377,7 +377,7 @@ class nes_ntd03_device : public nes_nrom_device { public: // construction/destruction - nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -389,7 +389,7 @@ class nes_bmc_ctc09_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ctc09_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_ctc09_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -403,7 +403,7 @@ class nes_bmc_ds927_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ds927_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_ds927_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -425,7 +425,7 @@ class nes_bmc_gka_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -447,7 +447,7 @@ class nes_bmc_gkb_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -459,7 +459,7 @@ class nes_bmc_gkcxin1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gkcxin1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gkcxin1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -471,7 +471,7 @@ class nes_bmc_gn91b_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gn91b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gn91b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -492,7 +492,7 @@ class nes_bmc_hp898f_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_hp898f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_hp898f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -505,7 +505,7 @@ class nes_bmc_k3036_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_k3036_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k3036_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -519,7 +519,7 @@ class nes_bmc_k3046_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_k3046_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k3046_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -533,7 +533,7 @@ class nes_bmc_k3071_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_k3071_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k3071_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -547,7 +547,7 @@ class nes_bmc_s009_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_s009_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_s009_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -569,7 +569,7 @@ class nes_bmc_sa005a_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_sa005a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_sa005a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -583,7 +583,7 @@ class nes_bmc_tf2740_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_tf2740_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_tf2740_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -608,7 +608,7 @@ class nes_bmc_th2348_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_th2348_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_th2348_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -630,7 +630,7 @@ class nes_bmc_tj03_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_tj03_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_tj03_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -642,7 +642,7 @@ class nes_bmc_ws_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, uint8_t data) override; @@ -663,7 +663,7 @@ class nes_bmc_11160_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -675,7 +675,7 @@ class nes_bmc_g146_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -687,7 +687,7 @@ class nes_bmc_2751_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_2751_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_2751_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -702,7 +702,7 @@ class nes_bmc_8157_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -726,7 +726,7 @@ class nes_bmc_hik300_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -741,7 +741,7 @@ class nes_bmc_s700_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -753,7 +753,7 @@ class nes_bmc_ball11_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -777,7 +777,7 @@ class nes_bmc_22games_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -798,7 +798,7 @@ class nes_bmc_64y2k_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -822,7 +822,7 @@ class nes_bmc_420y2k_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_420y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_420y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -844,7 +844,7 @@ class nes_bmc_12in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -866,7 +866,7 @@ class nes_bmc_20in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -878,7 +878,7 @@ class nes_bmc_21in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -890,7 +890,7 @@ class nes_bmc_31in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -902,7 +902,7 @@ class nes_bmc_35in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -916,7 +916,7 @@ class nes_bmc_36in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -930,7 +930,7 @@ class nes_bmc_64in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -944,7 +944,7 @@ class nes_bmc_70in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -953,7 +953,7 @@ public: protected: // construction/destruction - nes_bmc_70in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_bmc_70in1_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; @@ -974,7 +974,7 @@ class nes_bmc_800in1_device : public nes_bmc_70in1_device { public: // construction/destruction - nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void update_banks() override; @@ -987,7 +987,7 @@ class nes_bmc_72in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -1010,7 +1010,7 @@ class nes_bmc_76in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1031,7 +1031,7 @@ class nes_bmc_150in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1045,7 +1045,7 @@ class nes_bmc_500in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_500in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_500in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -1057,7 +1057,7 @@ class nes_bmc_1200in1_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void chr_w(offs_t offset, uint8_t data) override; @@ -1079,7 +1079,7 @@ class nes_bmc_gold260_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -1091,7 +1091,7 @@ class nes_bmc_4in1reset_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; @@ -1110,7 +1110,7 @@ class nes_bmc_42in1reset_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1118,7 +1118,7 @@ public: protected: // construction/destruction - nes_bmc_42in1reset_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 mirror_flip); + nes_bmc_42in1reset_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 mirror_flip); // device-level overrides virtual void device_start() override; @@ -1135,7 +1135,7 @@ class nes_bmc_nc20mb_device : public nes_bmc_42in1reset_device { public: // construction/destruction - nes_bmc_nc20mb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_nc20mb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -1145,7 +1145,7 @@ class nes_bmc_lc160_device : public nes_nrom_device { public: // construction/destruction - nes_bmc_lc160_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_lc160_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -1162,7 +1162,7 @@ public: protected: // construction/destruction - nes_vram_protect_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_vram_protect_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; @@ -1177,7 +1177,7 @@ class nes_bmc_60311c_device : public nes_vram_protect_device { public: // construction/destruction - nes_bmc_60311c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_60311c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -1200,7 +1200,7 @@ class nes_bmc_ctc12in1_device : public nes_vram_protect_device { public: // construction/destruction - nes_bmc_ctc12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_ctc12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -1209,7 +1209,7 @@ public: protected: // construction/destruction - nes_bmc_ctc12in1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_bmc_ctc12in1_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; @@ -1224,7 +1224,7 @@ class nes_bmc_891227_device : public nes_bmc_ctc12in1_device { public: // construction/destruction - nes_bmc_891227_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_891227_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -1236,13 +1236,13 @@ class nes_bmc_k1029_device : public nes_vram_protect_device { public: // construction/destruction - nes_bmc_k1029_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_k1029_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; protected: // construction/destruction - nes_bmc_k1029_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_bmc_k1029_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -1252,7 +1252,7 @@ class nes_bmc_fam250_device : public nes_bmc_k1029_device { public: // construction/destruction - nes_bmc_fam250_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_fam250_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -1274,7 +1274,7 @@ class nes_n625092_device : public nes_vram_protect_device { public: // construction/destruction - nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1295,7 +1295,7 @@ class nes_bmc_th22913_device : public nes_vram_protect_device { public: // construction/destruction - nes_bmc_th22913_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_th22913_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -1303,7 +1303,7 @@ public: protected: // construction/destruction - nes_bmc_th22913_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 vram_prot_bit); + nes_bmc_th22913_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 vram_prot_bit); private: const u8 m_vram_prot_bit; @@ -1316,7 +1316,7 @@ class nes_bmc_82ab_device : public nes_bmc_th22913_device { public: // construction/destruction - nes_bmc_82ab_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_82ab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 31f72761751..ac04dfb6b07 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -48,42 +48,42 @@ DEFINE_DEVICE_TYPE(NES_NAMCOT175, nes_namcot175_device, "nes_namcot175", "NES DEFINE_DEVICE_TYPE(NES_NAMCOT163, nes_namcot163_device, "nes_namcot163", "NES Cart Namcot 163 PCB") -nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0) { } -nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NAMCOT3433, tag, owner, clock), m_latch(0) { } -nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NAMCOT3446, tag, owner, clock), m_latch(0) { } -nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NAMCOT3425, tag, owner, clock), m_latch(0) { } -nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_namcot340_device(mconfig, NES_NAMCOT340, tag, owner, clock) { } -nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_namcot340_device(mconfig, NES_NAMCOT175, tag, owner, clock), m_wram_protect(0) { } -nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_namcot340_device(mconfig, NES_NAMCOT163, tag, owner, clock), m_wram_protect(0), m_latch(0), m_chr_bank(0), m_namco163snd(*this, "n163") { } diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h index 13d30804b8a..2e1872a5cc7 100644 --- a/src/devices/bus/nes/namcot.h +++ b/src/devices/bus/nes/namcot.h @@ -15,7 +15,7 @@ class nes_namcot3433_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void dxrom_write(offs_t offset, uint8_t data); virtual void write_h(offs_t offset, uint8_t data) override { dxrom_write(offset, data); } @@ -23,7 +23,7 @@ public: virtual void pcb_reset() override; protected: - nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_namcot3433_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; @@ -39,7 +39,7 @@ class nes_namcot3446_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -60,7 +60,7 @@ class nes_namcot3425_device : public nes_nrom_device { public: // construction/destruction - nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -82,7 +82,7 @@ class nes_namcot340_device : public nes_nrom_device { public: // construction/destruction - nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t n340_loread(offs_t offset); void n340_lowrite(offs_t offset, uint8_t data); @@ -94,7 +94,7 @@ public: virtual void pcb_reset() override; protected: - nes_namcot340_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_namcot340_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; @@ -118,7 +118,7 @@ class nes_namcot175_device : public nes_namcot340_device { public: // construction/destruction - nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -139,7 +139,7 @@ class nes_namcot163_device : public nes_namcot340_device { public: // construction/destruction - nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override; diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp index 6a451b3c59d..71e9149b034 100644 --- a/src/devices/bus/nes/nanjing.cpp +++ b/src/devices/bus/nes/nanjing.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(NES_NANJING, nes_nanjing_device, "nes_nanjing", "NES Cart Nanjing PCB") -nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NANJING, tag, owner, clock) , m_count(0) , m_latch1(0) diff --git a/src/devices/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h index 979fbb1e5ee..df84e5e0767 100644 --- a/src/devices/bus/nes/nanjing.h +++ b/src/devices/bus/nes/nanjing.h @@ -16,7 +16,7 @@ class nes_nanjing_device : public nes_nrom_device { public: // construction/destruction - nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~nes_nanjing_device(); virtual uint8_t read_l(offs_t offset) override; diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index aae391d27c9..aeddae28fd1 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -650,7 +650,7 @@ void device_nes_cart_interface::nes_banks_restore() //------------------------------------------------- // nes_cart_slot_device - constructor //------------------------------------------------- -nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_CART_SLOT, tag, owner, clock) , device_cartrom_image_interface(mconfig, *this) , device_single_card_slot_interface<device_nes_cart_interface>(mconfig, *this) diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h index b135f957afe..21441fa8a81 100644 --- a/src/devices/bus/nes/nes_slot.h +++ b/src/devices/bus/nes/nes_slot.h @@ -387,7 +387,7 @@ class nes_cart_slot_device : public device_t, public: // construction/destruction template <typename T> - nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt) + nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt) : nes_cart_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -395,7 +395,7 @@ public: set_default_option(dflt); set_fixed(false); } - nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~nes_cart_slot_device(); // image-level overrides diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index fd207f20a00..cfe96acc201 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -40,17 +40,17 @@ DEFINE_DEVICE_TYPE(NES_NTDEC_FH, nes_ntdec_fh_device, "nes_ntdec_fh", DEFINE_DEVICE_TYPE(NES_NTDEC_N715021, nes_ntdec_n715021_device, "nes_ntdec_n715021", "NES Cart NTDEC N715021 PCB") -nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NTDEC_ASDER, tag, owner, clock), m_latch(0), m_chr_outer(0) { } -nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NTDEC_FH, tag, owner, clock) { } -nes_ntdec_n715021_device::nes_ntdec_n715021_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ntdec_n715021_device::nes_ntdec_n715021_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NTDEC_N715021, tag, owner, clock) { } diff --git a/src/devices/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h index 160511a388a..1185ce6f832 100644 --- a/src/devices/bus/nes/ntdec.h +++ b/src/devices/bus/nes/ntdec.h @@ -14,7 +14,7 @@ class nes_ntdec_asder_device : public nes_nrom_device { public: // construction/destruction - nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -35,7 +35,7 @@ class nes_ntdec_fh_device : public nes_nrom_device { public: // construction/destruction - nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -49,7 +49,7 @@ class nes_ntdec_n715021_device : public nes_nrom_device { public: // construction/destruction - nes_ntdec_n715021_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ntdec_n715021_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index 9f2e35aa0ed..0d02cc10cf2 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -57,72 +57,72 @@ DEFINE_DEVICE_TYPE(NES_UN1ROM, nes_un1rom_device, "nes_un1rom", "NES Cart DEFINE_DEVICE_TYPE(NES_NOCHR, nes_nochr_device, "nes_nochr", "NES Cart NoCash NOCHR PCB") -nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_nrom_device::nes_nrom_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_cart_interface(mconfig, *this) { } -nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NROM, tag, owner, clock) { } -nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NROM368, tag, owner, clock) { } -nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_FCBASIC, tag, owner, clock) { } -nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_AXROM, tag, owner, clock) { } -nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_BXROM, tag, owner, clock) { } -nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_chr_open_bus(0) { } -nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_cnrom_device(mconfig, NES_CNROM, tag, owner, clock) { } -nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CPROM, tag, owner, clock) { } -nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_GXROM, tag, owner, clock) { } -nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_UXROM, tag, owner, clock) { } -nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_UXROM_CC, tag, owner, clock) { } -nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_UN1ROM, tag, owner, clock) { } -nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_NOCHR, tag, owner, clock) { } diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h index 7dedbdb0cad..b0a62e6cffe 100644 --- a/src/devices/bus/nes/nxrom.h +++ b/src/devices/bus/nes/nxrom.h @@ -14,12 +14,12 @@ class nes_nrom_device : public device_t, public device_nes_cart_interface { public: // construction/destruction - nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; protected: - nes_nrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_nrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override { common_start(); } @@ -33,7 +33,7 @@ class nes_nrom368_device : public nes_nrom_device { public: // construction/destruction - nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override; @@ -47,7 +47,7 @@ class nes_fcbasic_device : public nes_nrom_device { public: // construction/destruction - nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // emulate the additional WRAM }; @@ -59,7 +59,7 @@ class nes_axrom_device : public nes_nrom_device { public: // construction/destruction - nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -73,7 +73,7 @@ class nes_bxrom_device : public nes_nrom_device { public: // construction/destruction - nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -85,7 +85,7 @@ class nes_cnrom_device : public nes_nrom_device { public: // construction/destruction - nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t chr_r(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -93,7 +93,7 @@ public: virtual void pcb_reset() override; protected: - nes_cnrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_cnrom_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; @@ -109,7 +109,7 @@ class nes_cprom_device : public nes_nrom_device { public: // construction/destruction - nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -123,7 +123,7 @@ class nes_gxrom_device : public nes_nrom_device { public: // construction/destruction - nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -135,7 +135,7 @@ class nes_uxrom_device : public nes_nrom_device { public: // construction/destruction - nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -149,7 +149,7 @@ class nes_uxrom_cc_device : public nes_nrom_device { public: // construction/destruction - nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -161,7 +161,7 @@ class nes_un1rom_device : public nes_nrom_device { public: // construction/destruction - nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -175,7 +175,7 @@ class nes_nochr_device : public nes_nrom_device { public: // construction/destruction - nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 chr_r(offs_t offset) override; virtual void chr_w(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 81a06c7d655..e8484eac863 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -47,62 +47,62 @@ DEFINE_DEVICE_TYPE(NES_43272, nes_43272_device, "nes_43272", " DEFINE_DEVICE_TYPE(NES_EH8813A, nes_eh8813a_device, "nes_eh8813a", "NES Cart UNL-EH8813A PCB") -nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_AGCI_50282, tag, owner, clock) { } -nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_DREAMTECH01, tag, owner, clock) { } -nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_FUKUTAKE, tag, owner, clock), m_latch(0) { } -nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_FUTUREMEDIA, tag, owner, clock), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) { } -nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_MAGSERIES, tag, owner, clock) { } -nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_DAOU306, tag, owner, clock) { } -nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CC21, tag, owner, clock) { } -nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_XIAOZY, tag, owner, clock) { } -nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_EDU2K, tag, owner, clock) { } -nes_jy830623c_device::nes_jy830623c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_jy830623c_device::nes_jy830623c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_JY830623C, tag, owner, clock), m_latch(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) { } -nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_43272, tag, owner, clock), m_latch(0) { } -nes_eh8813a_device::nes_eh8813a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_eh8813a_device::nes_eh8813a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_EH8813A, tag, owner, clock), m_jumper(0), m_latch(0), m_reg(0) { } diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h index 9f7be76cc56..b70a8373bc9 100644 --- a/src/devices/bus/nes/pirate.h +++ b/src/devices/bus/nes/pirate.h @@ -14,7 +14,7 @@ class nes_agci_device : public nes_nrom_device { public: // construction/destruction - nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -26,7 +26,7 @@ class nes_dreamtech_device : public nes_nrom_device { public: // construction/destruction - nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override; @@ -40,7 +40,7 @@ class nes_fukutake_device : public nes_nrom_device { public: // construction/destruction - nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override; @@ -65,7 +65,7 @@ class nes_futuremedia_device : public nes_nrom_device { public: // construction/destruction - nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -88,7 +88,7 @@ class nes_magseries_device : public nes_nrom_device { public: // construction/destruction - nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -100,7 +100,7 @@ class nes_daou306_device : public nes_nrom_device { public: // construction/destruction - nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -121,7 +121,7 @@ class nes_cc21_device : public nes_nrom_device { public: // construction/destruction - nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -135,7 +135,7 @@ class nes_xiaozy_device : public nes_nrom_device { public: // construction/destruction - nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; @@ -149,7 +149,7 @@ class nes_edu2k_device : public nes_nrom_device { public: // construction/destruction - nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -172,7 +172,7 @@ class nes_jy830623c_device : public nes_nrom_device { public: // construction/destruction - nes_jy830623c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_jy830623c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; virtual void write_h(offs_t offset, u8 data) override; @@ -200,7 +200,7 @@ class nes_43272_device : public nes_nrom_device { public: // construction/destruction - nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_h(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; @@ -222,7 +222,7 @@ class nes_eh8813a_device : public nes_nrom_device { public: // construction/destruction - nes_eh8813a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_eh8813a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -248,7 +248,7 @@ class nes_fujiya_device : public nes_nrom_device { public: // construction/destruction - nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index 024da1655a5..f21471edf88 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(NES_BANDAI_PT554, nes_bandai_pt554_device, "nes_bandai_pt554", "NES Cart Bandai PT-554 PCB") -nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_cnrom_device(mconfig, NES_BANDAI_PT554, tag, owner, clock) , m_samples(*this, "samples") { diff --git a/src/devices/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h index 51c2bdd9af3..44b1b0ce2c2 100644 --- a/src/devices/bus/nes/pt554.h +++ b/src/devices/bus/nes/pt554.h @@ -15,7 +15,7 @@ class nes_bandai_pt554_device : public nes_cnrom_device { public: // construction/destruction - nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp index 6ebc898721f..5bf55b9d151 100644 --- a/src/devices/bus/nes/racermate.cpp +++ b/src/devices/bus/nes/racermate.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(NES_RACERMATE, nes_racermate_device, "nes_racermate", "NES Cart Racermate PCB") -nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_RACERMATE, tag, owner, clock) , m_latch(0) { diff --git a/src/devices/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h index cb74a06a6b0..70d8191406c 100644 --- a/src/devices/bus/nes/racermate.h +++ b/src/devices/bus/nes/racermate.h @@ -12,7 +12,7 @@ class nes_racermate_device : public nes_nrom_device { public: // construction/destruction - nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index 4378d65c4df..133d8eb1c34 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -42,32 +42,32 @@ DEFINE_DEVICE_TYPE(NES_TF9IN1, nes_tf9_device, "nes_tetrisfam", "NES Cart R DEFINE_DEVICE_TYPE(NES_3DBLOCK, nes_3dblock_device, "nes_3dblock", "NES Cart RCM 3D Block PCB") -nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_GS2015, tag, owner, clock) { } -nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int bank) +nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int bank) : nes_nrom_device(mconfig, type, tag, owner, clock), m_base(bank * 0x2000) { } -nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_gs2004_device(mconfig, NES_GS2004, tag, owner, clock, 0x20) { } -nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_gs2004_device(mconfig, NES_GS2013, tag, owner, clock, 0x1f) { } -nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TF9IN1, tag, owner, clock) { } -nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_3DBLOCK, tag, owner, clock) { } diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h index 2f60fafef42..8e9ed96a343 100644 --- a/src/devices/bus/nes/rcm.h +++ b/src/devices/bus/nes/rcm.h @@ -14,7 +14,7 @@ class nes_gs2015_device : public nes_nrom_device { public: // construction/destruction - nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override { return read_m(offset); } virtual uint8_t read_m(offs_t offset) override; @@ -28,14 +28,14 @@ class nes_gs2004_device : public nes_nrom_device { public: // construction/destruction - nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; protected: // construction/destruction - nes_gs2004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int bank); + nes_gs2004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int bank); private: const u32 m_base; @@ -48,7 +48,7 @@ class nes_gs2013_device : public nes_gs2004_device { public: // construction/destruction - nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -58,7 +58,7 @@ class nes_tf9_device : public nes_nrom_device { public: // construction/destruction - nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -70,7 +70,7 @@ class nes_3dblock_device : public nes_nrom_device { public: // construction/destruction - nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index fdab817e515..e9e055a25e4 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -38,12 +38,12 @@ DEFINE_DEVICE_TYPE(NES_REX_DBZ5, nes_rex_dbz5_device, "nes_rex_dbz5", "NES DEFINE_DEVICE_TYPE(NES_REX_SL1632, nes_rex_sl1632_device, "nes_rex_sl1632", "NES Cart Rex Soft SL-1632 PCB") -nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_REX_DBZ5, tag, owner, clock), m_extra(0) { } -nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_REX_SL1632, tag, owner, clock), m_mode(0) { } diff --git a/src/devices/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h index 205dffce4d1..687bb15ebda 100644 --- a/src/devices/bus/nes/rexsoft.h +++ b/src/devices/bus/nes/rexsoft.h @@ -14,7 +14,7 @@ class nes_rex_dbz5_device : public nes_txrom_device { public: // construction/destruction - nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_m(offs_t offset) override { return read_l(offset); } @@ -38,7 +38,7 @@ class nes_rex_sl1632_device : public nes_txrom_device { public: // construction/destruction - nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void chr_cb(int start, int bank, int source) override; diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index 8e21943f97f..2c1ec1b4199 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -60,92 +60,92 @@ DEFINE_DEVICE_TYPE(NES_SACHEN_8259C, nes_sachen_8259c_device, "nes_s82 DEFINE_DEVICE_TYPE(NES_SACHEN_8259D, nes_sachen_8259d_device, "nes_s8259d", "NES Cart Sachen 8259D PCB") -nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_SA009, tag, owner, clock) { } -nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_SA0036, tag, owner, clock) { } -nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_SA0037, tag, owner, clock) { } -nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_SA72007, tag, owner, clock) { } -nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_SA72008, tag, owner, clock) { } -nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_TCA01, tag, owner, clock) { } -nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_TCU01, tag, owner, clock) { } -nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_TCU02, tag, owner, clock), m_latch(0) { } -nes_sachen_3013_device::nes_sachen_3013_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sachen_3013_device::nes_sachen_3013_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_3013, tag, owner, clock) { } -nes_sachen_3014_device::nes_sachen_3014_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sachen_3014_device::nes_sachen_3014_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SACHEN_3014, tag, owner, clock), m_latch(0) { } -nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_mmc_vrom_bank(0) { } -nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_74x374_device(mconfig, NES_SACHEN_74X374, tag, owner, clock) { } -nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_74x374_device(mconfig, NES_SACHEN_74X374_ALT, tag, owner, clock) { } -nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_74x374_device(mconfig, type, tag, owner, clock) { } -nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259A, tag, owner, clock) { } -nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259B, tag, owner, clock) { } -nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259C, tag, owner, clock) { } -nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sachen_8259a_device(mconfig, NES_SACHEN_8259D, tag, owner, clock) { } diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h index 51d80966380..cb835737b3f 100644 --- a/src/devices/bus/nes/sachen.h +++ b/src/devices/bus/nes/sachen.h @@ -14,7 +14,7 @@ class nes_sachen_sa009_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; }; @@ -26,7 +26,7 @@ class nes_sachen_sa0036_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -38,7 +38,7 @@ class nes_sachen_sa0037_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; }; @@ -50,7 +50,7 @@ class nes_sachen_sa72007_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; }; @@ -62,7 +62,7 @@ class nes_sachen_sa72008_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; }; @@ -74,7 +74,7 @@ class nes_sachen_tca01_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; @@ -88,7 +88,7 @@ class nes_sachen_tcu01_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_m(offs_t offset, uint8_t data) override { write_l((offset + 0x100) & 0xfff, data); } @@ -102,7 +102,7 @@ class nes_sachen_tcu02_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -124,7 +124,7 @@ class nes_sachen_3013_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_3013_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_3013_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; }; @@ -136,7 +136,7 @@ class nes_sachen_3014_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_3014_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sachen_3014_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_h(offs_t offset) override; virtual void write_h(offs_t offset, u8 data) override; @@ -158,7 +158,7 @@ class nes_sachen_74x374_device : public nes_nrom_device { public: // construction/destruction - nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -166,7 +166,7 @@ public: virtual void pcb_reset() override; protected: - nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_74x374_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; @@ -182,7 +182,7 @@ class nes_sachen_74x374_alt_device : public nes_sachen_74x374_device { public: // construction/destruction - nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override { return 0xff; } // no read_l here virtual void write_l(offs_t offset, uint8_t data) override; @@ -195,7 +195,7 @@ class nes_sachen_8259a_device : public nes_sachen_74x374_device { public: // construction/destruction - nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_m(offs_t offset, uint8_t data) override { write_l((offset + 0x100) & 0xfff, data); } @@ -203,7 +203,7 @@ public: virtual void pcb_reset() override; protected: - nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_8259a_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; @@ -219,7 +219,7 @@ class nes_sachen_8259b_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void chr_update() override; @@ -232,7 +232,7 @@ class nes_sachen_8259c_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void chr_update() override; @@ -245,7 +245,7 @@ class nes_sachen_8259d_device : public nes_sachen_8259a_device { public: // construction/destruction - nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void pcb_reset() override; diff --git a/src/devices/bus/nes/sealie.cpp b/src/devices/bus/nes/sealie.cpp index 32adda5680c..38f7af9ec3e 100644 --- a/src/devices/bus/nes/sealie.cpp +++ b/src/devices/bus/nes/sealie.cpp @@ -39,27 +39,27 @@ DEFINE_DEVICE_TYPE(NES_DPCMCART, nes_dpcmcart_device, "nes_dpcmcart", "NES Cart DEFINE_DEVICE_TYPE(NES_UNROM512, nes_unrom512_device, "nes_unrom512", "NES Cart Sealie UNROM 512 PCB") -nes_cufrom_device::nes_cufrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cufrom_device::nes_cufrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_CUFROM, tag, owner, clock) { } -nes_dpcmcart_device::nes_dpcmcart_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_dpcmcart_device::nes_dpcmcart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_DPCMCART, tag, owner, clock) { } -nes_unrom512_device::nes_unrom512_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_unrom512_device::nes_unrom512_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock) { } -nes_unrom512_device::nes_unrom512_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_unrom512_device::nes_unrom512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_unrom512_device(mconfig, NES_UNROM512, tag, owner, clock) { } -nes_8bitxmas_device::nes_8bitxmas_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_8bitxmas_device::nes_8bitxmas_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_unrom512_device(mconfig, NES_8BITXMAS, tag, owner, clock), m_led(0) { } diff --git a/src/devices/bus/nes/sealie.h b/src/devices/bus/nes/sealie.h index 734d69741c6..7827b9584e5 100644 --- a/src/devices/bus/nes/sealie.h +++ b/src/devices/bus/nes/sealie.h @@ -14,7 +14,7 @@ class nes_cufrom_device : public nes_nrom_device { public: // construction/destruction - nes_cufrom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cufrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -28,7 +28,7 @@ class nes_dpcmcart_device : public nes_nrom_device { public: // construction/destruction - nes_dpcmcart_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_dpcmcart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -42,7 +42,7 @@ class nes_unrom512_device : public nes_nrom_device { public: // construction/destruction - nes_unrom512_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_unrom512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -50,7 +50,7 @@ public: protected: // construction/destruction - nes_unrom512_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_unrom512_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -60,7 +60,7 @@ class nes_8bitxmas_device : public nes_unrom512_device { public: // construction/destruction - nes_8bitxmas_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_8bitxmas_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp index bdf5b21b885..b31be0ca2ae 100644 --- a/src/devices/bus/nes/somari.cpp +++ b/src/devices/bus/nes/somari.cpp @@ -37,17 +37,17 @@ DEFINE_DEVICE_TYPE(NES_SOMARI, nes_somari_device, "nes_somari", "NES Cart Team S DEFINE_DEVICE_TYPE(NES_HUANG2, nes_huang2_device, "nes_huang2", "NES Cart Huang-2 PCB") -nes_somari_device::nes_somari_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 mmc1_prg_shift) +nes_somari_device::nes_somari_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 mmc1_prg_shift) : nes_txrom_device(mconfig, type, tag, owner, clock), m_board_mode(0), m_mmc1_count(0), m_mmc1_latch(0), m_mmc1_prg_shift(mmc1_prg_shift), m_vrc_mirror(0) { } -nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_somari_device(mconfig, NES_SOMARI, tag, owner, clock, 0) { } -nes_huang2_device::nes_huang2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_huang2_device::nes_huang2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_somari_device(mconfig, NES_HUANG2, tag, owner, clock, 1) { } diff --git a/src/devices/bus/nes/somari.h b/src/devices/bus/nes/somari.h index 2c566696242..f5d868aacfc 100644 --- a/src/devices/bus/nes/somari.h +++ b/src/devices/bus/nes/somari.h @@ -14,7 +14,7 @@ class nes_somari_device : public nes_txrom_device { public: // construction/destruction - nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, u8 data) override { write_m(offset + 0x100, data); } virtual void write_m(offs_t offset, u8 data) override; @@ -24,7 +24,7 @@ public: protected: // construction/destruction - nes_somari_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 mmc1_prg_shift); + nes_somari_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 mmc1_prg_shift); // device-level overrides virtual void device_start() override; @@ -59,7 +59,7 @@ class nes_huang2_device : public nes_somari_device { public: // construction/destruction - nes_huang2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_huang2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/bus/nes/subor.cpp b/src/devices/bus/nes/subor.cpp index 2c9daf203ee..f04963767df 100644 --- a/src/devices/bus/nes/subor.cpp +++ b/src/devices/bus/nes/subor.cpp @@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(NES_SUBOR2, nes_subor2_device, "nes_subor2", "NES Cart Subor // nes_subor0_device - constructor //------------------------------------------------- -nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUBOR0, tag, owner, clock) { } @@ -49,7 +49,7 @@ nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char * // nes_subor1_device - constructor //------------------------------------------------- -nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUBOR1, tag, owner, clock) { } @@ -58,7 +58,7 @@ nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char * // nes_subor2_device - constructor //------------------------------------------------- -nes_subor2_device::nes_subor2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_subor2_device::nes_subor2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUBOR2, tag, owner, clock) , m_switch_reg(0) , m_bank_reg(0) diff --git a/src/devices/bus/nes/subor.h b/src/devices/bus/nes/subor.h index a4ffc13a553..3cbbf9db606 100644 --- a/src/devices/bus/nes/subor.h +++ b/src/devices/bus/nes/subor.h @@ -18,7 +18,7 @@ class nes_subor0_device : { public: // construction/destruction - nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -39,7 +39,7 @@ class nes_subor1_device : { public: // construction/destruction - nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -60,7 +60,7 @@ class nes_subor2_device : { public: // construction/destruction - nes_subor2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_subor2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t nt_r(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index ffe5aec9005..ae84d6f726f 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -49,42 +49,42 @@ DEFINE_DEVICE_TYPE(NES_SUNSOFT_FME7, nes_sunsoft_fme7_device, "nes_fme7", "NES C DEFINE_DEVICE_TYPE(NES_SUNSOFT_5, nes_sunsoft_5_device, "nes_sun5", "NES Cart Sunsoft 5A/5B PCB") -nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUNSOFT_1, tag, owner, clock) { } -nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUNSOFT_2, tag, owner, clock) { } -nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_SUNSOFT_3, tag, owner, clock), m_irq_count(0), m_irq_enable(0), m_irq_toggle(0), irq_timer(nullptr) { } -nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_wram_enable(0) { } -nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sunsoft_4_device(mconfig, NES_SUNSOFT_4, tag, owner, clock) { } -nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0) { } -nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sunsoft_fme7_device(mconfig, NES_SUNSOFT_FME7, tag, owner, clock) { } -nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sunsoft_fme7_device(mconfig, NES_SUNSOFT_5, tag, owner, clock) , m_ym2149(*this, "ay") { diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 000150922c7..d2c4e41a622 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -15,7 +15,7 @@ class nes_sunsoft_1_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, uint8_t data) override; @@ -29,7 +29,7 @@ class nes_sunsoft_2_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -43,7 +43,7 @@ class nes_sunsoft_3_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -69,7 +69,7 @@ class nes_sunsoft_4_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -79,7 +79,7 @@ public: virtual void pcb_reset() override; protected: - nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_sunsoft_4_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; @@ -99,7 +99,7 @@ class nes_sunsoft_fme7_device : public nes_nrom_device { public: // construction/destruction - nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; @@ -109,7 +109,7 @@ public: virtual void pcb_reset() override; protected: - nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_fme7_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; @@ -133,7 +133,7 @@ class nes_sunsoft_5_device : public nes_sunsoft_fme7_device { public: // construction/destruction - nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index 7f291e741ed..2b271d2dd9f 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -50,7 +50,7 @@ ntb_cart_interface::~ntb_cart_interface() DEFINE_DEVICE_TYPE(NES_NTB_SLOT, nes_ntb_slot_device, "nes_ntb_slot", "NES NTB Cartridge Slot") -nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_NTB_SLOT, tag, owner, clock) , device_cartrom_image_interface(mconfig, *this) , device_single_card_slot_interface<ntb_cart_interface>(mconfig, *this) @@ -123,7 +123,7 @@ ROM_END DEFINE_DEVICE_TYPE(NES_NTB_ROM, nes_ntb_rom_device, "nes_ntbrom", "NES NTB ROM") -nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NES_NTB_ROM, tag, owner, clock) , ntb_cart_interface(mconfig, *this) { @@ -157,7 +157,7 @@ uint8_t *nes_ntb_rom_device::get_cart_base() DEFINE_DEVICE_TYPE(NES_SUNSOFT_DCS, nes_sunsoft_dcs_device, "nes_dcs", "NES Cart Sunsoft DCS PCB") -nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, tag, owner, clock), m_timer_on(0), m_exrom_enable(0) , m_subslot(*this, "ntb_slot"), ntb_enable_timer(nullptr) { diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h index e9f6594a452..a3f90b4acfc 100644 --- a/src/devices/bus/nes/sunsoft_dcs.h +++ b/src/devices/bus/nes/sunsoft_dcs.h @@ -48,7 +48,7 @@ public: // construction/destruction template <typename T> nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts) - : nes_ntb_slot_device(mconfig, tag, owner, (uint32_t)0) + : nes_ntb_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -56,7 +56,7 @@ public: set_fixed(false); } - nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~nes_ntb_slot_device(); // image-level overrides @@ -95,7 +95,7 @@ class nes_ntb_rom_device : public device_t, { public: // construction/destruction - nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_ntb_rom_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; @@ -125,7 +125,7 @@ class nes_sunsoft_dcs_device : public nes_sunsoft_4_device { public: // construction/destruction - nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_m(offs_t offset) override; virtual uint8_t read_h(offs_t offset) override; diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index a3689c8f4a7..47b0621f741 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -46,27 +46,27 @@ DEFINE_DEVICE_TYPE(NES_X1_005, nes_x1_005_device, "nes_x1_ DEFINE_DEVICE_TYPE(NES_X1_017, nes_x1_017_device, "nes_x1_017", "NES Cart Taito X1-017 PCB") -nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock) { } -nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tc0190fmc_device(mconfig, NES_TC0190FMC, tag, owner, clock) { } -nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, tag, owner, clock), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0) { } -nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_X1_005, tag, owner, clock), m_latch(0) { } -nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_X1_017, tag, owner, clock), m_latch(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr) { } diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h index 6f3981aa993..843f662edcf 100644 --- a/src/devices/bus/nes/taito.h +++ b/src/devices/bus/nes/taito.h @@ -14,14 +14,14 @@ class nes_tc0190fmc_device : public nes_nrom_device { public: // construction/destruction - nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; protected: - nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -31,7 +31,7 @@ class nes_tc0190fmc_pal16r4_device : public nes_tc0190fmc_device { public: // construction/destruction - nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -54,7 +54,7 @@ class nes_x1_005_device : public nes_nrom_device { public: // construction/destruction - nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -78,7 +78,7 @@ class nes_x1_017_device : public nes_nrom_device { public: // construction/destruction - nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_ex(offs_t offset) override { return 0; } // no open bus virtual u8 read_l(offs_t offset) override { return 0; } // no open bus diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 3b74a13f2cd..735dcc52c7a 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -39,17 +39,17 @@ DEFINE_DEVICE_TYPE(NES_TENGEN_800032, nes_tengen032_device, "nes_tengen032", "NE DEFINE_DEVICE_TYPE(NES_TENGEN_800037, nes_tengen037_device, "nes_tengen037", "NES Cart Tengen 800037 PCB") -nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock), m_latch(0), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_irq_pending(0), irq_timer(nullptr) { } -nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tengen032_device(mconfig, NES_TENGEN_800032, tag, owner, clock) { } -nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_tengen032_device(mconfig, NES_TENGEN_800037, tag, owner, clock) { } diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index d5dbec1e88b..efa07c88332 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -12,7 +12,7 @@ class nes_tengen032_device : public nes_nrom_device { public: // construction/destruction - nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -20,7 +20,7 @@ public: virtual void pcb_reset() override; protected: - nes_tengen032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_tengen032_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; @@ -53,7 +53,7 @@ class nes_tengen037_device : public nes_tengen032_device { public: // construction/destruction - nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void write_h(offs_t offset, u8 data) override; diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index 398adbd17f3..1d4616b2775 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -44,32 +44,32 @@ DEFINE_DEVICE_TYPE(NES_TXC_STRIKEW, nes_txc_strikew_device, "nes_txc_strike DEFINE_DEVICE_TYPE(NES_TXC_COMMANDOS, nes_txc_commandos_device, "nes_txc_comm", "NES Cart TXC Cart Commandos PCB") // and others -nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, type, tag, owner, clock) { } -nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TXC_22211, tag, owner, clock) { } -nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txc_22211_device(mconfig, NES_TXC_DUMARACING, tag, owner, clock) { } -nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txc_22211_device(mconfig, NES_TXC_MJBLOCK, tag, owner, clock) { } -nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TXC_STRIKEW, tag, owner, clock) { } -nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_TXC_COMMANDOS, tag, owner, clock) { } diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h index 4e7f938c1a8..9e546f440dc 100644 --- a/src/devices/bus/nes/txc.h +++ b/src/devices/bus/nes/txc.h @@ -14,7 +14,7 @@ class nes_txc_22211_device : public nes_nrom_device { public: // construction/destruction - nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -23,7 +23,7 @@ public: virtual void pcb_reset() override; protected: - nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_txc_22211_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; @@ -38,7 +38,7 @@ class nes_txc_dumarc_device : public nes_txc_22211_device { public: // construction/destruction - nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -50,7 +50,7 @@ class nes_txc_mjblock_device : public nes_txc_22211_device { public: // construction/destruction - nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; }; @@ -62,7 +62,7 @@ class nes_txc_strikew_device : public nes_nrom_device { public: // construction/destruction - nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; @@ -84,7 +84,7 @@ class nes_txc_commandos_device : public nes_nrom_device { public: // construction/destruction - nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/vrc_clones.cpp b/src/devices/bus/nes/vrc_clones.cpp index 506857df85f..fa28b0a1b9b 100644 --- a/src/devices/bus/nes/vrc_clones.cpp +++ b/src/devices/bus/nes/vrc_clones.cpp @@ -44,77 +44,77 @@ DEFINE_DEVICE_TYPE(NES_WAIXING_SGZ, nes_waixing_sgz_device, "nes_waixing_sgz", " DEFINE_DEVICE_TYPE(NES_HENGG_SHJY3, nes_hengg_shjy3_device, "nes_hengg_shjy3", "NES Cart Henggedianzi Shen Hua Jian Yun III PCB") -nes_2yudb_device::nes_2yudb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_2yudb_device::nes_2yudb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_2YUDB, tag, owner, clock), m_outer(0) { } -nes_900218_device::nes_900218_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_900218_device::nes_900218_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc2_device(mconfig, NES_900218, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_ax40g_device::nes_ax40g_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ax40g_device::nes_ax40g_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc2_device(mconfig, NES_AX40G, tag, owner, clock) { } -nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_AX5705, tag, owner, clock) { } -nes_bmc_830506c_device::nes_bmc_830506c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_830506c_device::nes_bmc_830506c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_BMC_830506C, tag, owner, clock), m_outer(0) { } -nes_bmc_831128c_device::nes_bmc_831128c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_831128c_device::nes_bmc_831128c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_BMC_831128C, tag, owner, clock), m_reg(0) { } -nes_bmc_kl06_device::nes_bmc_kl06_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_bmc_kl06_device::nes_bmc_kl06_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_BMC_KL06, tag, owner, clock), m_reg(0) { } -nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_CITYFIGHT, tag, owner, clock) { } -nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_SHUIGUAN, tag, owner, clock) { } -nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_T230, tag, owner, clock) { } -nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc4_device(mconfig, NES_TF1201, tag, owner, clock) { } -nes_th21311_device::nes_th21311_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_th21311_device::nes_th21311_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_konami_vrc2_device(mconfig, NES_TH21311, tag, owner, clock), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr) { } -nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 chr_match) +nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 chr_match) : nes_konami_vrc4_device(mconfig, type, tag, owner, clock), m_chr_match(chr_match) { } -nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_sgz_device(mconfig, NES_WAIXING_SGZ, tag, owner, clock, 0x06) { } -nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_sgz_device(mconfig, NES_HENGG_SHJY3, tag, owner, clock, 0x04) { } diff --git a/src/devices/bus/nes/vrc_clones.h b/src/devices/bus/nes/vrc_clones.h index c6fe5b55550..c48e35c8216 100644 --- a/src/devices/bus/nes/vrc_clones.h +++ b/src/devices/bus/nes/vrc_clones.h @@ -14,7 +14,7 @@ class nes_2yudb_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_2yudb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_2yudb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -37,7 +37,7 @@ class nes_900218_device : public nes_konami_vrc2_device { public: // construction/destruction - nes_900218_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_900218_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -63,7 +63,7 @@ class nes_ax40g_device : public nes_konami_vrc2_device { public: // construction/destruction - nes_ax40g_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ax40g_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -79,7 +79,7 @@ class nes_ax5705_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -95,7 +95,7 @@ class nes_bmc_830506c_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_bmc_830506c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_830506c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -119,7 +119,7 @@ class nes_bmc_831128c_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_bmc_831128c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_831128c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -142,7 +142,7 @@ class nes_bmc_kl06_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_bmc_kl06_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_bmc_kl06_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_m(offs_t offset, u8 data) override; @@ -166,7 +166,7 @@ class nes_cityfight_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -182,7 +182,7 @@ class nes_shuiguan_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_m(offs_t offset) override; virtual void write_m(offs_t offset, u8 data) override; @@ -205,7 +205,7 @@ class nes_t230_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -221,7 +221,7 @@ class nes_tf1201_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -237,7 +237,7 @@ class nes_th21311_device : public nes_konami_vrc2_device { public: // construction/destruction - nes_th21311_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_th21311_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; @@ -264,14 +264,14 @@ class nes_waixing_sgz_device : public nes_konami_vrc4_device { public: // construction/destruction - nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; virtual void chr_w(offs_t offset, u8 data) override; protected: // construction/destruction - nes_waixing_sgz_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 chr_match); + nes_waixing_sgz_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 chr_match); // device-level overrides virtual void device_start() override; @@ -286,7 +286,7 @@ class nes_hengg_shjy3_device : public nes_waixing_sgz_device { public: // construction/destruction - nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 1f286c00485..6427b540691 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -54,122 +54,122 @@ DEFINE_DEVICE_TYPE(NES_WAIXING_WXZS2, nes_waixing_wxzs2_device, "nes_waixing_wxz DEFINE_DEVICE_TYPE(NES_WAIXING_FS304, nes_waixing_fs304_device, "nes_waixing_fs304", "NES Cart Waixing FS-304 PCB") -nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock) { } -nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_A, tag, owner, clock) { } -nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_A1, tag, owner, clock) { } -nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_B, tag, owner, clock) { } -nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_C, tag, owner, clock) { } -nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_D, tag, owner, clock) { } -nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_E, tag, owner, clock) { } -nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock) { } -nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_f_device(mconfig, NES_WAIXING_F, tag, owner, clock) { } -nes_waixing_f1_device::nes_waixing_f1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_waixing_f1_device::nes_waixing_f1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_f_device(mconfig, NES_WAIXING_F1, tag, owner, clock) { } -nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_G, tag, owner, clock) { } -nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, type, tag, owner, clock) { } -nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_h_device(mconfig, NES_WAIXING_H, tag, owner, clock) { } -nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_h_device(mconfig, NES_WAIXING_H1, tag, owner, clock) { } -nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_I, tag, owner, clock) { } -nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_waixing_a_device(mconfig, NES_WAIXING_J, tag, owner, clock) { } -nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_WAIXING_SH2, tag, owner, clock) { } -nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_txrom_device(mconfig, NES_WAIXING_SEC, tag, owner, clock), m_reg(0) { } -nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, tag, owner, clock), m_reg{ 0, 0, 0, 0 } { } -nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_FFV, tag, owner, clock) { } -nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_WXZS, tag, owner, clock) { } -nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_DQ8, tag, owner, clock) { } -nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_WXZS2, tag, owner, clock) { } -nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_WAIXING_FS304, tag, owner, clock) { } diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h index 78a979f4b0b..2f660c8f299 100644 --- a/src/devices/bus/nes/waixing.h +++ b/src/devices/bus/nes/waixing.h @@ -14,7 +14,7 @@ class nes_waixing_a_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t read_l(offs_t offset) override; virtual void write_l(offs_t offset, uint8_t data) override; @@ -25,7 +25,7 @@ public: virtual void pcb_reset() override; protected: - nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_a_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; @@ -42,7 +42,7 @@ class nes_waixing_a1_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -54,7 +54,7 @@ class nes_waixing_b_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -66,7 +66,7 @@ class nes_waixing_c_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -78,7 +78,7 @@ class nes_waixing_d_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -90,7 +90,7 @@ class nes_waixing_e_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void chr_cb(int start, int bank, int source) override; }; @@ -102,14 +102,14 @@ class nes_waixing_f_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 read_l(offs_t offset) override; virtual void write_l(offs_t offset, u8 data) override; protected: // construction/destruction - nes_waixing_f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + nes_waixing_f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -119,7 +119,7 @@ class nes_waixing_f1_device : public nes_waixing_f_device { public: // construction/destruction - nes_waixing_f1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_waixing_f1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void set_chr(uint8_t chr, int chr_base, int chr_mask) override; @@ -132,7 +132,7 @@ class nes_waixing_g_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void chr_cb(int start, int bank, int source) override; @@ -150,7 +150,7 @@ class nes_waixing_h_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; virtual void chr_cb(int start, int bank, int source) override; @@ -158,7 +158,7 @@ public: // This PCB does not have 1K of internal RAM, so it's not derived from nes_waixing_a_device!! protected: - nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; @@ -168,7 +168,7 @@ class nes_waixing_h1_device : public nes_waixing_h_device { public: // construction/destruction - nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -182,7 +182,7 @@ class nes_waixing_i_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // still to emulate this variant }; @@ -194,7 +194,7 @@ class nes_waixing_j_device : public nes_waixing_a_device { public: // construction/destruction - nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; @@ -215,7 +215,7 @@ class nes_waixing_sh2_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual u8 chr_r(offs_t offset) override; @@ -238,7 +238,7 @@ class nes_waixing_sec_device : public nes_txrom_device { public: // construction/destruction - nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; virtual void prg_cb(int start, int bank) override; @@ -260,7 +260,7 @@ class nes_waixing_sgzlz_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; @@ -280,7 +280,7 @@ class nes_waixing_ffv_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; @@ -300,7 +300,7 @@ class nes_waixing_wxzs_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -312,7 +312,7 @@ class nes_waixing_dq8_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -324,7 +324,7 @@ class nes_waixing_wxzs2_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, uint8_t data) override; }; @@ -336,7 +336,7 @@ class nes_waixing_fs304_device : public nes_nrom_device { public: // construction/destruction - nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_l(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/nes/zemina.cpp b/src/devices/bus/nes/zemina.cpp index b46da0e7561..7aa684b8cfb 100644 --- a/src/devices/bus/nes/zemina.cpp +++ b/src/devices/bus/nes/zemina.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(NES_ZEMINA, nes_zemina_device, "nes_zemina", "NES Cart Zemina // constructor //------------------------------------------------- -nes_zemina_device::nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +nes_zemina_device::nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nes_nrom_device(mconfig, NES_ZEMINA, tag, owner, clock) { } diff --git a/src/devices/bus/nes/zemina.h b/src/devices/bus/nes/zemina.h index 992ecdb2c13..6adb9fad091 100644 --- a/src/devices/bus/nes/zemina.h +++ b/src/devices/bus/nes/zemina.h @@ -15,7 +15,7 @@ class nes_zemina_device : public nes_nrom_device { public: // construction/destruction - nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void write_h(offs_t offset, u8 data) override; |