Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 01:18:59 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

modernization of some CUSTOM_INPUT's part 2 (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2012-04-09 12:25:58 +00:00
parent 38fd064151
commit aee1fd4cbe
39 changed files with 109 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mame/audio/jedi.c
View File

@ -101,10 +101,9 @@ static READ8_HANDLER( audio_latch_r )
}
CUSTOM_INPUT( jedi_audio_comm_stat_r )
CUSTOM_INPUT_MEMBER(jedi_state::jedi_audio_comm_stat_r)
{
jedi_state *state = field.machine().driver_data<jedi_state>();
return *state->m_audio_comm_stat >> 6;
return *m_audio_comm_stat >> 6;
}

4
src/mame/drivers/arkanoid.c
View File

@ -639,7 +639,7 @@ static INPUT_PORTS_START( arkanoid )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(arkanoid_68705_input_r, NULL) /* Inputs from the 68705 */
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, arkanoid_state,arkanoid_68705_input_r, NULL) /* Inputs from the 68705 */
PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
@ -648,7 +648,7 @@ static INPUT_PORTS_START( arkanoid )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("MUX")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(arkanoid_input_mux, "P1\0P2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, arkanoid_state,arkanoid_input_mux, "P1\0P2")
PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:8")

2
src/mame/drivers/balsente.c
View File

@ -877,7 +877,7 @@ static INPUT_PORTS_START( nstocker )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" )
PORT_MODIFY("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(nstocker_bits_r, NULL)
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, balsente_state,nstocker_bits_r, NULL)
/* cheese alert -- we have to map this to player 2 so that it doesn't interfere with
the crosshair controls */

4
src/mame/drivers/gaelco2.c
View File

@ -1115,7 +1115,7 @@ static INPUT_PORTS_START( wrally2 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Acc.")
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Gear") PORT_TOGGLE
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(wrally2_analog_bit_r, (void *)0) /* ADC_1 serial input */
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM_MEMBER(DEVICE_SELF, gaelco2_state,wrally2_analog_bit_r, (void *)0) /* ADC_1 serial input */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_SERVICE_DIPLOC( 0x0100, IP_ACTIVE_LOW, "SW2:1" )
PORT_DIPNAME( 0x0200, 0x0000, "Coin mechanism" ) PORT_DIPLOCATION("SW2:2")
@ -1173,7 +1173,7 @@ static INPUT_PORTS_START( wrally2 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Acc.")
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Gear") PORT_TOGGLE
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(wrally2_analog_bit_r, (void *)1) /* ADC_2 serial input */
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM_MEMBER(DEVICE_SELF, gaelco2_state,wrally2_analog_bit_r, (void *)1) /* ADC_2 serial input */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 )

14
src/mame/drivers/galaxold.c
View File

@ -1276,18 +1276,18 @@ static INPUT_PORTS_START( 4in1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x40) // See fake ports
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x80) // See fake ports
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x40) // See fake ports
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x80) // See fake ports
PORT_START("DSW0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x01) // See fake ports
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x02) // See fake ports
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x01) // See fake ports
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x02) // See fake ports
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" ) // 2 when continue (Scramble PT2)
PORT_DIPSETTING( 0x04, "5" ) // 2 when continue (Scramble PT2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x08) // See fake ports
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x10) // See fake ports
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(_4in1_fake_port_r, (void *)0x20) // See fake ports
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x08) // See fake ports
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x10) // See fake ports
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galaxold_state,_4in1_fake_port_r, (void *)0x20) // See fake ports
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("FAKE1") /* The Ghost Muncher PT3 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */

2
src/mame/drivers/jedi.c
View File

@ -320,7 +320,7 @@ static INPUT_PORTS_START( jedi )
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x18, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(jedi_audio_comm_stat_r, NULL)
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF,jedi_state,jedi_audio_comm_stat_r, NULL)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_START("STICKY") /* analog Y */

12
src/mame/drivers/mhavoc.c
View File

