diff options
author | 2017-10-10 02:44:31 +0200 | |
---|---|---|
committer | 2017-10-10 04:45:17 +0200 | |
commit | 2a3bb94399ab0e8db2cc6cbf2435f0b0bdba35e0 (patch) | |
tree | 91971001ce2c8badab6da37f2a7170187526fc3d | |
parent | a2dc86e253f657b614ffd07086d515cb0583e45f (diff) |
stv.cpp: batmanfr input labels (nw)
sega_scu.cpp: DMA save state registration (nw)
-rw-r--r-- | src/devices/machine/sega_scu.cpp | 36 | ||||
-rw-r--r-- | src/devices/machine/sega_scu.h | 1 | ||||
-rw-r--r-- | src/devices/video/stvvdp2.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/rax.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/stv.cpp | 24 |
5 files changed, 60 insertions, 4 deletions
diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp index 91154a9f775..feab01e4524 100644 --- a/src/devices/machine/sega_scu.cpp +++ b/src/devices/machine/sega_scu.cpp @@ -213,12 +213,46 @@ void sega_scu_device::device_start() save_item(NAME(m_t1s)); save_item(NAME(m_t1md)); + save_item(NAME(m_dma[0].src)); + save_item(NAME(m_dma[0].dst)); + save_item(NAME(m_dma[0].src_add)); + save_item(NAME(m_dma[0].dst_add)); + save_item(NAME(m_dma[0].size)); + save_item(NAME(m_dma[0].index)); + save_item(NAME(m_dma[0].start_factor)); + save_item(NAME(m_dma[0].enable_mask)); + save_item(NAME(m_dma[0].indirect_mode)); + save_item(NAME(m_dma[0].rup)); + save_item(NAME(m_dma[0].wup)); + save_item(NAME(m_dma[1].src)); + save_item(NAME(m_dma[1].dst)); + save_item(NAME(m_dma[1].src_add)); + save_item(NAME(m_dma[1].dst_add)); + save_item(NAME(m_dma[1].size)); + save_item(NAME(m_dma[1].index)); + save_item(NAME(m_dma[1].start_factor)); + save_item(NAME(m_dma[1].enable_mask)); + save_item(NAME(m_dma[1].indirect_mode)); + save_item(NAME(m_dma[1].rup)); + save_item(NAME(m_dma[1].wup)); + save_item(NAME(m_dma[2].src)); + save_item(NAME(m_dma[2].dst)); + save_item(NAME(m_dma[2].src_add)); + save_item(NAME(m_dma[2].dst_add)); + save_item(NAME(m_dma[2].size)); + save_item(NAME(m_dma[2].index)); + save_item(NAME(m_dma[2].start_factor)); + save_item(NAME(m_dma[2].enable_mask)); + save_item(NAME(m_dma[2].indirect_mode)); + save_item(NAME(m_dma[2].rup)); + save_item(NAME(m_dma[2].wup)); + m_hostcpu = machine().device<sh2_device>(m_hostcpu_tag);//machine().device(m_hostcpu_tag); m_hostspace = &m_hostcpu->space(AS_PROGRAM); m_dma_timer[0] = timer_alloc(DMALV0_ID); m_dma_timer[1] = timer_alloc(DMALV1_ID); - m_dma_timer[2] = timer_alloc(DMALV2_ID); + m_dma_timer[2] = timer_alloc(DMALV2_ID); } diff --git a/src/devices/machine/sega_scu.h b/src/devices/machine/sega_scu.h index 82e2249910f..188a4234acf 100644 --- a/src/devices/machine/sega_scu.h +++ b/src/devices/machine/sega_scu.h @@ -130,7 +130,6 @@ private: bool indirect_mode; bool rup; bool wup; - uint32_t illegal_factor; }m_dma[3]; uint32_t dma_common_r(uint8_t offset,uint8_t level); diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 017d83e0d2a..eb3d8709286 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -6066,7 +6066,7 @@ uint8_t saturn_state::get_odd_bit( void ) int saturn_state::get_vblank_start_position( void ) { /* TODO: test says that second setting happens at 241, might need further investigation ... */ - const int d_vres[4] = { 224, 240, 256, 256 }; + const int d_vres[4] = { 240, 240, 256, 256 }; int vres_mask; int vblank_line; diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index 842699c23a1..587b7c85d9c 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -169,6 +169,7 @@ WRITE16_MEMBER( acclaim_rax_device::adsp_control_w ) else { // TODO: last stage in Batman Forever!? + // page = 0, dir = 1, type = 1, src_addr = 0xfd fatalerror("%s DMA to byte memory!",this->tag()); } diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index c89ec8c6b05..3ac06b08b37 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1360,6 +1360,28 @@ static INPUT_PORTS_START( stv ) PORT_BIT( 0x0000, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END +static INPUT_PORTS_START( batmanfr ) + PORT_INCLUDE( stv ) + + PORT_MODIFY("PORTA") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Jump") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Punch") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Kick") + + PORT_MODIFY("PORTB") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Punch") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Kick") + + PORT_MODIFY("PORTE") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_MODIFY("PORTF") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) +INPUT_PORTS_END + static INPUT_PORTS_START( stv6b ) PORT_INCLUDE( stv ) @@ -3572,7 +3594,7 @@ GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT /* Playable */ GAME( 1998, astrass, stvbios, stv_5881, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1995, bakubaku, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Baku Baku Animal (J 950407 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1996, batmanfr, stvbios, batmanfr, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1996, batmanfr, stvbios, batmanfr, batmanfr, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, colmns97, stvbios, stv, stv, stv_state, colmns97, ROT0, "Sega", "Columns '97 (JET 961209 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, cotton2, stvbios, stv, stv, stv_state, cotton2, ROT0, "Success", "Cotton 2 (JUET 970902 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1998, cottonbm, stvbios, stv, stv, stv_state, cottonbm, ROT0, "Success", "Cotton Boomerang (JUET 980709 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) |