summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vcs
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/vcs')
-rw-r--r--src/devices/bus/vcs/compumat.cpp2
-rw-r--r--src/devices/bus/vcs/compumat.h2
-rw-r--r--src/devices/bus/vcs/dpc.cpp6
-rw-r--r--src/devices/bus/vcs/dpc.h4
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp4
-rw-r--r--src/devices/bus/vcs/harmony_melody.h2
-rw-r--r--src/devices/bus/vcs/rom.cpp44
-rw-r--r--src/devices/bus/vcs/rom.h44
-rw-r--r--src/devices/bus/vcs/scharger.cpp2
-rw-r--r--src/devices/bus/vcs/scharger.h2
-rw-r--r--src/devices/bus/vcs/vcs_slot.cpp2
-rw-r--r--src/devices/bus/vcs/vcs_slot.h4
12 files changed, 59 insertions, 59 deletions
diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp
index ff1beac7287..279e57aee4d 100644
--- a/src/devices/bus/vcs/compumat.cpp
+++ b/src/devices/bus/vcs/compumat.cpp
@@ -16,7 +16,7 @@
DEFINE_DEVICE_TYPE(A26_ROM_COMPUMATE, a26_rom_cm_device, "a2600_cm", "Atari 2600 ROM Cart Compumate")
-a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_COMPUMATE, tag, owner, clock)
, m_bank(*this, "bank")
{
diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h
index 2d16f24db88..16603404bb1 100644
--- a/src/devices/bus/vcs/compumat.h
+++ b/src/devices/bus/vcs/compumat.h
@@ -17,7 +17,7 @@ class a26_rom_cm_device : public a26_rom_base_device
{
public:
// construction/destruction
- a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp
index deb5ba74748..0cc490a857b 100644
--- a/src/devices/bus/vcs/dpc.cpp
+++ b/src/devices/bus/vcs/dpc.cpp
@@ -16,7 +16,7 @@
DEFINE_DEVICE_TYPE(ATARI_DPC, dpc_device, "atari_dpc", "Atari DPC")
-dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
+dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) :
device_t(mconfig, ATARI_DPC, tag, owner, clock),
m_movamt(0),
m_latch_62(0),
@@ -234,7 +234,7 @@ void dpc_device::write(offs_t offset, uint8_t data)
DEFINE_DEVICE_TYPE(A26_ROM_DPC, a26_rom_dpc_device, "a2600_dpc", "Atari 2600 ROM Cart Pitfall II")
-a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f8_device(mconfig, A26_ROM_DPC, tag, owner, clock), m_dpc(*this, "dpc")
{
}
@@ -251,7 +251,7 @@ void a26_rom_dpc_device::setup_addon_ptr(uint8_t *ptr)
void a26_rom_dpc_device::device_add_mconfig(machine_config &config)
{
- ATARI_DPC(config, m_dpc, 0);
+ ATARI_DPC(config, m_dpc);
}
void a26_rom_dpc_device::install_memory_handlers(address_space *space)
diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h
index 9bbf4382b95..c26453da073 100644
--- a/src/devices/bus/vcs/dpc.h
+++ b/src/devices/bus/vcs/dpc.h
@@ -17,7 +17,7 @@ class dpc_device : public device_t
{
public:
// construction/destruction
- dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_display_data(uint8_t *data) { m_displaydata = data; }
@@ -67,7 +67,7 @@ DECLARE_DEVICE_TYPE(ATARI_DPC, dpc_device)
class a26_rom_dpc_device : public a26_rom_f8_device
{
public:
- a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
required_device<dpc_device> m_dpc;
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index 3b3d5385e4a..04c78933d1c 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -64,7 +64,7 @@ map:
DEFINE_DEVICE_TYPE(A26_ROM_HARMONY, a26_rom_harmony_device, "a2600_harmony", "Atari 2600 ROM Cart HARMONY/MELODY")
-a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_HARMONY, tag, owner, clock)
, m_cpu(*this, "arm")
, m_base_bank(0)
@@ -81,7 +81,7 @@ void a26_rom_harmony_device::harmony_arm7_map(address_map &map)
void a26_rom_harmony_device::device_add_mconfig(machine_config &config)
{
- LPC2103(config, m_cpu, 70000000);
+ LPC2103(config, m_cpu, XTAL::u(70000000));
m_cpu->set_addrmap(AS_PROGRAM, &a26_rom_harmony_device::harmony_arm7_map);
}
diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h
index eb23afcbec3..35b88302731 100644
--- a/src/devices/bus/vcs/harmony_melody.h
+++ b/src/devices/bus/vcs/harmony_melody.h
@@ -14,7 +14,7 @@
class a26_rom_harmony_device : public a26_rom_base_device
{
public:
- a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp
index f40591e1173..4f30ac56330 100644
--- a/src/devices/bus/vcs/rom.cpp
+++ b/src/devices/bus/vcs/rom.cpp
@@ -67,7 +67,7 @@ void a26_rom_base_device::write_ram(offs_t offset, uint8_t data)
GAMES: a large majority
-------------------------------------------------*/
-a26_rom_2k_4k_device::a26_rom_2k_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_2k_4k_device::a26_rom_2k_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_2K_4K, tag, owner, clock)
{
}
@@ -92,13 +92,13 @@ void a26_rom_2k_4k_device::install_memory_handlers(address_space *space)
-------------------------------------------------*/
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, type, tag, owner, clock)
, m_bank(*this, "bank")
{
}
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f6_device(mconfig, A26_ROM_F6, tag, owner, clock)
{
}
@@ -141,7 +141,7 @@ void a26_rom_f6_device::switch_bank(offs_t offset, uint8_t data)
GAMES: Fatal Run
-------------------------------------------------*/
-a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f6_device(mconfig, A26_ROM_F4, tag, owner, clock)
{
}
@@ -167,12 +167,12 @@ void a26_rom_f4_device::install_memory_handlers(address_space *space)
-------------------------------------------------*/
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f6_device(mconfig, type, tag, owner, clock)
{
}
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f8_device(mconfig, A26_ROM_F8, tag, owner, clock)
{
}
@@ -188,7 +188,7 @@ void a26_rom_f8_device::install_memory_handlers(address_space *space)
}
-a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f8_device(mconfig, A26_ROM_F8_SW, tag, owner, clock)
{
}
@@ -206,7 +206,7 @@ a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const
-------------------------------------------------*/
-a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_f6_device(mconfig, A26_ROM_FA, tag, owner, clock)
{
}
@@ -233,7 +233,7 @@ void a26_rom_fa_device::install_memory_handlers(address_space *space)
-------------------------------------------------*/
-a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_FE, tag, owner, clock)
, m_bank(*this, "bank")
, m_trigger_on_next_access(false)
@@ -311,7 +311,7 @@ void a26_rom_fe_device::trigger_bank()
-------------------------------------------------*/
-a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_3E, tag, owner, clock)
, m_rom_bank(*this, "rom_bank")
, m_ram_bank(*this, "ram_bank")
@@ -374,7 +374,7 @@ void a26_rom_3e_device::select_rom_bank(offs_t address, uint8_t data)
-------------------------------------------------*/
-a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_3F, tag, owner, clock)
, m_bank(*this, "bank")
, m_bank_mask(0)
@@ -415,7 +415,7 @@ void a26_rom_3f_device::select_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_E0, tag, owner, clock)
, m_bank(*this, "bank%u", 0U)
{
@@ -477,7 +477,7 @@ void a26_rom_e0_device::switch_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_E7, tag, owner, clock)
, m_rom_bank(*this, "rom_bank")
, m_lo_ram_bank(*this, "low_ram")
@@ -541,7 +541,7 @@ void a26_rom_e7_device::switch_ram_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_UA, tag, owner, clock)
, m_bank(*this, "bank")
{
@@ -579,7 +579,7 @@ void a26_rom_ua_device::change_bank(offs_t offset)
-------------------------------------------------*/
-a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_CV, tag, owner, clock)
{
}
@@ -603,7 +603,7 @@ void a26_rom_cv_device::install_memory_handlers(address_space *space)
-------------------------------------------------*/
-a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_DC, tag, owner, clock)
, m_bank(*this, "bank")
{
@@ -645,7 +645,7 @@ void a26_rom_dc_device::switch_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_FV, tag, owner, clock)
, m_bank(*this, "bank")
{
@@ -682,7 +682,7 @@ void a26_rom_fv_device::switch_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_JVP, tag, owner, clock)
, m_bank(*this, "bank")
{
@@ -721,7 +721,7 @@ void a26_rom_jvp_device::change_bank()
-------------------------------------------------*/
-a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_4IN1, tag, owner, clock)
, m_bank(*this, "bank")
, m_current_game(0)
@@ -758,7 +758,7 @@ void a26_rom_4in1_device::install_memory_handlers(address_space *space)
-------------------------------------------------*/
-a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_8IN1, tag, owner, clock)
, m_bank(*this, "bank")
{
@@ -803,7 +803,7 @@ void a26_rom_8in1_device::switch_bank(offs_t offset, uint8_t data)
-------------------------------------------------*/
-a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_32IN1, tag, owner, clock)
, m_bank(*this, "bank")
, m_current_game(0)
@@ -838,7 +838,7 @@ void a26_rom_32in1_device::install_memory_handlers(address_space *space)
http://blog.kevtris.org/blogfiles/Atari%202600%20Mappers.txt
--------------------------------------------------*/
-a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a26_rom_base_device(mconfig, A26_ROM_X07, tag, owner, clock)
, m_bank(*this, "bank")
{
diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h
index 039a0d4ca1d..989f3526b44 100644
--- a/src/devices/bus/vcs/rom.h
+++ b/src/devices/bus/vcs/rom.h
@@ -14,7 +14,7 @@ class a26_rom_base_device : public device_t,
public device_vcs_cart_interface
{
protected:
- a26_rom_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ a26_rom_base_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_vcs_cart_interface(mconfig, *this)
{ }
@@ -41,12 +41,12 @@ public:
class a26_rom_f6_device : public a26_rom_base_device
{
public:
- a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
protected:
- a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
void install_super_chip_handlers(address_space *space);
virtual void device_reset() override;
@@ -62,7 +62,7 @@ protected:
class a26_rom_f4_device : public a26_rom_f6_device
{
public:
- a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -76,12 +76,12 @@ protected:
class a26_rom_f8_device : public a26_rom_f6_device
{
public:
- a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
protected:
- a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -90,7 +90,7 @@ protected:
class a26_rom_f8_sw_device : public a26_rom_f8_device
{
public:
- a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// Snow White proto starts from bank 1
@@ -103,7 +103,7 @@ protected:
class a26_rom_fa_device : public a26_rom_f6_device
{
public:
- a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
};
@@ -114,7 +114,7 @@ public:
class a26_rom_fe_device : public a26_rom_base_device
{
public:
- a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -135,7 +135,7 @@ protected:
class a26_rom_3e_device : public a26_rom_base_device
{
public:
- a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -157,7 +157,7 @@ protected:
class a26_rom_3f_device : public a26_rom_base_device
{
public:
- a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -175,7 +175,7 @@ protected:
class a26_rom_e0_device : public a26_rom_base_device
{
public:
- a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -192,7 +192,7 @@ protected:
class a26_rom_e7_device : public a26_rom_base_device
{
public:
- a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -213,7 +213,7 @@ protected:
class a26_rom_ua_device : public a26_rom_base_device
{
public:
- a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -230,7 +230,7 @@ protected:
class a26_rom_cv_device : public a26_rom_base_device
{
public:
- a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
};
@@ -241,7 +241,7 @@ public:
class a26_rom_dc_device : public a26_rom_base_device
{
public:
- a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -259,7 +259,7 @@ protected:
class a26_rom_fv_device : public a26_rom_base_device
{
public:
- a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -276,7 +276,7 @@ protected:
class a26_rom_jvp_device : public a26_rom_base_device
{
public:
- a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -293,7 +293,7 @@ protected:
class a26_rom_4in1_device : public a26_rom_base_device
{
public:
- a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -311,7 +311,7 @@ protected:
class a26_rom_8in1_device : public a26_rom_base_device
{
public:
- a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -330,7 +330,7 @@ protected:
class a26_rom_32in1_device : public a26_rom_base_device
{
public:
- a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
@@ -348,7 +348,7 @@ protected:
class a26_rom_x07_device : public a26_rom_base_device
{
public:
- a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index 1aa1b143328..d337893309a 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -44,7 +44,7 @@
DEFINE_DEVICE_TYPE(A26_ROM_SUPERCHARGER, a26_rom_ss_device, "a2600_ss", "Atari 2600 ROM Cart Supercharger")
-a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a26_rom_base_device(mconfig, A26_ROM_SUPERCHARGER, tag, owner, clock),
m_cassette(*this, "cassette"),
m_data(0),
diff --git a/src/devices/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h
index 25544868ab4..66e4543cfe6 100644
--- a/src/devices/bus/vcs/scharger.h
+++ b/src/devices/bus/vcs/scharger.h
@@ -17,7 +17,7 @@
class a26_rom_ss_device : public a26_rom_base_device
{
public:
- a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void install_memory_handlers(address_space *space) override;
uint8_t read_lo(offs_t offset);
diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp
index 7b9e620c740..4ec8c5552a3 100644
--- a/src/devices/bus/vcs/vcs_slot.cpp
+++ b/src/devices/bus/vcs/vcs_slot.cpp
@@ -104,7 +104,7 @@ void device_vcs_cart_interface::ram_alloc(uint32_t size)
//-------------------------------------------------
// vcs_cart_slot_device - constructor
//-------------------------------------------------
-vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VCS_CART_SLOT, tag, owner, clock),
device_cartrom_image_interface(mconfig, *this),
device_single_card_slot_interface<device_vcs_cart_interface>(mconfig, *this),
diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h
index 4595602961a..b57ef66f575 100644
--- a/src/devices/bus/vcs/vcs_slot.h
+++ b/src/devices/bus/vcs/vcs_slot.h
@@ -19,14 +19,14 @@ public:
// construction/destruction
template <typename T>
vcs_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : vcs_cart_slot_device(mconfig, tag, owner, (uint32_t)0)
+ : vcs_cart_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~vcs_cart_slot_device();
template <typename T> void set_address_space(T &&tag, int no) { m_address_space.set_tag(std::forward<T>(tag), no); }