@ -338,18 +338,18 @@ static INPUT_PORTS_START( mhavoc )
/* Bit 0 = Vector generator halt flag */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(avgdvg_done_r, NULL)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(clock_r, NULL)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gamma_xmtd_r, NULL)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gamma_rcvd_r, NULL)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,gamma_xmtd_r, NULL)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,gamma_rcvd_r, NULL)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Diag Step/Coin C") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(mhavoc_bit67_r, "COIN\0SERVICE")
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,mhavoc_bit67_r, "COIN\0SERVICE")
PORT_START("IN1") /* gamma */
/* Bits 7-2 = input switches */
/* Bit 1 = Alpha rcvd flag */
/* Bit 0 = Alpha xmtd flag */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(alpha_xmtd_r, NULL)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(alpha_rcvd_r, NULL)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,alpha_xmtd_r, NULL)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,alpha_rcvd_r, NULL)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@ -418,7 +418,7 @@ static INPUT_PORTS_START( mhavocrv )
PORT_INCLUDE( mhavoc )
PORT_MODIFY("IN1")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tms5220_r, NULL)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mhavoc_state,tms5220_r, NULL)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END

2
src/mame/drivers/micro3d.c
View File

@ -132,7 +132,7 @@ static INPUT_PORTS_START( botssa )
PORT_INCLUDE( micro3d )
PORT_MODIFY("INPUTS_A_B")
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(botssa_hwchk_r, NULL)
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, micro3d_state,botssa_hwchk_r, NULL)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Shield")
PORT_SERVICE( 0x0400, IP_ACTIVE_LOW )

8
src/mame/drivers/phoenix.c
View File

@ -79,7 +79,7 @@ static INPUT_PORTS_START( phoenix )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(player_input_r, NULL)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, phoenix_state,player_input_r, NULL)
PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW1:1,2" )
@ -162,7 +162,7 @@ static INPUT_PORTS_START( condor )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(player_input_r, NULL)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, phoenix_state,player_input_r, NULL)
PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW1:1,2" )
@ -292,7 +292,7 @@ static INPUT_PORTS_START( pleiads )
PORT_INCLUDE( phoenix )
PORT_MODIFY("IN0")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(pleiads_protection_r, NULL) /* Protection. See 0x0552 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, phoenix_state,pleiads_protection_r, NULL) /* Protection. See 0x0552 */
PORT_MODIFY("DSW0")
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION( "SW1:7" )
@ -315,7 +315,7 @@ static INPUT_PORTS_START( pleiadbl )
PORT_INCLUDE( phoenix )
PORT_MODIFY("IN0")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(pleiads_protection_r, NULL) /* Protection. See 0x0552 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, phoenix_state,pleiads_protection_r, NULL) /* Protection. See 0x0552 */
PORT_MODIFY("DSW0")
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION( "SW1:7" )

2
src/mame/drivers/playch10.c
View File

@ -410,7 +410,7 @@ static INPUT_PORTS_START( playch10 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Channel Select") PORT_CODE(KEYCODE_0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Enter") PORT_CODE(KEYCODE_MINUS)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Reset") PORT_CODE(KEYCODE_EQUALS)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(pc10_int_detect_r, NULL) // INT Detect
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, playch10_state,pc10_int_detect_r, NULL) // INT Detect
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )

2
src/mame/drivers/scobra.c
View File

@ -368,7 +368,7 @@ static INPUT_PORTS_START( darkplnt )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x02, "5" )
PORT_BIT( 0xfc, 0x00, IPT_SPECIAL ) PORT_CUSTOM(darkplnt_custom_r, "DIAL") /* scrambled dial */
PORT_BIT( 0xfc, 0x00, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF,scobra_state, darkplnt_custom_r, "DIAL") /* scrambled dial */
PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )

6
src/mame/drivers/stactics.c
View File

