Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MT #02855

Browse Source
This commit is contained in:
angelosa 2016-12-25 06:46:40 +01:00
parent 66d2c0f76e
commit 4aaf3eaa7a
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/mame/drivers/hanaawas.cpp
View File

@ -37,17 +37,31 @@ READ8_MEMBER(hanaawas_state::hanaawas_input_port_0_r)
int i, ordinal = 0; int i, ordinal = 0;
uint16_t buttons = 0; uint16_t buttons = 0;
// TODO: key matrix seems identical to speedatk.cpp, needs merging
if(m_coin_impulse > 0)
{
m_coin_impulse--;
return 0x80;
}
if((ioport("COINS")->read() & 1) || (ioport("COINS")->read() & 2))
{
m_coin_impulse = m_coin_settings*2;
m_coin_impulse--;
return 0x80;
}
switch (m_mux) switch (m_mux)
{ {
case 1: /* start buttons */ case 1: /* start buttons */
buttons = ioport("START")->read(); buttons = ioport("START")->read();
break; break;
case 2: /* player 1 buttons */ case 2: /* player 1 buttons */
buttons = ioport("P1")->read(); buttons = ioport("P1")->read();
break; break;
case 4: /* player 2 buttons */ case 4: /* player 2 buttons */
buttons = ioport("P2")->read(); buttons = ioport("P2")->read();
break; break;
} }
@ -62,7 +76,7 @@ READ8_MEMBER(hanaawas_state::hanaawas_input_port_0_r)
} }
} }
return (ioport("IN0")->read() & 0xf0) | ordinal; return ordinal;
} }
WRITE8_MEMBER(hanaawas_state::hanaawas_inputs_mux_w) WRITE8_MEMBER(hanaawas_state::hanaawas_inputs_mux_w)
@ -75,6 +89,11 @@ WRITE8_MEMBER(hanaawas_state::irq_ack_w)
m_maincpu->set_input_line(0,CLEAR_LINE); m_maincpu->set_input_line(0,CLEAR_LINE);
} }
WRITE8_MEMBER(hanaawas_state::key_matrix_status_w)
{
if((data & 0xf0) == 0x40) //coinage setting command
m_coin_settings = data & 0xf;
}
static ADDRESS_MAP_START( hanaawas_map, AS_PROGRAM, 8, hanaawas_state ) static ADDRESS_MAP_START( hanaawas_map, AS_PROGRAM, 8, hanaawas_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x0000, 0x2fff) AM_ROM
@ -90,19 +109,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, AS_IO, 8, hanaawas_state ) static ADDRESS_MAP_START( io_map, AS_IO, 8, hanaawas_state )
ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(hanaawas_input_port_0_r, hanaawas_inputs_mux_w) AM_RANGE(0x00, 0x00) AM_READWRITE(hanaawas_input_port_0_r, hanaawas_inputs_mux_w)
AM_RANGE(0x01, 0x01) AM_READNOP /* r bit 1: status ready, presumably of the input mux device / w = configure device? */ AM_RANGE(0x01, 0x01) AM_READNOP AM_WRITE(key_matrix_status_w) /* r bit 1: status ready, presumably of the input mux device / w = configure device? */
AM_RANGE(0x10, 0x10) AM_DEVREAD("aysnd", ay8910_device, data_r) AM_RANGE(0x10, 0x10) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("aysnd", ay8910_device, address_data_w) AM_RANGE(0x10, 0x11) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
AM_RANGE(0xc0, 0xc0) AM_WRITENOP // watchdog AM_RANGE(0xc0, 0xc0) AM_WRITENOP // watchdog
ADDRESS_MAP_END ADDRESS_MAP_END
static INPUT_PORTS_START( hanaawas ) static INPUT_PORTS_START( hanaawas )
PORT_START("IN0") PORT_START("COINS")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_START("DSW") PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
@ -184,6 +200,8 @@ GFXDECODE_END
void hanaawas_state::machine_start() void hanaawas_state::machine_start()
{ {
save_item(NAME(m_mux)); save_item(NAME(m_mux));
save_item(NAME(m_coin_settings));
save_item(NAME(m_coin_impulse));
} }
void hanaawas_state::machine_reset() void hanaawas_state::machine_reset()

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

@ -25,10 +25,13 @@ public:
/* misc */ /* misc */
int m_mux; int m_mux;
uint8_t m_coin_settings;
uint8_t m_coin_impulse;
DECLARE_READ8_MEMBER(hanaawas_input_port_0_r); DECLARE_READ8_MEMBER(hanaawas_input_port_0_r);
DECLARE_WRITE8_MEMBER(hanaawas_inputs_mux_w); DECLARE_WRITE8_MEMBER(hanaawas_inputs_mux_w);
DECLARE_WRITE8_MEMBER(hanaawas_videoram_w); DECLARE_WRITE8_MEMBER(hanaawas_videoram_w);
DECLARE_WRITE8_MEMBER(hanaawas_colorram_w); DECLARE_WRITE8_MEMBER(hanaawas_colorram_w);
DECLARE_WRITE8_MEMBER(key_matrix_status_w);
DECLARE_WRITE8_MEMBER(irq_ack_w); DECLARE_WRITE8_MEMBER(irq_ack_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override; virtual void machine_start() override;