summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/hornet.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/hornet.c')
-rw-r--r--src/mame/drivers/hornet.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 0570010a1dc..61f950b5084 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -402,12 +402,13 @@ public:
DECLARE_WRITE32_MEMBER(dsp_dataram1_w);
DECLARE_WRITE_LINE_MEMBER(voodoo_vblank_0);
DECLARE_WRITE_LINE_MEMBER(voodoo_vblank_1);
- DECLARE_WRITE16_MEMBER(soundtimer_en_w);
- DECLARE_WRITE16_MEMBER(soundtimer_count_w);
- ADC12138_IPT_CONVERT_CB(adc12138_input_callback);
-
- DECLARE_DRIVER_INIT(hornet);
- DECLARE_DRIVER_INIT(hornet_2board);
+ DECLARE_WRITE16_MEMBER(soundtimer_en_w);
+ DECLARE_WRITE16_MEMBER(soundtimer_count_w);
+ ADC12138_IPT_CONVERT_CB(adc12138_input_callback);
+ DECLARE_WRITE8_MEMBER(jamma_jvs_w);
+
+ DECLARE_DRIVER_INIT(hornet);
+ DECLARE_DRIVER_INIT(hornet_2board);
virtual void machine_start();
virtual void machine_reset();
DECLARE_MACHINE_RESET(hornet_2board);
@@ -1135,22 +1136,21 @@ static MACHINE_CONFIG_DERIVED( sscope2, hornet_2board_v2)
MCFG_EEPROM_SERIAL_93C46_ADD("lan_eeprom")
MACHINE_CONFIG_END
-
-/*****************************************************************************/
-
-static void jamma_jvs_w(device_t *device, UINT8 data)
-{
- hornet_state *state = device->machine().driver_data<hornet_state>();
- if (state->m_jvs_sdata_ptr == 0 && data != 0xe0)
- return;
- state->m_jvs_sdata[state->m_jvs_sdata_ptr] = data;
- state->m_jvs_sdata_ptr++;
-
- if (state->m_jvs_sdata_ptr >= 3 && state->m_jvs_sdata_ptr >= 3 + state->m_jvs_sdata[2])
- state->jamma_jvs_cmd_exec();
-}
-
-int hornet_state::jvs_encode_data(UINT8 *in, int length)
+
+/*****************************************************************************/
+
+WRITE8_MEMBER(hornet_state::jamma_jvs_w)
+{
+ if (m_jvs_sdata_ptr == 0 && data != 0xe0)
+ return;
+ m_jvs_sdata[m_jvs_sdata_ptr] = data;
+ m_jvs_sdata_ptr++;
+
+ if (m_jvs_sdata_ptr >= 3 && m_jvs_sdata_ptr >= 3 + m_jvs_sdata[2])
+ jamma_jvs_cmd_exec();
+}
+
+int hornet_state::jvs_encode_data(UINT8 *in, int length)
{
int inptr = 0;
int sum = 0;
@@ -1280,22 +1280,22 @@ void hornet_state::jamma_jvs_cmd_exec()
DRIVER_INIT_MEMBER(hornet_state,hornet)
{
- m_konppc->set_cgboard_texture_bank(0, "bank5", memregion("user5")->base());
- m_led_reg0 = m_led_reg1 = 0x7f;
-
- m_maincpu->ppc4xx_spu_set_tx_handler(jamma_jvs_w);
-}
-
-DRIVER_INIT_MEMBER(hornet_state,hornet_2board)
+ m_konppc->set_cgboard_texture_bank(0, "bank5", memregion("user5")->base());
+ m_led_reg0 = m_led_reg1 = 0x7f;
+
+ m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(FUNC(hornet_state::jamma_jvs_w), this));
+}
+
+DRIVER_INIT_MEMBER(hornet_state,hornet_2board)
{
m_konppc->set_cgboard_texture_bank(0, "bank5", memregion("user5")->base());
- m_konppc->set_cgboard_texture_bank(1, "bank6", memregion("user5")->base());
- m_led_reg0 = m_led_reg1 = 0x7f;
-
- m_maincpu->ppc4xx_spu_set_tx_handler(jamma_jvs_w);
-}
-
-/*****************************************************************************/
+ m_konppc->set_cgboard_texture_bank(1, "bank6", memregion("user5")->base());
+ m_led_reg0 = m_led_reg1 = 0x7f;
+
+ m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(FUNC(hornet_state::jamma_jvs_w), this));
+}
+
+/*****************************************************************************/
ROM_START(sscope)
ROM_REGION32_BE(0x400000, "user1", 0) /* PowerPC program */