@ -246,7 +246,7 @@ static INPUT_PORTS_START( stactics )
PORT_START("IN2") /* IN2 */
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_rng, NULL)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_frame_count_d3, NULL)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, stactics_state,stactics_get_frame_count_d3, NULL)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Free_Play ) )
@ -256,7 +256,7 @@ static INPUT_PORTS_START( stactics )
PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_shot_standby, NULL)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, stactics_state,stactics_get_shot_standby, NULL)
PORT_DIPNAME( 0x04, 0x04, "Number of Barriers" )
PORT_DIPSETTING( 0x04, "4" )
PORT_DIPSETTING( 0x00, "6" )
@ -268,7 +268,7 @@ static INPUT_PORTS_START( stactics )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_not_shot_arrive, NULL)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, stactics_state,stactics_get_not_shot_arrive, NULL)
PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY

2
src/mame/drivers/starwars.c
View File

@ -232,7 +232,7 @@ static INPUT_PORTS_START( starwars )
/* Bit 6 is VG_HALT */
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(avgdvg_done_r, NULL)
/* Bit 7 is MATH_RUN - see machine/starwars.c */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(matrix_flag_r, NULL)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, starwars_state,matrix_flag_r, NULL)
PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, "Starting Shields" ) PORT_DIPLOCATION("10D:1,2")

14
src/mame/drivers/williams.c
View File

@ -922,7 +922,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( joust )
PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP2\0INP1")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
@ -983,10 +983,10 @@ static INPUT_PORTS_START( splat )
PORT_START("IN0")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP2\0INP1")
PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2A\0INP1A")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP2A\0INP1A")
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("IN2")
@ -1200,7 +1200,7 @@ static INPUT_PORTS_START( alienar )
PORT_START("IN0")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP2\0INP1")
PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
@ -1290,7 +1290,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tshoot )
PORT_START("IN0")
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1X\0INP1Y")
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP1X\0INP1Y")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
@ -1321,7 +1321,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( inferno )
PORT_START("IN0")
PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1\0INP2")
PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP1\0INP2")
PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
@ -1364,7 +1364,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( joust2 )
PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1\0INP2")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, williams_state,williams_mux_r, "INP1\0INP2")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )

11
src/mame/includes/arkanoid.h
View File

@ -62,6 +62,8 @@ public:
DECLARE_WRITE8_MEMBER(arkanoid_d008_w);
DECLARE_WRITE8_MEMBER(tetrsark_d008_w);
DECLARE_WRITE8_MEMBER(hexa_d008_w);
DECLARE_CUSTOM_INPUT_MEMBER(arkanoid_68705_input_r);
DECLARE_CUSTOM_INPUT_MEMBER(arkanoid_input_mux);
};
@ -74,12 +76,3 @@ extern VIDEO_START( arkanoid );
extern SCREEN_UPDATE_IND16( arkanoid );
extern SCREEN_UPDATE_IND16( hexa );
/*----------- defined in machine/arkanoid.c -----------*/
extern CUSTOM_INPUT( arkanoid_68705_input_r );
extern CUSTOM_INPUT( arkanoid_input_mux );

3
src/mame/includes/balsente.h
View File

@ -158,6 +158,7 @@ public:
DECLARE_WRITE8_MEMBER(balsente_palette_select_w);
DECLARE_WRITE8_MEMBER(balsente_paletteram_w);
DECLARE_WRITE8_MEMBER(shrike_sprite_select_w);
DECLARE_CUSTOM_INPUT_MEMBER(nstocker_bits_r);
};
@ -184,8 +185,6 @@ TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff );
CUSTOM_INPUT( nstocker_bits_r );

2
src/mame/includes/gaelco2.h
View File

@ -36,6 +36,7 @@ public:
DECLARE_WRITE16_MEMBER(snowboar_protection_w);
DECLARE_WRITE16_MEMBER(gaelco2_vram_w);
DECLARE_WRITE16_MEMBER(gaelco2_palette_w);
DECLARE_CUSTOM_INPUT_MEMBER(wrally2_analog_bit_r);
};
@ -46,7 +47,6 @@ DRIVER_INIT( touchgo );
DRIVER_INIT( snowboar );
DRIVER_INIT( bang );
TIMER_DEVICE_CALLBACK( bang_irq );
CUSTOM_INPUT( wrally2_analog_bit_r );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_cs_w );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_sk_w );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w );

