summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mos6529.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/mos6529.cpp')
-rw-r--r--src/devices/machine/mos6529.cpp29
1 files changed, 5 insertions, 24 deletions
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index a1487f13921..b3eaf9d2a67 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -34,14 +34,7 @@ DEFINE_DEVICE_TYPE(MOS6529, mos6529_device, "mos6529", "MOS 6529")
mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MOS6529, tag, owner, clock),
m_input(0),
- m_p0_handler(*this),
- m_p1_handler(*this),
- m_p2_handler(*this),
- m_p3_handler(*this),
- m_p4_handler(*this),
- m_p5_handler(*this),
- m_p6_handler(*this),
- m_p7_handler(*this)
+ m_p_handler{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
{
}
@@ -53,14 +46,8 @@ mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, d
void mos6529_device::device_start()
{
// resolve callbacks
- m_p0_handler.resolve_safe();
- m_p1_handler.resolve_safe();
- m_p2_handler.resolve_safe();
- m_p3_handler.resolve_safe();
- m_p4_handler.resolve_safe();
- m_p5_handler.resolve_safe();
- m_p6_handler.resolve_safe();
- m_p7_handler.resolve_safe();
+ for (int i = 0; i < 8; i++)
+ m_p_handler[i].resolve_safe();
}
@@ -80,12 +67,6 @@ READ8_MEMBER( mos6529_device::read )
WRITE8_MEMBER( mos6529_device::write )
{
- m_p0_handler(BIT(data, 0));
- m_p1_handler(BIT(data, 1));
- m_p2_handler(BIT(data, 2));
- m_p3_handler(BIT(data, 3));
- m_p4_handler(BIT(data, 4));
- m_p5_handler(BIT(data, 5));
- m_p6_handler(BIT(data, 6));
- m_p7_handler(BIT(data, 7));
+ for (int bit = 0; bit < 8; bit++)
+ m_p_handler[bit](BIT(data, bit));
}