summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/arm7
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/cpu/arm7
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/cpu/arm7')
-rw-r--r--src/devices/cpu/arm7/arm7.cpp38
-rw-r--r--src/devices/cpu/arm7/arm7.h38
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp4
-rw-r--r--src/devices/cpu/arm7/lpc210x.h2
-rw-r--r--src/devices/cpu/arm7/upd800468.cpp8
-rw-r--r--src/devices/cpu/arm7/upd800468.h4
6 files changed, 47 insertions, 47 deletions
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
index d2c40209dd1..e8e5c1005f4 100644
--- a/src/devices/cpu/arm7/arm7.cpp
+++ b/src/devices/cpu/arm7/arm7.cpp
@@ -78,12 +78,12 @@ DEFINE_DEVICE_TYPE(PXA270, pxa270_cpu_device, "pxa270", "Intel
DEFINE_DEVICE_TYPE(SA1110, sa1110_cpu_device, "sa1110", "Intel StrongARM SA-1110")
DEFINE_DEVICE_TYPE(IGS036, igs036_cpu_device, "igs036", "IGS036")
-arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, ARM7, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_LITTLE)
{
}
-arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
+arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", endianness, 32, 32, 0)
, m_prefetch_word0_shift(endianness == ENDIANNESS_LITTLE ? 0 : 16)
@@ -114,13 +114,13 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type
}
-arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, ARM7_BE, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_BIG)
{
}
-arm710a_cpu_device::arm710a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm710a_cpu_device::arm710a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, ARM710A, tag, owner, clock, 4, ARCHFLAG_MODE26, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_ARM
@@ -129,7 +129,7 @@ arm710a_cpu_device::arm710a_cpu_device(const machine_config &mconfig, const char
}
-arm710t_cpu_device::arm710t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm710t_cpu_device::arm710t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, ARM710T, tag, owner, clock, 4, ARCHFLAG_MODE26, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_ARM
@@ -138,7 +138,7 @@ arm710t_cpu_device::arm710t_cpu_device(const machine_config &mconfig, const char
}
-arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, ARM7500, tag, owner, clock, 4, ARCHFLAG_MODE26, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_ARM
@@ -147,13 +147,13 @@ arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, const char
}
-arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm9_cpu_device(mconfig, ARM9, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E, ENDIANNESS_LITTLE)
{
}
-arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
+arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
: arm7_cpu_device(mconfig, type, tag, owner, clock, archRev, archFlags, endianness)
{
uint32_t arch = ARM9_COPRO_ID_ARCH_V4;
@@ -181,7 +181,7 @@ arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, device_type type
}
-arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm9_cpu_device(mconfig, ARM920T, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_ARM
@@ -191,7 +191,7 @@ arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char
| 0; // Stepping
}
-arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: arm9_cpu_device(mconfig, type, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E, ENDIANNESS_LITTLE),
cp15_control(0x78)
{
@@ -212,18 +212,18 @@ arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, device_t
cp15_itcm_reg = cp15_dtcm_reg = 0;
}
-arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm946es_cpu_device(mconfig, ARM946ES, tag, owner, clock)
{
}
-arm11_cpu_device::arm11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm11_cpu_device::arm11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm11_cpu_device(mconfig, ARM11, tag, owner, clock, 6, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_K, ENDIANNESS_LITTLE)
{
}
-arm11_cpu_device::arm11_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
+arm11_cpu_device::arm11_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
: arm9_cpu_device(mconfig, type, tag, owner, clock, archRev, archFlags, endianness)
{
uint32_t arch = ARM9_COPRO_ID_ARCH_V6;
@@ -231,7 +231,7 @@ arm11_cpu_device::arm11_cpu_device(const machine_config &mconfig, device_type ty
m_copro_id = ARM9_COPRO_ID_MFR_ARM | arch | (0xB00 << 4);
}
-arm1176jzf_s_cpu_device::arm1176jzf_s_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+arm1176jzf_s_cpu_device::arm1176jzf_s_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm11_cpu_device(mconfig, ARM1176JZF_S, tag, owner, clock, 6, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_K, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_ARM
@@ -242,12 +242,12 @@ arm1176jzf_s_cpu_device::arm1176jzf_s_cpu_device(const machine_config &mconfig,
}
// unknown configuration, but uses MPU not MMU, so closer to ARM946ES
-igs036_cpu_device::igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+igs036_cpu_device::igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm946es_cpu_device(mconfig, IGS036, tag, owner, clock)
{
}
-pxa250_cpu_device::pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pxa250_cpu_device::pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, PXA250, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_INTEL
@@ -256,7 +256,7 @@ pxa250_cpu_device::pxa250_cpu_device(const machine_config &mconfig, const char *
| ARM9_COPRO_ID_STEP_PXA255_A0;
}
-pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, PXA255, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_INTEL
@@ -265,7 +265,7 @@ pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *
| ARM9_COPRO_ID_STEP_PXA255_A0;
}
-pxa270_cpu_device::pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pxa270_cpu_device::pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, PXA270, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
{
m_copro_id = ARM9_COPRO_ID_MFR_INTEL
@@ -274,7 +274,7 @@ pxa270_cpu_device::pxa270_cpu_device(const machine_config &mconfig, const char *
| ARM9_COPRO_ID_STEP_PXA255_A0;
}
-sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, SA1110, tag, owner, clock, 4, ARCHFLAG_SA, ENDIANNESS_LITTLE)
// has StrongARM, no Thumb, no Enhanced DSP
{
diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h
index c46516508db..03e0918a538 100644
--- a/src/devices/cpu/arm7/arm7.h
+++ b/src/devices/cpu/arm7/arm7.h
@@ -51,7 +51,7 @@ class arm7_cpu_device : public cpu_device, public arm7_disassembler::config
{
public:
// construction/destruction
- arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_high_vectors() { m_vectorbase = 0xffff0000; }
@@ -113,7 +113,7 @@ protected:
ARM9_COPRO_ID_MFR_INTEL = 0x69 << 24
};
- arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
+ arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
void postload();
@@ -622,7 +622,7 @@ class arm7_be_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -630,31 +630,31 @@ class arm7500_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class arm710a_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm710a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm710a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class arm710t_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm710t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm710t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class arm9_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- arm9_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
+ arm9_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
};
@@ -662,7 +662,7 @@ class arm920t_cpu_device : public arm9_cpu_device
{
public:
// construction/destruction
- arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -670,7 +670,7 @@ class arm946es_cpu_device : public arm9_cpu_device
{
public:
// construction/destruction
- arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// 946E-S has Protection Unit instead of ARM MMU so CP15 is quite different
virtual uint32_t arm7_rt_r_callback(offs_t offset) override;
@@ -684,7 +684,7 @@ public:
virtual uint8_t arm7_cpu_read8(uint32_t addr) override;
protected:
- arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
@@ -701,17 +701,17 @@ class arm11_cpu_device : public arm9_cpu_device
{
public:
// construction/destruction
- arm11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- arm11_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
+ arm11_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
};
class arm1176jzf_s_cpu_device : public arm11_cpu_device
{
public:
// construction/destruction
- arm1176jzf_s_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arm1176jzf_s_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual uint32_t arm7_rt_r_callback(offs_t offset) override;
virtual void arm7_rt_w_callback(offs_t offset, uint32_t data) override;
@@ -724,35 +724,35 @@ class igs036_cpu_device : public arm946es_cpu_device
{
public:
// construction/destruction
- igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class pxa250_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class pxa255_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class pxa270_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class sa1110_cpu_device : public arm7_cpu_device
{
public:
// construction/destruction
- sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(ARM7, arm7_cpu_device)
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index 75a322f01a2..99ecfb478f4 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -41,7 +41,7 @@ void lpc210x_device::lpc2103_map(address_map &map)
}
-lpc210x_device::lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+lpc210x_device::lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, LPC2103, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_LITTLE)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0, address_map_constructor(FUNC(lpc210x_device::lpc2103_map), this))
, m_vic(*this, "vic")
@@ -256,7 +256,7 @@ void lpc210x_device::write_timer(int timer, int offset, uint32_t data, uint32_t
void lpc210x_device::device_add_mconfig(machine_config &config)
{
- PL190_VIC(config, m_vic, 0);
+ PL190_VIC(config, m_vic);
m_vic->out_irq_cb().set_inputline(*this, ARM7_IRQ_LINE);
m_vic->out_fiq_cb().set_inputline(*this, ARM7_FIRQ_LINE);
}
diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h
index 47a801a6058..c36f6fbd109 100644
--- a/src/devices/cpu/arm7/lpc210x.h
+++ b/src/devices/cpu/arm7/lpc210x.h
@@ -22,7 +22,7 @@
class lpc210x_device : public arm7_cpu_device
{
public:
- lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+ lpc210x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint32_t arm_E01FC088_r();
uint32_t flash_r(offs_t offset);
diff --git a/src/devices/cpu/arm7/upd800468.cpp b/src/devices/cpu/arm7/upd800468.cpp
index 16b6928bf7c..1248b5ea2b3 100644
--- a/src/devices/cpu/arm7/upd800468.cpp
+++ b/src/devices/cpu/arm7/upd800468.cpp
@@ -14,7 +14,7 @@
DEFINE_DEVICE_TYPE(UPD800468_TIMER, upd800468_timer_device, "upd800468_timer", "NEC uPD800468 timer")
-upd800468_timer_device::upd800468_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+upd800468_timer_device::upd800468_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, UPD800468_TIMER, tag, owner, clock)
, m_irq_cb(*this)
{
@@ -122,7 +122,7 @@ void upd800468_device::upd800468_map(address_map &map)
map(0xfffff000, 0xffffffff).m(m_vic, FUNC(vic_upd800468_device::map));
}
-upd800468_device::upd800468_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+upd800468_device::upd800468_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: arm7_cpu_device(mconfig, UPD800468, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_LITTLE)
, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0, address_map_constructor(FUNC(upd800468_device::upd800468_map), this))
, m_vic(*this, "vic")
@@ -142,7 +142,7 @@ device_memory_interface::space_config_vector upd800468_device::memory_space_conf
void upd800468_device::device_add_mconfig(machine_config &config)
{
- UPD800468_VIC(config, m_vic, 0);
+ UPD800468_VIC(config, m_vic);
m_vic->out_irq_cb().set_inputline(*this, ARM7_IRQ_LINE);
m_vic->out_fiq_cb().set_inputline(*this, ARM7_FIRQ_LINE);
@@ -157,7 +157,7 @@ void upd800468_device::device_add_mconfig(machine_config &config)
m_timer[2]->irq_cb().set(m_vic, FUNC(vic_upd800468_device::irq_w<23>));
// key/button controller is compatible with the one from earlier keyboards
- GT913_KBD_HLE(config, m_kbd, 0);
+ GT913_KBD_HLE(config, m_kbd);
m_kbd->irq_cb().set(m_vic, FUNC(vic_upd800468_device::irq_w<31>));
}
diff --git a/src/devices/cpu/arm7/upd800468.h b/src/devices/cpu/arm7/upd800468.h
index 7f662581c7f..a90fdcf9827 100644
--- a/src/devices/cpu/arm7/upd800468.h
+++ b/src/devices/cpu/arm7/upd800468.h
@@ -18,7 +18,7 @@
class upd800468_timer_device : public device_t
{
public:
- upd800468_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ upd800468_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto irq_cb() { return m_irq_cb.bind(); }
@@ -45,7 +45,7 @@ private:
class upd800468_device : public arm7_cpu_device
{
public:
- upd800468_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+ upd800468_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void upd800468_map(address_map &map);