2
src/mame/includes/galaxold.h
View File

@ -123,6 +123,7 @@ public:
DECLARE_READ8_MEMBER(rockclim_videoram_r);
DECLARE_WRITE8_MEMBER(dambustr_bg_split_line_w);
DECLARE_WRITE8_MEMBER(dambustr_bg_color_w);
DECLARE_CUSTOM_INPUT_MEMBER(_4in1_fake_port_r);
};
@ -192,7 +193,6 @@ MACHINE_RESET( hunchbkg );
#define galaxold_coin_counter_0_w galaxold_coin_counter_w
CUSTOM_INPUT( _4in1_fake_port_r );
INTERRUPT_GEN( hunchbks_vh_interrupt );

2
src/mame/includes/jedi.h
View File

@ -54,6 +54,7 @@ public:
DECLARE_WRITE8_MEMBER(nvram_enable_w);
DECLARE_WRITE8_MEMBER(jedi_vscroll_w);
DECLARE_WRITE8_MEMBER(jedi_hscroll_w);
DECLARE_CUSTOM_INPUT_MEMBER(jedi_audio_comm_stat_r);
};
@ -64,7 +65,6 @@ MACHINE_CONFIG_EXTERN( jedi_audio );
WRITE8_HANDLER( jedi_audio_reset_w );
WRITE8_HANDLER( jedi_audio_latch_w );
READ8_HANDLER( jedi_audio_ack_latch_r );
CUSTOM_INPUT( jedi_audio_comm_stat_r );
/*----------- defined in video/jedi.c -----------*/

17
src/mame/includes/mhavoc.h
View File

@ -50,6 +50,12 @@ public:
DECLARE_WRITE8_MEMBER(mhavoc_out_1_w);
DECLARE_WRITE8_MEMBER(mhavocrv_speech_data_w);
DECLARE_WRITE8_MEMBER(mhavocrv_speech_strobe_w);
DECLARE_CUSTOM_INPUT_MEMBER(tms5220_r);
DECLARE_CUSTOM_INPUT_MEMBER(mhavoc_bit67_r);
DECLARE_CUSTOM_INPUT_MEMBER(gamma_rcvd_r);
DECLARE_CUSTOM_INPUT_MEMBER(gamma_xmtd_r);
DECLARE_CUSTOM_INPUT_MEMBER(alpha_rcvd_r);
DECLARE_CUSTOM_INPUT_MEMBER(alpha_xmtd_r);
};
@ -63,14 +69,3 @@ MACHINE_RESET( mhavoc );
DRIVER_INIT( mhavocrv );
CUSTOM_INPUT( tms5220_r );
CUSTOM_INPUT( gamma_rcvd_r );
CUSTOM_INPUT( gamma_xmtd_r );
CUSTOM_INPUT( alpha_rcvd_r );
CUSTOM_INPUT( alpha_xmtd_r );
CUSTOM_INPUT( mhavoc_bit67_r );

6
src/mame/includes/micro3d.h
View File

@ -99,6 +99,7 @@ public:
DECLARE_WRITE32_MEMBER(micro3d_fifo_w);
DECLARE_WRITE32_MEMBER(micro3d_alt_fifo_w);
DECLARE_READ32_MEMBER(micro3d_pipe_r);
DECLARE_CUSTOM_INPUT_MEMBER(botssa_hwchk_r);
};
typedef struct _micro3d_vtx_
@ -115,11 +116,6 @@ typedef struct _micro3d_vtx_
CUSTOM_INPUT( botssa_hwchk_r );
void micro3d_duart_irq_handler(device_t *device, UINT8 vector);
UINT8 micro3d_duart_input_r(device_t *device);
void micro3d_duart_output_w(device_t *device, UINT8 data);

4
src/mame/includes/phoenix.h
View File

@ -25,6 +25,8 @@ public:
DECLARE_WRITE8_MEMBER(pleiads_videoreg_w);
DECLARE_WRITE8_MEMBER(phoenix_scroll_w);
DECLARE_READ8_MEMBER(survival_input_port_0_r);
DECLARE_CUSTOM_INPUT_MEMBER(player_input_r);
DECLARE_CUSTOM_INPUT_MEMBER(pleiads_protection_r);
};
@ -60,8 +62,6 @@ VIDEO_START( phoenix );
SCREEN_UPDATE_IND16( phoenix );
CUSTOM_INPUT( player_input_r );
CUSTOM_INPUT( pleiads_protection_r );
READ8_DEVICE_HANDLER( survival_protection_r );
READ_LINE_DEVICE_HANDLER( survival_sid_callback );

2
src/mame/includes/playch10.h
View File

@ -80,6 +80,7 @@ public:
DECLARE_WRITE8_MEMBER(hboard_rom_switch_w);
void pc10_set_mirroring(int mirroring);
DECLARE_WRITE8_MEMBER(playch10_videoram_w);
DECLARE_CUSTOM_INPUT_MEMBER(pc10_int_detect_r);
};
@ -104,7 +105,6 @@ DRIVER_INIT( pcgboard_type2 ); /* g-board games with 4 screen mirror */
DRIVER_INIT( pchboard ); /* h-board games */
DRIVER_INIT( pciboard ); /* i-board games */
DRIVER_INIT( pckboard ); /* k-board games */
CUSTOM_INPUT( pc10_int_detect_r );

3
src/mame/includes/scramble.h
View File

@ -11,6 +11,7 @@ public:
UINT8 m_cavelon_bank;
UINT8 m_security_2B_counter;
UINT8 m_xb;
DECLARE_CUSTOM_INPUT_MEMBER(darkplnt_custom_r);
};
@ -54,8 +55,6 @@ READ8_HANDLER( triplep_pap_r );
READ8_HANDLER( hunchbks_mirror_r );
WRITE8_HANDLER( hunchbks_mirror_w );
CUSTOM_INPUT( darkplnt_custom_r );
/*----------- defined in audio/scramble.c -----------*/

7
src/mame/includes/stactics.h
View File

@ -43,6 +43,9 @@ public:
DECLARE_WRITE8_MEMBER(stactics_speed_latch_w);
DECLARE_WRITE8_MEMBER(stactics_shot_trigger_w);
DECLARE_WRITE8_MEMBER(stactics_shot_flag_clear_w);
DECLARE_CUSTOM_INPUT_MEMBER(stactics_get_frame_count_d3);
DECLARE_CUSTOM_INPUT_MEMBER(stactics_get_shot_standby);
DECLARE_CUSTOM_INPUT_MEMBER(stactics_get_not_shot_arrive);
};
@ -50,7 +53,5 @@ public:
MACHINE_CONFIG_EXTERN( stactics_video );
CUSTOM_INPUT( stactics_get_frame_count_d3 );
CUSTOM_INPUT( stactics_get_shot_standby );
CUSTOM_INPUT( stactics_get_not_shot_arrive );

4
src/mame/includes/starwars.h
View File

@ -50,15 +50,13 @@ public:
DECLARE_READ8_MEMBER(starwars_div_reh_r);
DECLARE_READ8_MEMBER(starwars_div_rel_r);
DECLARE_WRITE8_MEMBER(starwars_math_w);
DECLARE_CUSTOM_INPUT_MEMBER(matrix_flag_r);
};
/*----------- defined in machine/starwars.c -----------*/
CUSTOM_INPUT( matrix_flag_r );
void starwars_mproc_init(running_machine &machine);
void starwars_mproc_reset(running_machine &machine);

4
src/mame/includes/williams.h
View File

