From 54ffceb6ac90d966a7b962611953a3f668f5c90d Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sat, 24 Dec 2011 18:39:48 +0000 Subject: [PATCH] Added proper ROM labels for Taxi Driver [f205v] --- .gitattributes | 6 +- src/mame/drivers/{taxidrvr.c => taxidriv.c} | 106 +++++++++---------- src/mame/includes/{taxidrvr.h => taxidriv.h} | 10 +- src/mame/mame.lst | 2 +- src/mame/mame.mak | 2 +- src/mame/video/{taxidrvr.c => taxidriv.c} | 10 +- 6 files changed, 68 insertions(+), 68 deletions(-) rename src/mame/drivers/{taxidrvr.c => taxidriv.c} (76%) rename src/mame/includes/{taxidrvr.h => taxidriv.h} (58%) rename src/mame/video/{taxidrvr.c => taxidriv.c} (92%) diff --git a/.gitattributes b/.gitattributes index e2704147302..f7645748fd9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2843,7 +2843,7 @@ src/mame/drivers/tapatune.c svneol=native#text/plain src/mame/drivers/targeth.c svneol=native#text/plain src/mame/drivers/tatsumi.c svneol=native#text/plain src/mame/drivers/tattack.c svneol=native#text/plain -src/mame/drivers/taxidrvr.c svneol=native#text/plain +src/mame/drivers/taxidriv.c svneol=native#text/plain src/mame/drivers/tbowl.c svneol=native#text/plain src/mame/drivers/tceptor.c svneol=native#text/plain src/mame/drivers/tcl.c svneol=native#text/plain @@ -3602,7 +3602,7 @@ src/mame/includes/taotaido.h svneol=native#text/plain src/mame/includes/targ.h svneol=native#text/plain src/mame/includes/targeth.h svneol=native#text/plain src/mame/includes/tatsumi.h svneol=native#text/plain -src/mame/includes/taxidrvr.h svneol=native#text/plain +src/mame/includes/taxidriv.h svneol=native#text/plain src/mame/includes/tbowl.h svneol=native#text/plain src/mame/includes/tceptor.h svneol=native#text/plain src/mame/includes/tecmo.h svneol=native#text/plain @@ -4768,7 +4768,7 @@ src/mame/video/tankbust.c svneol=native#text/plain src/mame/video/taotaido.c svneol=native#text/plain src/mame/video/targeth.c svneol=native#text/plain src/mame/video/tatsumi.c svneol=native#text/plain -src/mame/video/taxidrvr.c svneol=native#text/plain +src/mame/video/taxidriv.c svneol=native#text/plain src/mame/video/tbowl.c svneol=native#text/plain src/mame/video/tceptor.c svneol=native#text/plain src/mame/video/tecmo.c svneol=native#text/plain diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidriv.c similarity index 76% rename from src/mame/drivers/taxidrvr.c rename to src/mame/drivers/taxidriv.c index dc1dff1b764..ad78f5a0675 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidriv.c @@ -7,43 +7,43 @@ Taxi Driver (c) 1984 Graphic Techno #include "emu.h" #include "cpu/z80/z80.h" #include "machine/8255ppi.h" -#include "includes/taxidrvr.h" +#include "includes/taxidriv.h" #include "sound/ay8910.h" -static WRITE8_DEVICE_HANDLER( p2a_w ) { taxidrvr_spritectrl_w(device,0,data); } -static WRITE8_DEVICE_HANDLER( p2b_w ) { taxidrvr_spritectrl_w(device,1,data); } -static WRITE8_DEVICE_HANDLER( p2c_w ) { taxidrvr_spritectrl_w(device,2,data); } -static WRITE8_DEVICE_HANDLER( p3a_w ) { taxidrvr_spritectrl_w(device,3,data); } -static WRITE8_DEVICE_HANDLER( p3b_w ) { taxidrvr_spritectrl_w(device,4,data); } -static WRITE8_DEVICE_HANDLER( p3c_w ) { taxidrvr_spritectrl_w(device,5,data); } -static WRITE8_DEVICE_HANDLER( p4a_w ) { taxidrvr_spritectrl_w(device,6,data); } -static WRITE8_DEVICE_HANDLER( p4b_w ) { taxidrvr_spritectrl_w(device,7,data); } -static WRITE8_DEVICE_HANDLER( p4c_w ) { taxidrvr_spritectrl_w(device,8,data); } +static WRITE8_DEVICE_HANDLER( p2a_w ) { taxidriv_spritectrl_w(device,0,data); } +static WRITE8_DEVICE_HANDLER( p2b_w ) { taxidriv_spritectrl_w(device,1,data); } +static WRITE8_DEVICE_HANDLER( p2c_w ) { taxidriv_spritectrl_w(device,2,data); } +static WRITE8_DEVICE_HANDLER( p3a_w ) { taxidriv_spritectrl_w(device,3,data); } +static WRITE8_DEVICE_HANDLER( p3b_w ) { taxidriv_spritectrl_w(device,4,data); } +static WRITE8_DEVICE_HANDLER( p3c_w ) { taxidriv_spritectrl_w(device,5,data); } +static WRITE8_DEVICE_HANDLER( p4a_w ) { taxidriv_spritectrl_w(device,6,data); } +static WRITE8_DEVICE_HANDLER( p4b_w ) { taxidriv_spritectrl_w(device,7,data); } +static WRITE8_DEVICE_HANDLER( p4c_w ) { taxidriv_spritectrl_w(device,8,data); } static READ8_DEVICE_HANDLER( p0a_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return state->m_latchA; } static READ8_DEVICE_HANDLER( p0c_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return (state->m_s1 << 7); } static WRITE8_DEVICE_HANDLER( p0b_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_latchB = data; } static WRITE8_DEVICE_HANDLER( p0c_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_s2 = data & 1; state->m_bghide = data & 2; @@ -57,38 +57,38 @@ static WRITE8_DEVICE_HANDLER( p0c_w ) static READ8_DEVICE_HANDLER( p1b_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return state->m_latchB; } static READ8_DEVICE_HANDLER( p1c_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return (state->m_s2 << 7) | (state->m_s4 << 6) | ((input_port_read(device->machine(), "SERVCOIN") & 1) << 4); } static WRITE8_DEVICE_HANDLER( p1a_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_latchA = data; } static WRITE8_DEVICE_HANDLER( p1c_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_s1 = data & 1; state->m_s3 = (data & 2) >> 1; } static READ8_DEVICE_HANDLER( p8910_0a_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return state->m_latchA; } static READ8_DEVICE_HANDLER( p8910_1a_r ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); return state->m_s3; } @@ -96,7 +96,7 @@ static READ8_DEVICE_HANDLER( p8910_1a_r ) original, since it works anyway even if the communication is flawed. */ static WRITE8_DEVICE_HANDLER( p8910_0b_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_s4 = data & 1; } @@ -152,21 +152,21 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9fff) AM_RAM /* ??? */ AM_RANGE(0xa000, 0xafff) AM_RAM /* ??? */ AM_RANGE(0xb000, 0xbfff) AM_RAM /* ??? */ - AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_MEMBER(taxidrvr_state, m_vram4) /* radar bitmap */ - AM_RANGE(0xc800, 0xcfff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram5) /* "sprite1" bitmap */ - AM_RANGE(0xd000, 0xd7ff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram6) /* "sprite2" bitmap */ - AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE_MEMBER(taxidrvr_state, m_vram7) /* "sprite3" bitmap */ + AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_MEMBER(taxidriv_state, m_vram4) /* radar bitmap */ + AM_RANGE(0xc800, 0xcfff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram5) /* "sprite1" bitmap */ + AM_RANGE(0xd000, 0xd7ff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram6) /* "sprite2" bitmap */ + AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE_MEMBER(taxidriv_state, m_vram7) /* "sprite3" bitmap */ AM_RANGE(0xe000, 0xf3ff) AM_READONLY - AM_RANGE(0xe000, 0xe3ff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram1) /* car tilemap */ - AM_RANGE(0xe400, 0xebff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram2) /* bg1 tilemap */ - AM_RANGE(0xec00, 0xefff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram0) /* fg tilemap */ - AM_RANGE(0xf000, 0xf3ff) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_vram3) /* bg2 tilemap */ + AM_RANGE(0xe000, 0xe3ff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram1) /* car tilemap */ + AM_RANGE(0xe400, 0xebff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram2) /* bg1 tilemap */ + AM_RANGE(0xec00, 0xefff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram0) /* fg tilemap */ + AM_RANGE(0xf000, 0xf3ff) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_vram3) /* bg2 tilemap */ AM_RANGE(0xf400, 0xf403) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0xf480, 0xf483) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* "sprite1" placement */ AM_RANGE(0xf500, 0xf503) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* "sprite2" placement */ AM_RANGE(0xf580, 0xf583) AM_DEVREADWRITE("ppi8255_4", ppi8255_r, ppi8255_w) /* "sprite3" placement */ //AM_RANGE(0xf780, 0xf781) AM_WRITEONLY /* more scroll registers? */ - AM_RANGE(0xf782, 0xf787) AM_WRITEONLY AM_BASE_MEMBER(taxidrvr_state, m_scroll) /* bg scroll (three copies always identical) */ + AM_RANGE(0xf782, 0xf787) AM_WRITEONLY AM_BASE_MEMBER(taxidriv_state, m_scroll) /* bg scroll (three copies always identical) */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -197,7 +197,7 @@ static ADDRESS_MAP_START( cpu3_port_map, AS_IO, 8 ) ADDRESS_MAP_END -static INPUT_PORTS_START( taxidrvr ) +static INPUT_PORTS_START( taxidriv ) PORT_START("DSW0") PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0d, DEF_STR( 4C_1C ) ) @@ -333,7 +333,7 @@ static const gfx_layout charlayout2 = }; -static GFXDECODE_START( taxidrvr ) +static GFXDECODE_START( taxidriv ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 1 ) @@ -365,7 +365,7 @@ static const ay8910_interface ay8910_interface_2 = -static MACHINE_CONFIG_START( taxidrvr, taxidrvr_state ) +static MACHINE_CONFIG_START( taxidriv, taxidriv_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */ @@ -397,9 +397,9 @@ static MACHINE_CONFIG_START( taxidrvr, taxidrvr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 27*8-1) - MCFG_SCREEN_UPDATE(taxidrvr) + MCFG_SCREEN_UPDATE(taxidriv) - MCFG_GFXDECODE(taxidrvr) + MCFG_GFXDECODE(taxidriv) MCFG_PALETTE_LENGTH(16) /* sound hardware */ @@ -422,39 +422,39 @@ MACHINE_CONFIG_END ***************************************************************************/ -ROM_START( taxidrvr ) +ROM_START( taxidriv ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "1", 0x0000, 0x2000, CRC(6b2424e9) SHA1(a65bb01da8f3b0649d945981cc4f1324b7fac5c7) ) - ROM_LOAD( "2", 0x2000, 0x2000, CRC(15111229) SHA1(0350918f9504b0e470684ebc94a823bb2513a54d) ) - ROM_LOAD( "3", 0x4000, 0x2000, CRC(a7782eee) SHA1(0f10b7876420f4237937b1b922aa410de3f79af1) ) - ROM_LOAD( "4", 0x6000, 0x2000, CRC(8eb0b16b) SHA1(a0015744373ee91bc505f077a04ab3546f8bb6fb) ) + ROM_LOAD( "1.ic87", 0x0000, 0x2000, CRC(6b2424e9) SHA1(a65bb01da8f3b0649d945981cc4f1324b7fac5c7) ) + ROM_LOAD( "2.ic86", 0x2000, 0x2000, CRC(15111229) SHA1(0350918f9504b0e470684ebc94a823bb2513a54d) ) + ROM_LOAD( "3.ic85", 0x4000, 0x2000, CRC(a7782eee) SHA1(0f10b7876420f4237937b1b922aa410de3f79af1) ) + ROM_LOAD( "4.ic84", 0x6000, 0x2000, CRC(8eb0b16b) SHA1(a0015744373ee91bc505f077a04ab3546f8bb6fb) ) ROM_REGION( 0x10000, "sub", 0 ) - ROM_LOAD( "8", 0x0000, 0x2000, CRC(9f9a3865) SHA1(908cf4f2cc68c088649241997276ea25c27d9718) ) - ROM_LOAD( "9", 0x2000, 0x2000, CRC(b28b766c) SHA1(21e08ef1e2671c8540380e3fa0858e8a4d821945) ) + ROM_LOAD( "8.ic4", 0x0000, 0x2000, CRC(9f9a3865) SHA1(908cf4f2cc68c088649241997276ea25c27d9718) ) +// ROM_LOAD( "8.ic4", 0x0000, 0x2000, CRC(9835d517) SHA1(845f3efc54b64837c22dd06683c2950f2b8b03cb) ) // 0x1b5f = 0x04 instead of 0x03 from another set + ROM_LOAD( "9.ic5", 0x2000, 0x2000, CRC(b28b766c) SHA1(21e08ef1e2671c8540380e3fa0858e8a4d821945) ) ROM_REGION( 0x10000, "audiocpu", 0 ) - ROM_LOAD( "7", 0x0000, 0x2000, CRC(2b4cbfe6) SHA1(a2a900831116554d5aea1a81c93245d3bb424d48) ) + ROM_LOAD( "7.ic14", 0x0000, 0x2000, CRC(2b4cbfe6) SHA1(a2a900831116554d5aea1a81c93245d3bb424d48) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "5", 0x0000, 0x2000, CRC(a3aa5f2f) SHA1(7e046e2a5d230c62d93a83f5a773e6e4d6e85961) ) + ROM_LOAD( "5.m.ic68", 0x0000, 0x2000, CRC(a3aa5f2f) SHA1(7e046e2a5d230c62d93a83f5a773e6e4d6e85961) ) ROM_REGION( 0x2000, "gfx2", 0 ) - ROM_LOAD( "6", 0x0000, 0x2000, CRC(bfddd550) SHA1(f528c2701c635bc61eda14fbe2cfe9b44cb75c20) ) + ROM_LOAD( "6.1.ic35", 0x0000, 0x2000, CRC(bfddd550) SHA1(f528c2701c635bc61eda14fbe2cfe9b44cb75c20) ) ROM_REGION( 0x6000, "gfx3", 0 ) - ROM_LOAD( "11", 0x0000, 0x2000, CRC(7485eaea) SHA1(8d69c61145470003cfeb33b11b81345c5e5e6503) ) - ROM_LOAD( "14", 0x2000, 0x2000, CRC(0d99a33e) SHA1(0df29464ea43aecd866ae322f4f7ca9152422023) ) - ROM_LOAD( "15", 0x4000, 0x2000, CRC(410fdf7c) SHA1(0957f335b84c4fbde983271786e7bf199fc22682) ) + ROM_LOAD( "11.30.ic87", 0x0000, 0x2000, CRC(7485eaea) SHA1(8d69c61145470003cfeb33b11b81345c5e5e6503) ) + ROM_LOAD( "14.31.ic110", 0x2000, 0x2000, CRC(0d99a33e) SHA1(0df29464ea43aecd866ae322f4f7ca9152422023) ) + ROM_LOAD( "15.32.ic111", 0x4000, 0x2000, CRC(410fdf7c) SHA1(0957f335b84c4fbde983271786e7bf199fc22682) ) ROM_REGION( 0x2000, "gfx4", 0 ) - ROM_LOAD( "10", 0x0000, 0x2000, CRC(c370b177) SHA1(4b3f73f764ff95cc7777fe01333558201658cead) ) + ROM_LOAD( "10.40.ic99", 0x0000, 0x2000, CRC(c370b177) SHA1(4b3f73f764ff95cc7777fe01333558201658cead) ) ROM_REGION( 0x4000, "gfx5", 0 ) /* not used?? */ - ROM_LOAD( "12", 0x0000, 0x2000, CRC(684b7bb0) SHA1(d83c45ff3adf94c649340227794020482231399f) ) - ROM_LOAD( "13", 0x2000, 0x2000, CRC(d1ef110e) SHA1(e34b6b4b70c783a8cf1296a05d3cec6af5820d0c) ) + ROM_LOAD( "12.21.ic88", 0x0000, 0x2000, CRC(684b7bb0) SHA1(d83c45ff3adf94c649340227794020482231399f) ) + ROM_LOAD( "13.20.ic89", 0x2000, 0x2000, CRC(d1ef110e) SHA1(e34b6b4b70c783a8cf1296a05d3cec6af5820d0c) ) ROM_END - -GAME( 1984, taxidrvr, 0, taxidrvr, taxidrvr, 0, ROT90, "Graphic Techno", "Taxi Driver", GAME_IMPERFECT_GRAPHICS | GAME_NO_COCKTAIL ) +GAME( 1984, taxidriv, 0, taxidriv, taxidriv, 0, ROT90, "[Graphic Techno]", "Taxi Driver", GAME_WRONG_COLORS | GAME_IMPERFECT_GRAPHICS | GAME_NO_COCKTAIL ) diff --git a/src/mame/includes/taxidrvr.h b/src/mame/includes/taxidriv.h similarity index 58% rename from src/mame/includes/taxidrvr.h rename to src/mame/includes/taxidriv.h index 243a1878d76..06c4203c615 100644 --- a/src/mame/includes/taxidrvr.h +++ b/src/mame/includes/taxidriv.h @@ -1,7 +1,7 @@ -class taxidrvr_state : public driver_device +class taxidriv_state : public driver_device { public: - taxidrvr_state(const machine_config &mconfig, device_type type, const char *tag) + taxidriv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } int m_s1; @@ -24,8 +24,8 @@ public: }; -/*----------- defined in video/taxidrvr.c -----------*/ +/*----------- defined in video/taxidriv.c -----------*/ -WRITE8_DEVICE_HANDLER( taxidrvr_spritectrl_w ); +WRITE8_DEVICE_HANDLER( taxidriv_spritectrl_w ); -SCREEN_UPDATE( taxidrvr ); +SCREEN_UPDATE( taxidriv ); diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 089a027b529..a212ff4bb25 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -9909,7 +9909,7 @@ sshooter11 // (c) 1998 P&P Marketing pass // (c) 1992 Oksan news // "Virus"??? ((c) 1993 Poby in ROM VIRUS.4) newsa // "Jeansole / Poby -taxidrvr // [1984 Graphic Techno] +taxidriv // [1984 Graphic Techno] xyonix // [1989 Philko] gt507uk // (c) 1986 Grayhound Electronics gt5 // (c) 1984 Grayhound Electronics diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 2bc7f2b14d2..9be274f3041 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -1830,7 +1830,7 @@ $(MAMEOBJ)/misc.a: \ $(DRIVERS)/superwng.o \ $(DRIVERS)/tapatune.o \ $(DRIVERS)/tattack.o \ - $(DRIVERS)/taxidrvr.o $(VIDEO)/taxidrvr.o \ + $(DRIVERS)/taxidriv.o $(VIDEO)/taxidriv.o \ $(DRIVERS)/tcl.o \ $(DRIVERS)/thayers.o \ $(DRIVERS)/thedeep.o $(VIDEO)/thedeep.o \ diff --git a/src/mame/video/taxidrvr.c b/src/mame/video/taxidriv.c similarity index 92% rename from src/mame/video/taxidrvr.c rename to src/mame/video/taxidriv.c index cbc712c78d3..e0af36cf813 100644 --- a/src/mame/video/taxidrvr.c +++ b/src/mame/video/taxidriv.c @@ -1,18 +1,18 @@ #include "emu.h" -#include "includes/taxidrvr.h" +#include "includes/taxidriv.h" -WRITE8_DEVICE_HANDLER( taxidrvr_spritectrl_w ) +WRITE8_DEVICE_HANDLER( taxidriv_spritectrl_w ) { - taxidrvr_state *state = device->machine().driver_data(); + taxidriv_state *state = device->machine().driver_data(); state->m_spritectrl[offset] = data; } -SCREEN_UPDATE( taxidrvr ) +SCREEN_UPDATE( taxidriv ) { - taxidrvr_state *state = screen->machine().driver_data(); + taxidriv_state *state = screen->machine().driver_data(); int offs; int sx,sy;