summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/firebeat.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-08-10 08:33:51 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-08-10 08:33:51 +0000
commitc75c14d4d3541f93dd3ad10054c9cc09407493e9 (patch)
treeee5693b028ef22d3ee70ce5f78a5a0ffbb7e75a7 /src/mame/drivers/firebeat.c
parent24991f6661251f71458f3d3fbe3c5315f32d07a9 (diff)
All driver inits are now member of state classes.
Added DECLARE_DRIVER_INIT macro to define it H file, and DRIVER_INIT_MEMBER for member declaration in C files Updated all drivers accordingly (no whatsnew)
Diffstat (limited to 'src/mame/drivers/firebeat.c')
-rw-r--r--src/mame/drivers/firebeat.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 491fdf9e06f..5d80e827382 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -177,6 +177,9 @@ public:
int m_ibutton_read_subkey_ptr;
UINT8 m_ibutton_subkey_data[0x40];
DECLARE_READ8_MEMBER(soundram_r);
+ DECLARE_DRIVER_INIT(ppd);
+ DECLARE_DRIVER_INIT(kbm);
+ DECLARE_DRIVER_INIT(ppp);
};
@@ -2241,19 +2244,18 @@ static void init_firebeat(running_machine &machine)
init_lights(machine, FUNC_NULL, FUNC_NULL, FUNC_NULL);
}
-static DRIVER_INIT(ppp)
+DRIVER_INIT_MEMBER(firebeat_state,ppp)
{
- init_firebeat(machine);
- init_lights(machine, FUNC(lamp_output_ppp_w), FUNC(lamp_output2_ppp_w), FUNC(lamp_output3_ppp_w));
+ init_firebeat(machine());
+ init_lights(machine(), FUNC(lamp_output_ppp_w), FUNC(lamp_output2_ppp_w), FUNC(lamp_output3_ppp_w));
}
-static DRIVER_INIT(ppd)
+DRIVER_INIT_MEMBER(firebeat_state,ppd)
{
- firebeat_state *state = machine.driver_data<firebeat_state>();
- init_firebeat(machine);
- init_lights(machine, FUNC(lamp_output_ppp_w), FUNC(lamp_output2_ppp_w), FUNC(lamp_output3_ppp_w));
+ init_firebeat(machine());
+ init_lights(machine(), FUNC(lamp_output_ppp_w), FUNC(lamp_output2_ppp_w), FUNC(lamp_output3_ppp_w));
- state->m_cur_cab_data = ppd_cab_data;
+ m_cur_cab_data = ppd_cab_data;
}
static void init_keyboard(running_machine &machine)
@@ -2264,15 +2266,14 @@ static void init_keyboard(running_machine &machine)
state->m_keyboard_timer->adjust(attotime::from_msec(10), 0, attotime::from_msec(10));
}
-static DRIVER_INIT(kbm)
+DRIVER_INIT_MEMBER(firebeat_state,kbm)
{
- firebeat_state *state = machine.driver_data<firebeat_state>();
- init_firebeat(machine);
- init_lights(machine, FUNC(lamp_output_kbm_w), FUNC_NULL, FUNC_NULL);
+ init_firebeat(machine());
+ init_lights(machine(), FUNC(lamp_output_kbm_w), FUNC_NULL, FUNC_NULL);
- init_keyboard(machine);
+ init_keyboard(machine());
- state->m_cur_cab_data = kbm_cab_data;
+ m_cur_cab_data = kbm_cab_data;
}