summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2016-05-03 18:31:00 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2016-05-03 18:31:00 +0200
commit76b24cb2b639bcbb6146cc46e949480ddec6ff94 (patch)
tree4e97bacb85f081277895d40f6a9920d7bf5e5d9e /src
parent295774fabbd4eae7e1e5224cd690116ed9589e6d (diff)
jailbrek.cpp: fixed MT04935 and hooked up coin counters (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/jailbrek.cpp32
-rw-r--r--src/mame/includes/jailbrek.h15
-rw-r--r--src/mame/video/jailbrek.cpp7
3 files changed, 30 insertions, 24 deletions
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 5c9d36f2036..5d988d24f36 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -81,7 +81,7 @@ Notes:
TODO:
- - coin counters
+ - various unknown writes (NOPed out in the memory map)
***************************************************************************/
@@ -101,25 +101,31 @@ WRITE8_MEMBER(jailbrek_state::ctrl_w)
flip_screen_set(data & 0x08);
}
-INTERRUPT_GEN_MEMBER(jailbrek_state::jb_interrupt)
+WRITE8_MEMBER(jailbrek_state::coin_w)
+{
+ machine().bookkeeping().coin_counter_w(0, data & 0x01);
+ machine().bookkeeping().coin_counter_w(1, data & 0x02);
+}
+
+INTERRUPT_GEN_MEMBER(jailbrek_state::interrupt)
{
if (m_irq_enable)
device.execute().set_input_line(0, HOLD_LINE);
}
-INTERRUPT_GEN_MEMBER(jailbrek_state::jb_interrupt_nmi)
+INTERRUPT_GEN_MEMBER(jailbrek_state::interrupt_nmi)
{
if (m_nmi_enable)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-READ8_MEMBER(jailbrek_state::jailbrek_speech_r)
+READ8_MEMBER(jailbrek_state::speech_r)
{
return (m_vlm->bsy() ? 1 : 0);
}
-WRITE8_MEMBER(jailbrek_state::jailbrek_speech_w)
+WRITE8_MEMBER(jailbrek_state::speech_w)
{
/* bit 0 could be latch direction like in yiear */
m_vlm->st((data >> 1) & 1);
@@ -127,8 +133,8 @@ WRITE8_MEMBER(jailbrek_state::jailbrek_speech_w)
}
static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8, jailbrek_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(jailbrek_colorram_w) AM_SHARE("colorram")
- AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(jailbrek_videoram_w) AM_SHARE("videoram")
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(colorram_w) AM_SHARE("colorram")
+ AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x10c0, 0x14ff) AM_RAM /* ??? */
AM_RANGE(0x1500, 0x1fff) AM_RAM /* work ram */
@@ -138,16 +144,16 @@ static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8, jailbrek_state )
AM_RANGE(0x2042, 0x2042) AM_RAM AM_SHARE("scroll_dir") /* bit 2 = scroll direction */
AM_RANGE(0x2043, 0x2043) AM_WRITENOP /* ??? */
AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w) /* irq, nmi enable, screen flip */
- AM_RANGE(0x3000, 0x307f) AM_RAM /* related to sprites? */
+ AM_RANGE(0x3000, 0x3000) AM_WRITE(coin_w)
AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("snsnd", sn76489a_device, write)
AM_RANGE(0x3200, 0x3200) AM_READ_PORT("DSW3") AM_WRITENOP /* mirror of the previous? */
AM_RANGE(0x3300, 0x3300) AM_READ_PORT("SYSTEM") AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
AM_RANGE(0x3301, 0x3301) AM_READ_PORT("P1")
AM_RANGE(0x3302, 0x3302) AM_READ_PORT("P2")
AM_RANGE(0x3303, 0x3303) AM_READ_PORT("DSW1")
- AM_RANGE(0x4000, 0x4000) AM_WRITE(jailbrek_speech_w) /* speech pins */
+ AM_RANGE(0x4000, 0x4000) AM_WRITE(speech_w) /* speech pins */
AM_RANGE(0x5000, 0x5000) AM_DEVWRITE("vlm", vlm5030_device, data_w) /* speech data */
- AM_RANGE(0x6000, 0x6000) AM_READ(jailbrek_speech_r)
+ AM_RANGE(0x6000, 0x6000) AM_READ(speech_r)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -249,8 +255,8 @@ static MACHINE_CONFIG_START( jailbrek, jailbrek_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/12)
MCFG_CPU_PROGRAM_MAP(jailbrek_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jailbrek_state, jb_interrupt)
- MCFG_CPU_PERIODIC_INT_DRIVER(jailbrek_state, jb_interrupt_nmi, 500) /* ? */
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", jailbrek_state, interrupt)
+ MCFG_CPU_PERIODIC_INT_DRIVER(jailbrek_state, interrupt_nmi, 500) /* ? */
MCFG_WATCHDOG_ADD("watchdog")
@@ -262,7 +268,7 @@ static MACHINE_CONFIG_START( jailbrek, jailbrek_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240)
- MCFG_SCREEN_UPDATE_DRIVER(jailbrek_state, screen_update_jailbrek)
+ MCFG_SCREEN_UPDATE_DRIVER(jailbrek_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
/* sound hardware */
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 2a191f5360b..61eeb440c6b 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -46,18 +46,19 @@ public:
UINT8 m_irq_enable;
UINT8 m_nmi_enable;
DECLARE_WRITE8_MEMBER(ctrl_w);
- DECLARE_WRITE8_MEMBER(jailbrek_videoram_w);
- DECLARE_WRITE8_MEMBER(jailbrek_colorram_w);
- DECLARE_READ8_MEMBER(jailbrek_speech_r);
- DECLARE_WRITE8_MEMBER(jailbrek_speech_w);
+ DECLARE_WRITE8_MEMBER(coin_w);
+ DECLARE_WRITE8_MEMBER(videoram_w);
+ DECLARE_WRITE8_MEMBER(colorram_w);
+ DECLARE_READ8_MEMBER(speech_r);
+ DECLARE_WRITE8_MEMBER(speech_w);
DECLARE_DRIVER_INIT(jailbrek);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(jailbrek);
- UINT32 screen_update_jailbrek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- INTERRUPT_GEN_MEMBER(jb_interrupt);
- INTERRUPT_GEN_MEMBER(jb_interrupt_nmi);
+ UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ INTERRUPT_GEN_MEMBER(interrupt);
+ INTERRUPT_GEN_MEMBER(interrupt_nmi);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
};
diff --git a/src/mame/video/jailbrek.cpp b/src/mame/video/jailbrek.cpp
index 386f1133610..cf58781f0e4 100644
--- a/src/mame/video/jailbrek.cpp
+++ b/src/mame/video/jailbrek.cpp
@@ -34,13 +34,13 @@ PALETTE_INIT_MEMBER(jailbrek_state, jailbrek)
}
}
-WRITE8_MEMBER(jailbrek_state::jailbrek_videoram_w)
+WRITE8_MEMBER(jailbrek_state::videoram_w)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(jailbrek_state::jailbrek_colorram_w)
+WRITE8_MEMBER(jailbrek_state::colorram_w)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
@@ -58,7 +58,6 @@ TILE_GET_INFO_MEMBER(jailbrek_state::get_bg_tile_info)
void jailbrek_state::video_start()
{
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(jailbrek_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
- m_bg_tilemap->set_scrolldx(0, 396 - 256);
}
void jailbrek_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect )
@@ -90,7 +89,7 @@ void jailbrek_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
}
}
-UINT32 jailbrek_state::screen_update_jailbrek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+UINT32 jailbrek_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int i;