Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2012-09-26 20:22:00 +00:00
parent cd8eda74a9
commit 3ee66ccd56
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mame/drivers/vicdual.c
View File

@ -59,11 +59,6 @@
*
*************************************/
/* the main CPU is reset when a coin is inserted */
#define COIN_PORT_TAG "COIN"
TIMER_CALLBACK_MEMBER(vicdual_state::clear_coin_status)
{
m_coin_status = 0;
@ -83,6 +78,7 @@ CUSTOM_INPUT_MEMBER(vicdual_state::vicdual_read_coin_status)
}
/* the main CPU is reset when a coin is inserted */
INPUT_CHANGED_MEMBER(vicdual_state::coin_changed)
{
if (newval)
@ -91,7 +87,7 @@ INPUT_CHANGED_MEMBER(vicdual_state::coin_changed)
coin_counter_w(machine(), 0, 1);
coin_counter_w(machine(), 0, 0);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE);
m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
/* simulate the coin switch being closed for a while */
machine().scheduler().timer_set(4 * machine().primary_screen->frame_period(), timer_expired_delegate(FUNC(vicdual_state::clear_coin_status),this));
@ -100,9 +96,8 @@ INPUT_CHANGED_MEMBER(vicdual_state::coin_changed)
#define PORT_COIN \
PORT_START(COIN_PORT_TAG) \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, vicdual_state,coin_changed, NULL) \
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("COIN") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, vicdual_state,coin_changed, NULL)
@ -166,7 +161,7 @@ CUSTOM_INPUT_MEMBER(vicdual_state::vicdual_get_timer_value)
int vicdual_is_cabinet_color(running_machine &machine)
{
return (machine.root_device().ioport(COLOR_BW_PORT_TAG)->read() == 0);
return (machine.root_device().ioport(COLOR_BW_PORT_TAG)->read() & 1) ? 0 : 1;
}
@ -174,8 +169,7 @@ int vicdual_is_cabinet_color(running_machine &machine)
PORT_START(COLOR_BW_PORT_TAG) \
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) \
PORT_CONFSETTING( 0x00, "Color" ) \
PORT_CONFSETTING( 0x01, "Black and White" ) \
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_CONFSETTING( 0x01, "Black and White" )

14
src/mame/includes/vicdual.h
View File

@ -26,15 +26,20 @@ class vicdual_state : public driver_device
{
public:
vicdual_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
: driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_videoram(*this, "videoram"),
m_characterram(*this, "characterram"){ }
m_characterram(*this, "characterram")
{ }
UINT32 m_coin_status;
required_device<cpu_device> m_maincpu;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_characterram;
UINT8 m_samurai_protection_data;
UINT8 m_coin_status;
UINT8 m_palette_bank;
UINT8 m_samurai_protection_data;
DECLARE_WRITE8_MEMBER(vicdual_videoram_w);
DECLARE_WRITE8_MEMBER(vicdual_characterram_w);
DECLARE_READ8_MEMBER(depthch_io_r);
@ -66,6 +71,7 @@ public:
DECLARE_READ8_MEMBER(invinco_io_r);
DECLARE_WRITE8_MEMBER(invinco_io_w);
DECLARE_WRITE8_MEMBER(vicdual_palette_bank_w);
DECLARE_CUSTOM_INPUT_MEMBER(vicdual_read_coin_status);
DECLARE_CUSTOM_INPUT_MEMBER(vicdual_get_64v);
DECLARE_CUSTOM_INPUT_MEMBER(vicdual_get_vblank_comp);