@ -65,6 +65,7 @@ public:
DECLARE_WRITE8_MEMBER(blaster_video_control_w);
DECLARE_WRITE8_MEMBER(williams_blitter_w);
DECLARE_WRITE8_MEMBER(williams2_blit_window_enable_w);
DECLARE_CUSTOM_INPUT_MEMBER(williams_mux_r);
};
@ -124,9 +125,6 @@ MACHINE_RESET( joust2 );
/* banking */
/* misc */
CUSTOM_INPUT( williams_mux_r );
/* Mayday protection */

12
src/mame/machine/arkanoid.c
View File

@ -97,28 +97,26 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_c_w)
m_ddr_c = data;
}
CUSTOM_INPUT( arkanoid_68705_input_r )
CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_68705_input_r)
{
arkanoid_state *state = field.machine().driver_data<arkanoid_state>();
int res = 0;
/* bit 0x40 of comes from the sticky bit */
if (!state->m_z80write)
if (!m_z80write)
res |= 0x01;
/* bit 0x80 comes from a write latch */
if (!state->m_m68705write)
if (!m_m68705write)
res |= 0x02;
return res;
}
CUSTOM_INPUT( arkanoid_input_mux )
CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_input_mux)
{
arkanoid_state *state = field.machine().driver_data<arkanoid_state>();
const char *tag1 = (const char *)param;
const char *tag2 = tag1 + strlen(tag1) + 1;
return input_port_read(field.machine(), (state->m_paddle_select == 0) ? tag1 : tag2);
return input_port_read(machine(), (m_paddle_select == 0) ? tag1 : tag2);
}
/*

5
src/mame/machine/balsente.c
View File

@ -1091,10 +1091,9 @@ WRITE8_MEMBER(balsente_state::balsente_register_addr_w)
*
*************************************/
CUSTOM_INPUT( nstocker_bits_r )
CUSTOM_INPUT_MEMBER(balsente_state::nstocker_bits_r)
{
balsente_state *state = field.machine().driver_data<balsente_state>();
return state->m_nstocker_bits;
return m_nstocker_bits;
}

5
src/mame/machine/gaelco2.c
View File

@ -218,11 +218,10 @@ TIMER_DEVICE_CALLBACK( bang_irq )
***************************************************************************/
CUSTOM_INPUT( wrally2_analog_bit_r )
CUSTOM_INPUT_MEMBER(gaelco2_state::wrally2_analog_bit_r)
{
gaelco2_state *state = field.machine().driver_data<gaelco2_state>();
int which = (FPTR)param;
return (state->m_analog_ports[which] >> 7) & 0x01;
return (m_analog_ports[which] >> 7) & 0x01;
}

5
src/mame/machine/galaxold.c
View File

@ -254,13 +254,12 @@ WRITE8_MEMBER(galaxold_state::_4in1_bank_w)
memory_set_bank(machine(), "bank1", m__4in1_bank);
}
CUSTOM_INPUT( _4in1_fake_port_r )
CUSTOM_INPUT_MEMBER(galaxold_state::_4in1_fake_port_r)
{
galaxold_state *state = field.machine().driver_data<galaxold_state>();
static const char *const portnames[] = { "FAKE1", "FAKE2", "FAKE3", "FAKE4" };
int bit_mask = (FPTR)param;
return (input_port_read(field.machine(), portnames[state->m__4in1_bank]) & bit_mask) ? 0x01 : 0x00;
return (input_port_read(machine(), portnames[m__4in1_bank]) & bit_mask) ? 0x01 : 0x00;
}
#ifdef UNUSED_FUNCTION

29
src/mame/machine/mhavoc.c
View File

