diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-02-25 06:28:42 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-02-25 06:28:42 +0000 |
commit | 23889862951a091e00f409157bdf6e5e8e239193 (patch) | |
tree | 11a6c4f998495ddeb87d19ba61330e49d065e6ab /src/mame/drivers/fantland.c | |
parent | 79c1e7b9461b597d52bd62c59fa3834d92666423 (diff) |
Device tag renaming. Moving away from generic names like "main"
to names that capture the device type as well. Added validity
checks for the short-term to prevent the continuance of this
pattern (which I started :)
Changes:
CPU/"main" -> "maincpu"
CPU/"audio" -> "audiocpu"
CPU/"sound" -> "soundcpu"
SCREEN/main -> "screen" (since it's the only one)
Eventually, devices will be required to have unique tags within
a machine, regardless of type.
Diffstat (limited to 'src/mame/drivers/fantland.c')
-rw-r--r-- | src/mame/drivers/fantland.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index 35a19715143..a7cf103ca50 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -823,11 +823,11 @@ static INTERRUPT_GEN( fantland_sound_irq ) static MACHINE_DRIVER_START( fantland ) /* basic machine hardware */ - MDRV_CPU_ADD("main", I8086, 8000000) // ? + MDRV_CPU_ADD("maincpu", I8086, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_map, 0) - MDRV_CPU_VBLANK_INT("main", fantland_irq) + MDRV_CPU_VBLANK_INT("screen", fantland_irq) - MDRV_CPU_ADD("audio", I8088, 8000000) // ? + MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0) MDRV_CPU_IO_MAP(fantland_sound_iomap, 0) MDRV_CPU_PERIODIC_INT(fantland_sound_irq, 8000) @@ -838,7 +838,7 @@ static MACHINE_DRIVER_START( fantland ) MDRV_QUANTUM_TIME(HZ(8000)) // sound irq must feed the DAC at 8kHz /* video hardware */ - MDRV_SCREEN_ADD("main", RASTER) + MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -874,11 +874,11 @@ static const ym2151_interface galaxygn_ym2151_interface = static MACHINE_DRIVER_START( galaxygn ) /* basic machine hardware */ - MDRV_CPU_ADD("main", I8088, 8000000) // ? + MDRV_CPU_ADD("maincpu", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(galaxygn_map, 0) - MDRV_CPU_VBLANK_INT("main", fantland_irq) + MDRV_CPU_VBLANK_INT("screen", fantland_irq) - MDRV_CPU_ADD("audio", I8088, 8000000) // ? + MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0) MDRV_CPU_IO_MAP(galaxygn_sound_iomap, 0) // IRQ by YM2151, NMI when soundlatch is written @@ -886,7 +886,7 @@ static MACHINE_DRIVER_START( galaxygn ) MDRV_MACHINE_RESET(fantland) /* video hardware */ - MDRV_SCREEN_ADD("main", RASTER) + MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -942,17 +942,17 @@ static MACHINE_RESET( borntofi ) static MACHINE_DRIVER_START( borntofi ) /* basic machine hardware */ - MDRV_CPU_ADD("main", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] + MDRV_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] MDRV_CPU_PROGRAM_MAP(borntofi_map, 0) - MDRV_CPU_VBLANK_INT("main", fantland_irq) + MDRV_CPU_VBLANK_INT("screen", fantland_irq) - MDRV_CPU_ADD("audio", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] + MDRV_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] MDRV_CPU_PROGRAM_MAP(borntofi_sound_map, 0) MDRV_MACHINE_RESET(borntofi) /* video hardware */ - MDRV_SCREEN_ADD("main", RASTER) + MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_REFRESH_RATE(54) // 54 Hz MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -987,18 +987,18 @@ static const ym3526_interface wheelrun_ym3526_interface = static MACHINE_DRIVER_START( wheelrun ) /* basic machine hardware */ - MDRV_CPU_ADD("main", V20, XTAL_18MHz/2) // D701080C-8 (V20) + MDRV_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20) MDRV_CPU_PROGRAM_MAP(wheelrun_map, 0) - MDRV_CPU_VBLANK_INT("main", fantland_irq) + MDRV_CPU_VBLANK_INT("screen", fantland_irq) - MDRV_CPU_ADD("audio", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) + MDRV_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) MDRV_CPU_PROGRAM_MAP(wheelrun_sound_map, 0) // IRQ by YM3526, NMI when soundlatch is written MDRV_MACHINE_RESET(fantland) /* video hardware */ - MDRV_SCREEN_ADD("main", RASTER) + MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -1049,17 +1049,17 @@ Fantasy.05, 06, 07 was read as if it was a 27c040 ***************************************************************************/ ROM_START( fantland ) - ROM_REGION( 0x100000, "main", 0 ) // Main CPU + ROM_REGION( 0x100000, "maincpu", 0 ) // Main CPU ROM_LOAD16_BYTE( "fantasyl.ev2", 0x00000, 0x20000, CRC(f5bdca0e) SHA1(d05cf6f68d4d1a3dcc0171f7cf220c4920bd47bb) ) ROM_LOAD16_BYTE( "fantasyl.od2", 0x00001, 0x20000, CRC(9db35023) SHA1(81e2accd67dcf8563a68b2c4e35526f23a40150c) ) - ROM_COPY( "main", 0x00000, 0x40000, 0x40000 ) + ROM_COPY( "maincpu", 0x00000, 0x40000, 0x40000 ) ROM_LOAD16_BYTE( "fantasyl.ev1", 0xe0000, 0x10000, CRC(70e0ee30) SHA1(5253213da56b3f97e2811f2b10927d0e542447f0) ) ROM_LOAD16_BYTE( "fantasyl.od1", 0xe0001, 0x10000, CRC(577b4bd7) SHA1(1f08202d99c3e39e0dd1ed4947b928b695a5b411) ) - ROM_REGION( 0x100000, "audio", 0 ) // Sound CPU + ROM_REGION( 0x100000, "audiocpu", 0 ) // Sound CPU ROM_LOAD( "fantasyl.s2", 0x80000, 0x20000, CRC(f23837d8) SHA1(4048784f759781e50ae445ea61f1ca908e8e6ac1) ) // samples (8 bit unsigned) ROM_LOAD( "fantasyl.s1", 0xc0000, 0x20000, CRC(1a324a69) SHA1(06f6877af6cd19bfaac8a4ea8057ef8faee276f5) ) - ROM_COPY( "audio", 0xc0000, 0xe0000, 0x20000 ) + ROM_COPY( "audiocpu", 0xc0000, 0xe0000, 0x20000 ) ROM_REGION( 0x480000, "gfx1", ROMREGION_DISPOSE ) // Sprites ROMX_LOAD( "fantasyl.m00", 0x000000, 0x80000, CRC(82d819ff) SHA1(2b5b0759de8260eaa84ddded9dc2d12a6e0f5ec9) , ROM_GROUPWORD | ROM_SKIP(1) ) @@ -1078,17 +1078,17 @@ ROM_END /* this dump had several roms half size however they all appear to be data & gfx roms, the main program looks ok */ ROM_START( fantlnda ) - ROM_REGION( 0x100000, "main", 0 ) // Main CPU + ROM_REGION( 0x100000, "maincpu", 0 ) // Main CPU ROM_LOAD16_BYTE( "fantasyl.ev2", 0x00000, 0x20000, CRC(f5bdca0e) SHA1(d05cf6f68d4d1a3dcc0171f7cf220c4920bd47bb) ) // 04.bin (was first half only) ROM_LOAD16_BYTE( "fantasyl.od2", 0x00001, 0x20000, CRC(9db35023) SHA1(81e2accd67dcf8563a68b2c4e35526f23a40150c) ) // 03.bin (was first half only) - ROM_COPY( "main", 0x00000, 0x40000, 0x40000 ) + ROM_COPY( "maincpu", 0x00000, 0x40000, 0x40000 ) ROM_LOAD16_BYTE( "02.bin", 0xe0000, 0x10000, CRC(8b835eed) SHA1(6a6b3fe116145f685b91dcd5301165f17973697c) ) ROM_LOAD16_BYTE( "01.bin", 0xe0001, 0x10000, CRC(4fa3eb8b) SHA1(56da42a4e2972a696ef28811116cbc20bb5ba3e8) ) - ROM_REGION( 0x100000, "audio", 0 ) // Sound CPU + ROM_REGION( 0x100000, "audiocpu", 0 ) // Sound CPU ROM_LOAD( "fantasyl.s2", 0x80000, 0x20000, CRC(f23837d8) SHA1(4048784f759781e50ae445ea61f1ca908e8e6ac1) ) // 05.bin (was first half only) ROM_LOAD( "fantasyl.s1", 0xc0000, 0x20000, CRC(1a324a69) SHA1(06f6877af6cd19bfaac8a4ea8057ef8faee276f5) ) // 06.bin (was first half only) - ROM_COPY( "audio", 0xc0000, 0xe0000, 0x20000 ) + ROM_COPY( "audiocpu", 0xc0000, 0xe0000, 0x20000 ) ROM_REGION( 0x480000, "gfx1", ROMREGION_DISPOSE ) // Sprites ROMX_LOAD( "fantasyl.m00", 0x000000, 0x80000, CRC(82d819ff) SHA1(2b5b0759de8260eaa84ddded9dc2d12a6e0f5ec9) , ROM_GROUPWORD | ROM_SKIP(1) ) @@ -1110,17 +1110,17 @@ ROM_END ***************************************************************************/ ROM_START( galaxygn ) - ROM_REGION( 0x100000, "main", 0 ) // Main CPU + ROM_REGION( 0x100000, "maincpu", 0 ) // Main CPU ROM_LOAD( "gg03.bin", 0x10000, 0x10000, CRC(9e469189) SHA1(07e5d36ca9665bdd13e3bb4241d34b9042371b79) ) ROM_LOAD( "gg02.bin", 0x20000, 0x10000, CRC(b87a438f) SHA1(96c39cc4d51a2fc0779f148971220117967173c0) ) ROM_LOAD( "gg01.bin", 0xf0000, 0x10000, CRC(ad0e5b29) SHA1(f9a7ebce9f47a009af213e4e10811bb1c26f891a) ) - ROM_COPY( "main",0xf0000, 0x70000, 0x10000 ) + ROM_COPY( "maincpu",0xf0000, 0x70000, 0x10000 ) - ROM_REGION( 0x100000, "audio", 0 ) // Sound CPU + ROM_REGION( 0x100000, "audiocpu", 0 ) // Sound CPU ROM_LOAD( "gg20.bin", 0xc0000, 0x10000, CRC(f5c65a85) SHA1(a094fa9531ea4e68ec0a448568e7d4b2307c8185) ) - ROM_COPY( "audio", 0xc0000, 0xd0000, 0x10000 ) - ROM_COPY( "audio", 0xc0000, 0xe0000, 0x10000 ) - ROM_COPY( "audio", 0xc0000, 0xf0000, 0x10000 ) + ROM_COPY( "audiocpu", 0xc0000, 0xd0000, 0x10000 ) + ROM_COPY( "audiocpu", 0xc0000, 0xe0000, 0x10000 ) + ROM_COPY( "audiocpu", 0xc0000, 0xf0000, 0x10000 ) ROM_REGION( 0x1b0000, "gfx1", ROMREGION_DISPOSE ) // Sprites ROMX_LOAD( "gg54.bin", 0x000000, 0x10000, CRC(b3621119) SHA1(66ade772077e57f872ef1c8f45e244f4006023f0) , ROM_SKIP(2) ) @@ -1231,15 +1231,15 @@ Notes: */ ROM_START( borntofi ) - ROM_REGION( 0x100000, "main", 0 ) /* V20 */ + ROM_REGION( 0x100000, "maincpu", 0 ) /* V20 */ ROM_LOAD( "3.bin", 0x10000, 0x10000, CRC(5f07f4a2) SHA1(240864d1d5d9e26d229bc21aa39ee03f4bd25814) ) ROM_LOAD( "2.bin", 0x20000, 0x10000, CRC(5d2b3395) SHA1(ac87f352f380b67802c26232824663063549ac7b) ) ROM_LOAD( "1.bin", 0xf0000, 0x10000, CRC(0a5e2f32) SHA1(5167a85329e5ea35c686af85e44d62227cf5800e) ) - ROM_COPY( "main", 0xf0000, 0x70000, 0x10000 ) + ROM_COPY( "maincpu", 0xf0000, 0x70000, 0x10000 ) - ROM_REGION( 0x100000, "audio", 0 ) /* 8088 */ + ROM_REGION( 0x100000, "audiocpu", 0 ) /* 8088 */ ROM_LOAD( "5.bin", 0xf8000, 0x08000, CRC(b5d587ce) SHA1(07687abd264ec80a6eb473cb3f3ab97ec6b365a2) ) - ROM_COPY( "audio", 0xf8000, 0x08000, 0x08000 ) + ROM_COPY( "audiocpu", 0xf8000, 0x08000, 0x08000 ) ROM_REGION( 0xc0000, "adpcm", 0 ) /* m5205 samples */ ROM_LOAD( "6.bin", 0x00000, 0x10000, CRC(731c523b) SHA1(b649a838ce70d5af607f8b9faf8b012e2ff1104b) ) @@ -1327,12 +1327,12 @@ Hardware info by f205v ***************************************************************************/ ROM_START( wheelrun ) - ROM_REGION( 0x100000, "main", 0 ) // V20 + ROM_REGION( 0x100000, "maincpu", 0 ) // V20 ROM_LOAD( "4.4", 0x30000, 0x10000, CRC(359303df) SHA1(583b70f65b775e99856ffda61334be3b85046ed1) ) ROM_LOAD( "3.3", 0x70000, 0x10000, CRC(c28d0b31) SHA1(add8c4ffe529755c101b72a3b0530e796948876b) ) - ROM_COPY( "main", 0x70000, 0xf0000, 0x10000 ) + ROM_COPY( "maincpu", 0x70000, 0xf0000, 0x10000 ) - ROM_REGION( 0x100000, "audio", 0 ) // Z80 + ROM_REGION( 0x100000, "audiocpu", 0 ) // Z80 ROM_LOAD( "1.1", 0x00000, 0x10000, CRC(67b5f31f) SHA1(5553b132077686221fb7a21a0246fd55cb443332) ) // 1xxxxxxxxxxxxxxx = 0xFF ROM_REGION( 0xc0000, "gfx1",0 ) // gfx |