summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/meadows.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/meadows.c')
-rw-r--r--src/mame/drivers/meadows.c63
1 files changed, 30 insertions, 33 deletions
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index f6b93b707f0..863a1489d1b 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -135,23 +135,23 @@
*
*************************************/
-static READ8_HANDLER( hsync_chain_r )
+READ8_MEMBER(meadows_state::hsync_chain_r)
{
- UINT8 val = space->machine().primary_screen->hpos();
+ UINT8 val = machine().primary_screen->hpos();
return BITSWAP8(val,0,1,2,3,4,5,6,7);
}
-static READ8_HANDLER( vsync_chain_hi_r )
+READ8_MEMBER(meadows_state::vsync_chain_hi_r)
{
- UINT8 val = space->machine().primary_screen->vpos();
+ UINT8 val = machine().primary_screen->vpos();
return ((val >> 1) & 0x08) | ((val >> 3) & 0x04) | ((val >> 5) & 0x02) | (val >> 7);
}
-static READ8_HANDLER( vsync_chain_lo_r )
+READ8_MEMBER(meadows_state::vsync_chain_lo_r)
{
- UINT8 val = space->machine().primary_screen->vpos();
+ UINT8 val = machine().primary_screen->vpos();
return val & 0x0f;
}
@@ -163,16 +163,15 @@ static READ8_HANDLER( vsync_chain_lo_r )
*
*************************************/
-static WRITE8_HANDLER( meadows_audio_w )
+WRITE8_MEMBER(meadows_state::meadows_audio_w)
{
- meadows_state *state = space->machine().driver_data<meadows_state>();
switch (offset)
{
case 0:
- if (state->m_0c00 == data)
+ if (m_0c00 == data)
break;
logerror("meadows_audio_w %d $%02x\n", offset, data);
- state->m_0c00 = data;
+ m_0c00 = data;
break;
case 1:
@@ -241,37 +240,36 @@ static INTERRUPT_GEN( minferno_interrupt )
*
*************************************/
-static WRITE8_HANDLER( audio_hardware_w )
+WRITE8_MEMBER(meadows_state::audio_hardware_w)
{
- meadows_state *state = space->machine().driver_data<meadows_state>();
switch (offset & 3)
{
case 0: /* DAC */
- meadows_sh_dac_w(space->machine(), data ^ 0xff);
+ meadows_sh_dac_w(machine(), data ^ 0xff);
break;
case 1: /* counter clk 5 MHz / 256 */
- if (data == state->m_0c01)
+ if (data == m_0c01)
break;
logerror("audio_w ctr1 preset $%x amp %d\n", data & 15, data >> 4);
- state->m_0c01 = data;
- meadows_sh_update(space->machine());
+ m_0c01 = data;
+ meadows_sh_update(machine());
break;
case 2: /* counter clk 5 MHz / 32 (/ 2 or / 4) */
- if (data == state->m_0c02)
+ if (data == m_0c02)
break;
logerror("audio_w ctr2 preset $%02x\n", data);
- state->m_0c02 = data;
- meadows_sh_update(space->machine());
+ m_0c02 = data;
+ meadows_sh_update(machine());
break;
case 3: /* audio enable */
- if (data == state->m_0c03)
+ if (data == m_0c03)
break;
logerror("audio_w enable ctr2/2:%d ctr2:%d dac:%d ctr1:%d\n", data&1, (data>>1)&1, (data>>2)&1, (data>>3)&1);
- state->m_0c03 = data;
- meadows_sh_update(space->machine());
+ m_0c03 = data;
+ meadows_sh_update(machine());
break;
}
}
@@ -284,15 +282,14 @@ static WRITE8_HANDLER( audio_hardware_w )
*
*************************************/
-static READ8_HANDLER( audio_hardware_r )
+READ8_MEMBER(meadows_state::audio_hardware_r)
{
- meadows_state *state = space->machine().driver_data<meadows_state>();
int data = 0;
switch (offset)
{
case 0:
- data = state->m_0c00;
+ data = m_0c00;
break;
case 1: break;
@@ -343,9 +340,9 @@ static ADDRESS_MAP_START( meadows_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("STICK")
- AM_RANGE(0x0c02, 0x0c02) AM_READ_LEGACY(hsync_chain_r)
+ AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r)
AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW")
- AM_RANGE(0x0c00, 0x0c03) AM_WRITE_LEGACY(meadows_audio_w)
+ AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w)
AM_RANGE(0x0d00, 0x0d0f) AM_WRITE_LEGACY(meadows_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
AM_RANGE(0x1000, 0x1bff) AM_ROM
@@ -356,9 +353,9 @@ static ADDRESS_MAP_START( bowl3d_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS1")
AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("INPUTS2")
- AM_RANGE(0x0c02, 0x0c02) AM_READ_LEGACY(hsync_chain_r)
+ AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r)
AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW")
- AM_RANGE(0x0c00, 0x0c03) AM_WRITE_LEGACY(meadows_audio_w)
+ AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w)
AM_RANGE(0x0d00, 0x0d0f) AM_WRITE_LEGACY(meadows_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
AM_RANGE(0x1000, 0x1bff) AM_ROM
@@ -372,9 +369,9 @@ static ADDRESS_MAP_START( minferno_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x1f01, 0x1f01) AM_READ_PORT("JOY2")
AM_RANGE(0x1f02, 0x1f02) AM_READ_PORT("BUTTONS")
AM_RANGE(0x1f03, 0x1f03) AM_READ_PORT("DSW1")
- AM_RANGE(0x1f00, 0x1f03) AM_WRITE_LEGACY(meadows_audio_w)
- AM_RANGE(0x1f04, 0x1f04) AM_READ_LEGACY(vsync_chain_hi_r)
- AM_RANGE(0x1f05, 0x1f05) AM_READ_LEGACY(vsync_chain_lo_r)
+ AM_RANGE(0x1f00, 0x1f03) AM_WRITE(meadows_audio_w)
+ AM_RANGE(0x1f04, 0x1f04) AM_READ(vsync_chain_hi_r)
+ AM_RANGE(0x1f05, 0x1f05) AM_READ(vsync_chain_lo_r)
ADDRESS_MAP_END
@@ -392,7 +389,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0000, 0x0bff) AM_ROM
- AM_RANGE(0x0c00, 0x0c03) AM_READWRITE_LEGACY(audio_hardware_r, audio_hardware_w)
+ AM_RANGE(0x0c00, 0x0c03) AM_READWRITE(audio_hardware_r, audio_hardware_w)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
ADDRESS_MAP_END