@ -205,45 +205,40 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_rom_banksel_w)
*
*************************************/
CUSTOM_INPUT( tms5220_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::tms5220_r)
{
return tms5220_readyq_r(field.machine().device("tms")) ? 1 : 0;
return tms5220_readyq_r(machine().device("tms")) ? 1 : 0;
}
CUSTOM_INPUT( mhavoc_bit67_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::mhavoc_bit67_r)
{
mhavoc_state *state = field.machine().driver_data<mhavoc_state>();
const char *tag1 = (const char *)param;
const char *tag2 = tag1 + strlen(tag1) + 1;
return input_port_read(field.machine(), state->m_player_1 ? tag2 : tag1) & 0x03;
return input_port_read(machine(), m_player_1 ? tag2 : tag1) & 0x03;
}
CUSTOM_INPUT( gamma_rcvd_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::gamma_rcvd_r)
{
mhavoc_state *state = field.machine().driver_data<mhavoc_state>();
/* Gamma rcvd flag */
return state->m_gamma_rcvd;
return m_gamma_rcvd;
}
CUSTOM_INPUT( gamma_xmtd_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::gamma_xmtd_r)
{
mhavoc_state *state = field.machine().driver_data<mhavoc_state>();
/* Gamma xmtd flag */
return state->m_gamma_xmtd;
return m_gamma_xmtd;
}
CUSTOM_INPUT( alpha_rcvd_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::alpha_rcvd_r)
{
mhavoc_state *state = field.machine().driver_data<mhavoc_state>();
/* Alpha rcvd flag */
return (state->m_has_gamma_cpu && state->m_alpha_rcvd);
return (m_has_gamma_cpu && m_alpha_rcvd);
}
CUSTOM_INPUT( alpha_xmtd_r )
CUSTOM_INPUT_MEMBER(mhavoc_state::alpha_xmtd_r)
{
mhavoc_state *state = field.machine().driver_data<mhavoc_state>();
/* Alpha xmtd flag */
return (state->m_has_gamma_cpu && state->m_alpha_xmtd);
return (m_has_gamma_cpu && m_alpha_xmtd);
}
/*************************************

5
src/mame/machine/micro3d.c
View File

@ -537,11 +537,10 @@ WRITE16_MEMBER(micro3d_state::micro3d_adc_w)
machine().scheduler().timer_set(attotime::from_usec(40), FUNC(adc_done_callback), data & ~4);
}
CUSTOM_INPUT( botssa_hwchk_r )
CUSTOM_INPUT_MEMBER(micro3d_state::botssa_hwchk_r)
{
micro3d_state *state = field.machine().driver_data<micro3d_state>();
return state->m_botssa_latch;
return m_botssa_latch;
}
READ16_MEMBER(micro3d_state::botssa_140000_r)

5
src/mame/machine/playch10.c
View File

@ -86,10 +86,9 @@ MACHINE_START( playch10_hboard )
*
*************************************/
CUSTOM_INPUT( pc10_int_detect_r )
CUSTOM_INPUT_MEMBER(playch10_state::pc10_int_detect_r)
{
playch10_state *state = field.machine().driver_data<playch10_state>();
return ~state->m_pc10_int_detect & 1;
return ~m_pc10_int_detect & 1;
}
WRITE8_MEMBER(playch10_state::pc10_SDCS_w)

4
src/mame/machine/scramble.c
View File

@ -33,7 +33,7 @@ MACHINE_RESET( explorer )
}
CUSTOM_INPUT( darkplnt_custom_r )
CUSTOM_INPUT_MEMBER(scramble_state::darkplnt_custom_r)
{
static const UINT8 remap[] = {0x03, 0x02, 0x00, 0x01, 0x21, 0x20, 0x22, 0x23,
0x33, 0x32, 0x30, 0x31, 0x11, 0x10, 0x12, 0x13,
@ -43,7 +43,7 @@ CUSTOM_INPUT( darkplnt_custom_r )
0x2b, 0x2a, 0x28, 0x29, 0x09, 0x08, 0x0a, 0x0b,
0x0f, 0x0e, 0x0c, 0x0d, 0x2d, 0x2c, 0x2e, 0x2f,
0x27, 0x26, 0x24, 0x25, 0x05, 0x04, 0x06, 0x07 };
UINT8 val = input_port_read(field.machine(), (const char *)param);
UINT8 val = input_port_read(machine(), (const char *)param);
return remap[val >> 2];
}

