summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jangou.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-05-25 09:27:45 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-05-25 09:27:45 +0000
commit8a4aecdb46911aa25a5d15651571e30e053fb6f0 (patch)
treec648a9daf9079e8aba58b6c401f60bde5673d2bf /src/mame/drivers/jangou.c
parent7a9aefbb60af73285c3da4db61dadd732486b456 (diff)
Conversion of _DEVICE_HANDLER to _MEMBER methods - part 1 (no whatsnew)
Diffstat (limited to 'src/mame/drivers/jangou.c')
-rw-r--r--src/mame/drivers/jangou.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 2caf86151cd..64f740c7915 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -77,6 +77,8 @@ public:
DECLARE_READ8_MEMBER(slave_com_r);
DECLARE_WRITE8_MEMBER(slave_com_w);
DECLARE_READ8_MEMBER(jngolady_rng_r);
+ DECLARE_READ8_MEMBER(input_mux_r);
+ DECLARE_READ8_MEMBER(input_system_r);
};
@@ -272,25 +274,24 @@ WRITE8_MEMBER(jangou_state::output_w)
// coin_lockout_w(machine(), 0, ~data & 0x20);
}
-static READ8_DEVICE_HANDLER( input_mux_r )
+READ8_MEMBER(jangou_state::input_mux_r)
{
- jangou_state *state = device->machine().driver_data<jangou_state>();
- switch(state->m_mux_data)
+ switch(m_mux_data)
{
- case 0x01: return state->ioport("PL1_1")->read();
- case 0x02: return state->ioport("PL1_2")->read();
- case 0x04: return state->ioport("PL2_1")->read();
- case 0x08: return state->ioport("PL2_2")->read();
- case 0x10: return state->ioport("PL1_3")->read();
- case 0x20: return state->ioport("PL2_3")->read();
+ case 0x01: return ioport("PL1_1")->read();
+ case 0x02: return ioport("PL1_2")->read();
+ case 0x04: return ioport("PL2_1")->read();
+ case 0x08: return ioport("PL2_2")->read();
+ case 0x10: return ioport("PL1_3")->read();
+ case 0x20: return ioport("PL2_3")->read();
}
- return device->machine().root_device().ioport("IN_NOMUX")->read();
+ return machine().root_device().ioport("IN_NOMUX")->read();
}
-static READ8_DEVICE_HANDLER( input_system_r )
+READ8_MEMBER(jangou_state::input_system_r)
{
- return device->machine().root_device().ioport("SYSTEM")->read();
+ return machine().root_device().ioport("SYSTEM")->read();
}
@@ -880,8 +881,8 @@ static const ay8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
- DEVCB_HANDLER(input_mux_r),
- DEVCB_HANDLER(input_system_r),
+ DEVCB_DRIVER_MEMBER(jangou_state,input_mux_r),
+ DEVCB_DRIVER_MEMBER(jangou_state,input_system_r),
DEVCB_NULL,
DEVCB_NULL
};