diff options
Diffstat (limited to 'src/devices/cpu/nec')
-rw-r--r-- | src/devices/cpu/nec/nec.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/nec/nec.h | 12 | ||||
-rw-r--r-- | src/devices/cpu/nec/v25.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/nec/v25.h | 6 | ||||
-rw-r--r-- | src/devices/cpu/nec/v5x.cpp | 18 | ||||
-rw-r--r-- | src/devices/cpu/nec/v5x.h | 12 |
6 files changed, 33 insertions, 33 deletions
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index 3a961a0a4be..743b6061a46 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -121,7 +121,7 @@ DEFINE_DEVICE_TYPE(V33, v33_device, "v33", "NEC V33") DEFINE_DEVICE_TYPE(V33A, v33a_device, "v33a", "NEC V33A") -nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type, address_map_constructor internal_port_map) +nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type, address_map_constructor internal_port_map) : cpu_device(mconfig, type, tag, owner, clock) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, chip_type == V33_TYPE ? 24 : 20, 0, 20, chip_type == V33_TYPE ? 14 : 0) , m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 16, 0, internal_port_map) @@ -133,13 +133,13 @@ nec_common_device::nec_common_device(const machine_config &mconfig, device_type } -v20_device::v20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v20_device::v20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nec_common_device(mconfig, V20, tag, owner, clock, false, 4, 4, V20_TYPE) { } -v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nec_common_device(mconfig, V30, tag, owner, clock, true, 6, 2, V30_TYPE) { } @@ -156,19 +156,19 @@ device_memory_interface::space_config_vector nec_common_device::memory_space_con /* FIXME: Need information about prefetch size and cycles for V33. * complete guess below, nbbatman will not work * properly without. */ -v33_base_device::v33_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_port_map) +v33_base_device::v33_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor internal_port_map) : nec_common_device(mconfig, type, tag, owner, clock, true, 6, 1, V33_TYPE, internal_port_map) { } -v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v33_base_device(mconfig, V33, tag, owner, clock, address_map_constructor(FUNC(v33_device::v33_internal_port_map), this)) { } -v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v33_base_device(mconfig, V33A, tag, owner, clock, address_map_constructor(FUNC(v33a_device::v33_internal_port_map), this)) { } diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index 764afdd76c1..19a2ee22cf5 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -28,7 +28,7 @@ class nec_common_device : public cpu_device, public nec_disassembler::config protected: // construction/destruction - nec_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type, address_map_constructor internal_port_map = address_map_constructor()); + nec_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type, address_map_constructor internal_port_map = address_map_constructor()); // device-level overrides virtual void device_start() override; @@ -672,21 +672,21 @@ private: class v20_device : public nec_common_device { public: - v20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class v30_device : public nec_common_device { public: - v30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v30_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class v33_base_device : public nec_common_device { protected: - v33_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_port_map); + v33_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor internal_port_map); // device_memory_interface overrides virtual bool memory_translate(int spacenum, int intention, offs_t &address) override; @@ -698,13 +698,13 @@ protected: class v33_device : public v33_base_device { public: - v33_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v33_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class v33a_device : public v33_base_device { public: - v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index 321db738a04..5cacb9006f9 100644 --- a/src/devices/cpu/nec/v25.cpp +++ b/src/devices/cpu/nec/v25.cpp @@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(V25, v25_device, "v25", "NEC V25") DEFINE_DEVICE_TYPE(V35, v35_device, "v35", "NEC V35") -v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type) +v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type) : cpu_device(mconfig, type, tag, owner, clock) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0) , m_data_config("data", ENDIANNESS_LITTLE, 16, 9, 0, address_map_constructor(FUNC(v25_common_device::ida_sfr_map), this)) @@ -72,13 +72,13 @@ v25_common_device::v25_common_device(const machine_config &mconfig, device_type } -v25_device::v25_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v25_device::v25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v25_common_device(mconfig, V25, tag, owner, clock, false, 4, 4, V20_TYPE) { } -v35_device::v35_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +v35_device::v35_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v25_common_device(mconfig, V35, tag, owner, clock, true, 6, 2, V30_TYPE) { } diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index 1afeb9a7eb5..f92460fb927 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -43,7 +43,7 @@ public: protected: // construction/destruction - v25_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type); + v25_common_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type); // device-level overrides virtual void device_start() override; @@ -536,14 +536,14 @@ private: class v25_device : public v25_common_device { public: - v25_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class v35_device : public v25_common_device { public: - v35_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v35_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/cpu/nec/v5x.cpp b/src/devices/cpu/nec/v5x.cpp index 9faeed6bfd9..39eef1b4cc0 100644 --- a/src/devices/cpu/nec/v5x.cpp +++ b/src/devices/cpu/nec/v5x.cpp @@ -213,14 +213,14 @@ void device_v5x_interface::v5x_add_mconfig(machine_config &config) { PIT8254(config, m_tcu); - V5X_DMAU(config, m_dmau, 4000000); + V5X_DMAU(config, m_dmau, XTAL::u(4000000)); - V5X_ICU(config, m_icu, 0); + V5X_ICU(config, m_icu); m_icu->out_int_callback().set(FUNC(device_v5x_interface::internal_irq_w)); m_icu->in_sp_callback().set_constant(1); m_icu->read_slave_ack_callback().set(FUNC(device_v5x_interface::get_pic_ack)); - V5X_SCU(config, m_scu, 0); + V5X_SCU(config, m_scu); } void device_v5x_interface::remappable_io_map(address_map &map) @@ -516,7 +516,7 @@ device_memory_interface::space_config_vector v50_base_device::memory_space_confi return spaces; } -v50_base_device::v50_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool is_16bit, u8 prefetch_size, u8 prefetch_cycles, u32 chip_type) +v50_base_device::v50_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, u8 prefetch_size, u8 prefetch_cycles, u32 chip_type) : nec_common_device(mconfig, type, tag, owner, clock, is_16bit, prefetch_size, prefetch_cycles, chip_type, address_map_constructor(FUNC(v50_base_device::internal_port_map), this)) , device_v5x_interface(mconfig, *this, is_16bit) , m_tout1_callback(*this) @@ -527,12 +527,12 @@ v50_base_device::v50_base_device(const machine_config &mconfig, device_type type { } -v40_device::v40_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +v40_device::v40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v50_base_device(mconfig, V40, tag, owner, clock, false, 4, 4, V20_TYPE) { } -v50_device::v50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +v50_device::v50_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v50_base_device(mconfig, V50, tag, owner, clock, true, 6, 2, V30_TYPE) { } @@ -785,18 +785,18 @@ device_memory_interface::space_config_vector v53_device::memory_space_config() c }; } -v53_device::v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +v53_device::v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : v33_base_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(v53_device::internal_port_map), this)) , device_v5x_interface(mconfig, *this, true) { } -v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v53_device(mconfig, V53, tag, owner, clock) { } -v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : v53_device(mconfig, V53A, tag, owner, clock) { } diff --git a/src/devices/cpu/nec/v5x.h b/src/devices/cpu/nec/v5x.h index 23fcdc265a9..c07341fbe91 100644 --- a/src/devices/cpu/nec/v5x.h +++ b/src/devices/cpu/nec/v5x.h @@ -149,7 +149,7 @@ public: auto tout2_cb() { return subdevice<pit8253_device>("tcu")->out_handler<2>(); } protected: - v50_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, bool is_16bit, u8 prefetch_size, u8 prefetch_cycles, u32 chip_type); + v50_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool is_16bit, u8 prefetch_size, u8 prefetch_cycles, u32 chip_type); // device-specific overrides virtual void device_add_mconfig(machine_config &config) override; @@ -191,7 +191,7 @@ private: class v40_device : public v50_base_device { public: - v40_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + v40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void install_peripheral_io() override; @@ -200,7 +200,7 @@ protected: class v50_device : public v50_base_device { public: - v50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + v50_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void install_peripheral_io() override; @@ -209,7 +209,7 @@ protected: class v53_device : public v33_base_device, public device_v5x_interface { public: - v53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + v53_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <unsigned Channel> DECLARE_WRITE_LINE_MEMBER(dreq_w) { @@ -228,7 +228,7 @@ public: template <unsigned Timer> auto out_handler() { return subdevice<pit8253_device>("tcu")->out_handler<Timer>(); } protected: - v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-specific overrides virtual void device_add_mconfig(machine_config &config) override; @@ -262,7 +262,7 @@ private: class v53a_device : public v53_device { public: - v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(V40, v40_device) |