5
src/mame/machine/starwars.c
View File

@ -107,11 +107,10 @@ WRITE8_MEMBER(starwars_state::starwars_out_w)
*
*************************************/
CUSTOM_INPUT( matrix_flag_r )
CUSTOM_INPUT_MEMBER(starwars_state::matrix_flag_r)
{
starwars_state *state = field.machine().driver_data<starwars_state>();
/* set the matrix processor flag */
return state->m_math_run ? 1 : 0;
return m_math_run ? 1 : 0;
}

7
src/mame/machine/williams.c
View File

@ -616,15 +616,14 @@ WRITE8_DEVICE_HANDLER( williams_port_select_w )
state->m_port_select = data;
}
CUSTOM_INPUT( williams_mux_r )
CUSTOM_INPUT_MEMBER(williams_state::williams_mux_r)
{
williams_state *state = field.machine().driver_data<williams_state>();
const char *tag = (const char *)param;
if (state->m_port_select != 0)
if (m_port_select != 0)
tag += strlen(tag) + 1;
return input_port_read(field.machine(), tag);
return input_port_read(machine(), tag);
}
/*

16
src/mame/video/phoenix.c
View File

@ -304,20 +304,18 @@ WRITE8_MEMBER(phoenix_state::phoenix_scroll_w)
}
CUSTOM_INPUT( player_input_r )
CUSTOM_INPUT_MEMBER(phoenix_state::player_input_r)
{
phoenix_state *state = field.machine().driver_data<phoenix_state>();
if (state->m_cocktail_mode)
return (input_port_read(field.machine(), "CTRL") & 0xf0) >> 4;
if (m_cocktail_mode)
return (input_port_read(machine(), "CTRL") & 0xf0) >> 4;
else
return (input_port_read(field.machine(), "CTRL") & 0x0f) >> 0;
return (input_port_read(machine(), "CTRL") & 0x0f) >> 0;
}
CUSTOM_INPUT( pleiads_protection_r )
CUSTOM_INPUT_MEMBER(phoenix_state::pleiads_protection_r)
{
phoenix_state *state = field.machine().driver_data<phoenix_state>();
/* handle Pleiads protection */
switch (state->m_pleiads_protection_question)
switch (m_pleiads_protection_question)
{
case 0x00:
case 0x20:
@ -328,7 +326,7 @@ CUSTOM_INPUT( pleiads_protection_r )
/* Bit 3 is 1 */
return 1;
default:
logerror("%s:Unknown protection question %02X\n", field.machine().describe_context(), state->m_pleiads_protection_question);
logerror("%s:Unknown protection question %02X\n", machine().describe_context(), m_pleiads_protection_question);
return 0;
}
}

15
src/mame/video/stactics.c
View File

@ -111,11 +111,10 @@ WRITE8_MEMBER(stactics_state::stactics_scroll_ram_w)
*
*************************************/
CUSTOM_INPUT( stactics_get_frame_count_d3 )
CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_frame_count_d3)
{
stactics_state *state = field.machine().driver_data<stactics_state>();
return (state->m_frame_count >> 3) & 0x01;
return (m_frame_count >> 3) & 0x01;
}
@ -166,19 +165,17 @@ WRITE8_MEMBER(stactics_state::stactics_shot_flag_clear_w)
}
CUSTOM_INPUT( stactics_get_shot_standby )
CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_shot_standby)
{
stactics_state *state = field.machine().driver_data<stactics_state>();
return state->m_shot_standby;
return m_shot_standby;
}
CUSTOM_INPUT( stactics_get_not_shot_arrive )
CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_not_shot_arrive)
{
stactics_state *state = field.machine().driver_data<stactics_state>();
return !state->m_shot_arrive;
return !m_shot_arrive;
}