Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

no more legacy CUSTOM_INPUT (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-03-24 20:36:34 +00:00
parent a565657066
commit 34ade444e9
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/ioport.h
View File

@ -1526,7 +1526,6 @@ private:
#define UCHAR_MAMEKEY(code) (UCHAR_MAMEKEY_BEGIN + ITEM_ID_##code) #define UCHAR_MAMEKEY(code) (UCHAR_MAMEKEY_BEGIN + ITEM_ID_##code)
// macro for a read callback function (PORT_CUSTOM) // macro for a read callback function (PORT_CUSTOM)
#define CUSTOM_INPUT(name) ioport_value name(device_t &device, ioport_field &field, void *param)
#define CUSTOM_INPUT_MEMBER(name) ioport_value name(ioport_field &field, void *param) #define CUSTOM_INPUT_MEMBER(name) ioport_value name(ioport_field &field, void *param)
#define DECLARE_CUSTOM_INPUT_MEMBER(name) ioport_value name(ioport_field &field, void *param) #define DECLARE_CUSTOM_INPUT_MEMBER(name) ioport_value name(ioport_field &field, void *param)

7
src/mame/drivers/popeye.c
View File

@ -290,10 +290,9 @@ static INPUT_PORTS_START( skyskipr )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
INPUT_PORTS_END INPUT_PORTS_END
static CUSTOM_INPUT( pop_field_r ) CUSTOM_INPUT_MEMBER( popeye_state::pop_field_r )
{ {
popeye_state *state = field.machine().driver_data<popeye_state>(); return m_field ^ 1;
return state->m_field ^ 1;
} }
static INPUT_PORTS_START( popeye ) static INPUT_PORTS_START( popeye )
@ -322,7 +321,7 @@ static INPUT_PORTS_START( popeye )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(pop_field_r, (void *) 0) /* inverted init e/o signal (even odd) */ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, popeye_state,pop_field_r, NULL) /* inverted init e/o signal (even odd) */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )

1
src/mame/includes/popeye.h
View File

@ -46,6 +46,7 @@ public:
DECLARE_PALETTE_INIT(popeyebl); DECLARE_PALETTE_INIT(popeyebl);
UINT32 screen_update_popeye(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_popeye(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(popeye_interrupt); INTERRUPT_GEN_MEMBER(popeye_interrupt);
DECLARE_CUSTOM_INPUT_MEMBER( pop_field_r );
void convert_color_prom(const UINT8 *color_prom); void convert_color_prom(const UINT8 *color_prom);
void set_background_palette(int bank); void set_background_palette(int bank);
void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect);