Source Cleanup: Setname fixes and other minor changes - Drivers starting with D (part 2) + E.

src/mame/audio/dkong.c

@@ -1140,9 +1140,9 @@ Addresses found at @0x510, cpu2
         { 0x0000, 0x007a, 0x018b, 0x0320, 0x036c, 0x03c4, 0x041c, 0x0520, 0x063e }
     and related samples interface
 
-    static const char *const radarsc1_sample_names[] =
+    static const char *const radarscp1_sample_names[] =
     {
-        "*radarsc1",
+        "*radarscp1",
         "10.wav",
         "12.wav",
         "14.wav",
@@ -1155,10 +1155,10 @@ Addresses found at @0x510, cpu2
         0
     };
 
-    static const samples_interface radarsc1_samples_interface =
+    static const samples_interface radarscp1_samples_interface =
     {
         8,
-        radarsc1_sample_names
+        radarscp1_sample_names
     };
 
 */
@@ -1259,7 +1259,7 @@ static ADDRESS_MAP_START( dkongjr_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4)
 ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( radarsc1_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( radarscp1_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_DEVREAD("ls175.3d", latch8_r)
 	AM_RANGE(0x00, 0xff) AM_DEVWRITE("discrete", dkong_p1_w) /* DAC here */
 	AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_LATCH8_READ("virtual_p1")
@@ -1320,8 +1320,8 @@ MACHINE_DRIVER_START( dkong2b_audio )
 	MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
 
 	/*   If P2.Bit7 -> is apparently an external signal decay or other output control
-     *   If P2.Bit6 -> activates the external compressed sample ROM (not radarsc1)
+     *   If P2.Bit6 -> activates the external compressed sample ROM (not radarscp1)
-     *   If P2.Bit5 -> Signal ANSN ==> Grid enable (radarsc1)
+     *   If P2.Bit5 -> Signal ANSN ==> Grid enable (radarscp1)
      *   If P2.Bit4 -> status code to main cpu
      *   P2.Bit2-0  -> select the 256 byte bank for external ROM
      */
@@ -1352,11 +1352,11 @@ MACHINE_DRIVER_START( radarscp_audio )
 MACHINE_DRIVER_END
 
 
-MACHINE_DRIVER_START( radarsc1_audio )
+MACHINE_DRIVER_START( radarscp1_audio )
 
 	MDRV_IMPORT_FROM( radarscp_audio )
 	MDRV_CPU_MODIFY("soundcpu")
-	MDRV_CPU_IO_MAP(radarsc1_sound_io_map)
+	MDRV_CPU_IO_MAP(radarscp1_sound_io_map)
 
 	/* virtual_p2 is not read -see memory map-, all bits are output bits */
 	MDRV_LATCH8_ADD( "virtual_p1" )	/* virtual latch for port A */

src/mame/drivers/dkong.c

@@ -37,7 +37,7 @@ Done:
   Couriersud: 11/2007
 
     - Added configuration switch to change palette between TKG02 (radarscp conversion) and TKG04 (dkong 2board)
-    - Added speech support (samples) to radarsc1
+    - Added speech support (samples) to radarscp1
     - Hooked up and written 8257 dma controller
         All dkong and dkongjr based games now use the 8257
         All epos and 2650 based games now use the 8257
@@ -448,7 +448,7 @@ static MACHINE_START( radarscp )
     state->hardware_type = HARDWARE_TRS02;
 }
 
-static MACHINE_START( radarsc1 )
+static MACHINE_START( radarscp1 )
 {
     dkong_state *state = (dkong_state *)machine->driver_data;
 
@@ -1615,16 +1615,16 @@ static MACHINE_DRIVER_START( radarscp )
 
 MACHINE_DRIVER_END
 
-static MACHINE_DRIVER_START( radarsc1 )
+static MACHINE_DRIVER_START( radarscp1 )
 
     MDRV_IMPORT_FROM(dkong_base)
 
-    MDRV_MACHINE_START(radarsc1)
+    MDRV_MACHINE_START(radarscp1)
     MDRV_PALETTE_LENGTH(RS_PALETTE_LENGTH)
-    MDRV_PALETTE_INIT(radarsc1)
+    MDRV_PALETTE_INIT(radarscp1)
 
     /* sound hardware */
-    MDRV_IMPORT_FROM(radarsc1_audio)
+    MDRV_IMPORT_FROM(radarscp1_audio)
 
 MACHINE_DRIVER_END
 
@@ -2948,7 +2948,7 @@ static DRIVER_INIT( strtheat )
  *************************************/
 
 GAME( 1980, radarscp, 0,        radarscp, radarscp,       0, ROT90, "Nintendo", "Radar Scope", GAME_SUPPORTS_SAVE )
-GAME( 1980, radarscp1,radarscp, radarsc1, radarscp,       0, ROT90, "Nintendo", "Radar Scope (TRS01)", GAME_SUPPORTS_SAVE )
+GAME( 1980, radarscp1,radarscp, radarscp1,radarscp,       0, ROT90, "Nintendo", "Radar Scope (TRS01)", GAME_SUPPORTS_SAVE )
 
 GAME( 1981, dkong,    0,        dkong2b,  dkong,          0,  ROT90, "Nintendo of America", "Donkey Kong (US set 1)", GAME_SUPPORTS_SAVE )
 GAME( 1981, dkongo,   dkong,    dkong2b,  dkong,          0,  ROT90, "Nintendo", "Donkey Kong (US set 2)", GAME_SUPPORTS_SAVE )

src/mame/drivers/docastle.c

@@ -118,7 +118,7 @@ TODO:
   dip switch reading will fail if the main CPU is running at the nominally correct
   4MHz speed. This is kludge by slighly lowering the speed to 3.98MHz.
 - the dorunrun attract mode sequence is also very timing sensitive. The behaviour
-  of the "dorunru2" set, verified on the real board, with all dips in the OFF
+  of the "dorunrun2" set, verified on the real board, with all dips in the OFF
   position (easiest difficulty setting), should be, for the first 12 rounds of
   demo play:
   1) Mr do moves right. Kills all monsters and a letter 'E'.
@@ -137,7 +137,7 @@ TODO:
   Small changes to the CPU speed alter the demo timing and can cause the above
   sequence not to work (e.g. Mr Do might not fill all monsters at once on the
   first round). The 3.98MHz speed makes the sequence work.
-  Note that this only works in the dorunru2 set. The dorunrun set works slightly
+  Note that this only works in the dorunrun2 set. The dorunrun set works slightly
   differently, however it hasn't been compared with the real board so it might be
   right.
 - unknown ports 0 and 2
@@ -609,7 +609,7 @@ static MACHINE_DRIVER_START( docastle )
 
 	/* basic machine hardware */
 //  MDRV_CPU_ADD("maincpu", Z80, 4000000)  // 4 MHz
-	MDRV_CPU_ADD("maincpu", Z80, 3980000)	// make dip switches work in docastle and dorunrun and fix dorunru2 attract sequence
+	MDRV_CPU_ADD("maincpu", Z80, 3980000)	// make dip switches work in docastle and dorunrun and fix dorunrun2 attract sequence
 	MDRV_CPU_PROGRAM_MAP(docastle_map)
 	MDRV_CPU_IO_MAP(docastle_io_map)
 	MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)

src/mame/drivers/esripsys.c

@@ -896,7 +896,7 @@ ROM_START( turbosub )
 	ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) )
 ROM_END
 
-ROM_START( turbosb7 )
+ROM_START( turbosub7 )
 	ROM_REGION( 0xc0000, "main_code", 0) /* Non-bankswitched, 6809 #0 code */
 	ROM_LOAD( "mem6u85.bin",    0x18000, 0x4000, CRC(30016c8b) SHA1(0cd2dd7052de0eaa451ff8b0b2224180764c26de) )
 
@@ -1006,7 +1006,7 @@ ROM_START( turbosb7 )
 	ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) )
 ROM_END
 
-ROM_START( turbosb6 )
+ROM_START( turbosub6 )
 	ROM_REGION( 0xc0000, "main_code", 0) /* Non-bankswitched, 6809 #0 code */
 	ROM_LOAD( "u85",    0x18000, 0x4000, CRC(d37ccb06) SHA1(445df1caa4dd4901e474bb0903bf28e536edf493) )
 
@@ -1129,6 +1129,6 @@ ROM_END
  *
  *************************************/
 
-GAME( 1985, turbosub, 0,        esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSCA)", GAME_SUPPORTS_SAVE )
+GAME( 1985, turbosub,  0,        esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSCA)", GAME_SUPPORTS_SAVE )
-GAME( 1985, turbosb7, turbosub, esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC7)", GAME_SUPPORTS_SAVE )
+GAME( 1985, turbosub7, turbosub, esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC7)", GAME_SUPPORTS_SAVE )
-GAME( 1985, turbosb6, turbosub, esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC6)", GAME_SUPPORTS_SAVE )
+GAME( 1985, turbosub6, turbosub, esripsys, turbosub, esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC6)", GAME_SUPPORTS_SAVE )

src/mame/drivers/exidy.c

@@ -1482,7 +1482,7 @@ GAME( 1980, spectar1, spectar, spectar,  spectar,  spectar,  ROT0, "Exidy", "Spe
 GAME( 1980, rallys,   spectar, rallys,   rallys,   rallys,   ROT0, "Novar", "Rallys (bootleg of Spectar)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
 GAME( 1980, panzer,   spectar, rallys,   rallys,   rallys,   ROT0, "Proel", "Panzer (bootleg of Spectar)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
 GAME( 1980, phantoma, spectar, rallys,   phantoma, phantoma, ROT0, "Jeutel","Phantomas (bootleg of Spectar)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
-GAME( 1980, phantom,  spectar, rallys,   phantoma, phantoma, ROT0, "Proel","Phantom (bootleg of Spectar)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
+GAME( 1980, phantom,  spectar, rallys,   phantoma, phantoma, ROT0, "Proel", "Phantom (bootleg of Spectar)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
 
 GAME( 1981, mtrap,    0,       mtrap,    mtrap,    mtrap,    ROT0, "Exidy", "Mouse Trap (version 5)", GAME_SUPPORTS_SAVE )
 GAME( 1981, mtrap3,   mtrap,   mtrap,    mtrap,    mtrap,    ROT0, "Exidy", "Mouse Trap (version 3)", GAME_SUPPORTS_SAVE )

src/mame/drivers/exprraid.c

@@ -168,7 +168,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
     (reads from 0x2801 occur almost all the time).
     So IMO this set looks like a World bootleg .
 
-4) 'wexpresb'
+4) 'wexpressb'
 
   - "@ 1986 DATA EAST CORPORATION" + extra code to display the Warning screen (Japan)
   - Modified Warning screen
@@ -184,7 +184,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
       * 0xe826 : COIN1 - 0xe82e : COIN2 (Mode 1)
       * 0xe836 : COIN1 - 0xe83e : COIN2 (Mode 2)
 
-5) 'wexpresc'
+5) 'wexpressb2'
 
   - "@ 1986 DATA EAST CORPORATION" + extra code to display the Warning screen (Japan)
   - Original Warning screen
@@ -193,12 +193,12 @@ Stephh's notes (based on the games M6502 code and some tests) :
     that there shall exist a "better" Japan undumped version)
     so all comments also fit for this set. The main difference is
     the way protection is bypassed (in a different way than 'wexpress'
-    but also in a different way than 'wexpresb' as reads from 0x2801
+    but also in a different way than 'wexpressb' as reads from 0x2801
     occur when you lose a life but also on "shoot" stages).
-    The other difference is that you can NOT continue a game as in 'wexpresb'.
+    The other difference is that you can NOT continue a game as in 'wexpressb'.
-  - "Bonus lives" routine starts at 0xe4e5 (same as 'wexpresb')
+  - "Bonus lives" routine starts at 0xe4e5 (same as 'wexpressb')
-  - Coinage related stuff starts at 0xe7d8 (same as 'wexpresb').
+  - Coinage related stuff starts at 0xe7d8 (same as 'wexpressb').
-  - Coinage tables (same as 'wexpresb') :
+  - Coinage tables (same as 'wexpressb') :
       * 0xe826 : COIN1 - 0xe82e : COIN2 (Mode 1)
       * 0xe836 : COIN1 - 0xe83e : COIN2 (Mode 2)
 
@@ -781,21 +781,21 @@ static DRIVER_INIT( exprraid )
 	exprraid_gfx_expand(machine);
 }
 
-static DRIVER_INIT( wexpresb )
+static DRIVER_INIT( wexpressb )
 {
 	memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x3800, 0x3800, 0, 0, vblank_r);
 	exprraid_gfx_expand(machine);
 }
 
-static DRIVER_INIT( wexpresc )
+static DRIVER_INIT( wexpressb2 )
 {
 	memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xFFC0, 0xFFC0, 0, 0, vblank_r);
 	exprraid_gfx_expand(machine);
 }
 
 
-GAME( 1986, exprraid,  0,        exprraid, exprraid, exprraid, ROT0, "Data East USA", "Express Raider (US set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1986, exprraid,  0,        exprraid, exprraid, exprraid,  ROT0, "Data East USA", "Express Raider (US set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1986, exprraida, exprraid, exprraid, exprraid, exprraid, ROT0, "Data East USA", "Express Raider (US set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1986, exprraida, exprraid, exprraid, exprraid, exprraid,  ROT0, "Data East USA", "Express Raider (US set 2)", GAME_SUPPORTS_SAVE )
-GAME( 1986, wexpress,  exprraid, exprraid, exprraid, wexpress, ROT0, "Data East Corporation", "Western Express (World?)", GAME_SUPPORTS_SAVE )
+GAME( 1986, wexpress,  exprraid, exprraid, exprraid, wexpress,  ROT0, "Data East Corporation", "Western Express (World?)", GAME_SUPPORTS_SAVE )
-GAME( 1986, wexpressb, exprraid, exprboot, exprboot, wexpresb, ROT0, "bootleg", "Western Express (bootleg set 1)", GAME_SUPPORTS_SAVE )
+GAME( 1986, wexpressb, exprraid, exprboot, exprboot, wexpressb, ROT0, "bootleg", "Western Express (bootleg set 1)", GAME_SUPPORTS_SAVE )
-GAME( 1986, wexpressb2,exprraid, exprboot, exprboot, wexpresc, ROT0, "bootleg", "Western Express (bootleg set 2)", GAME_SUPPORTS_SAVE )
+GAME( 1986, wexpressb2,exprraid, exprboot, exprboot, wexpressb2,ROT0, "bootleg", "Western Express (bootleg set 2)", GAME_SUPPORTS_SAVE )

src/mame/includes/dkong.h

@@ -195,7 +195,7 @@ WRITE8_HANDLER( dkong_videoram_w );
 
 PALETTE_INIT( dkong2b );
 PALETTE_INIT( radarscp );
-PALETTE_INIT( radarsc1 );
+PALETTE_INIT( radarscp1 );
 PALETTE_INIT( dkong3 );
 
 VIDEO_START( dkong );
@@ -211,5 +211,5 @@ MACHINE_DRIVER_EXTERN( radarscp_audio );
 MACHINE_DRIVER_EXTERN( dkong2b_audio );
 MACHINE_DRIVER_EXTERN( dkongjr_audio );
 MACHINE_DRIVER_EXTERN( dkong3_audio );
-MACHINE_DRIVER_EXTERN( radarsc1_audio );
+MACHINE_DRIVER_EXTERN( radarscp1_audio );
 

src/mame/mamedriv.c

@@ -8992,8 +8992,8 @@ Other Sun games
 	DRIVER( laserbasa )	/* (c) 1981 Amstar/HOEI */
 	DRIVER( futflash )	/* (c) 1981 HOEI (Arcade TV Game List - P.96, Right, 18 from top) */
 	DRIVER( turbosub )	/* (c) 1985 Entertainment Sciences */
-	DRIVER( turbosb7 )	/* (c) 1985 Entertainment Sciences */
+	DRIVER( turbosub7 )	/* (c) 1985 Entertainment Sciences */
-	DRIVER( turbosb6 )	/* (c) 1985 Entertainment Sciences */
+	DRIVER( turbosub6 )	/* (c) 1985 Entertainment Sciences */
 	DRIVER( pipeline )	/* (c) 1990 Daehyun Electronics */
 	DRIVER( ttchamp )
 	DRIVER( ttchampa )

src/mame/video/dkong.c

@@ -140,14 +140,14 @@ static const res_net_info radarscp_net_bck_info =
 };
 
 /*
-    radarsc1 interface
+    radarscp1 interface
 
     All outputs are open-collector. They are followed by inverters which
     drive the resistor network. All outputs are routed through a complimentary
     darlington.
 */
 
-static const res_net_info radarsc1_net_info =
+static const res_net_info radarscp1_net_info =
 {
 	RES_NET_VCC_5V | RES_NET_VBIAS_5V | RES_NET_VIN_TTL_OUT | RES_NET_MONITOR_SANYO_EZV20,
 	{
@@ -332,7 +332,7 @@ PALETTE_INIT( radarscp )
 	state->color_codes = color_prom;	/* we'll need it later */
 }
 
-PALETTE_INIT( radarsc1 )
+PALETTE_INIT( radarscp1 )
 {
 	dkong_state *state = (dkong_state *)machine->driver_data;
 	int i;
@@ -342,11 +342,11 @@ PALETTE_INIT( radarsc1 )
 	{
 
 		/* red component */
-		r = compute_res_net( color_prom[512], 0, &radarsc1_net_info );
+		r = compute_res_net( color_prom[512], 0, &radarscp1_net_info );
 		/* green component */
-		g = compute_res_net( color_prom[256], 1, &radarsc1_net_info );
+		g = compute_res_net( color_prom[256], 1, &radarscp1_net_info );
 		/* blue component */
-		b = compute_res_net( color_prom[0], 2, &radarsc1_net_info );
+		b = compute_res_net( color_prom[0], 2, &radarscp1_net_info );
 
 		palette_set_color_rgb(machine,i,r,g,b);
 		color_prom++;
@@ -357,9 +357,9 @@ PALETTE_INIT( radarsc1 )
 	for (i=0;i<256;i++)
 		if ( (i & 0x03) == 0x00 )  /*  NOR => CS=1 => Tristate => real black */
 		{
-			r = compute_res_net( 0, 0, &radarsc1_net_info );
+			r = compute_res_net( 0, 0, &radarscp1_net_info );
-			g = compute_res_net( 0, 1, &radarsc1_net_info );
+			g = compute_res_net( 0, 1, &radarscp1_net_info );
-			b = compute_res_net( 0, 2, &radarsc1_net_info );
+			b = compute_res_net( 0, 2, &radarscp1_net_info );
 			palette_set_color_rgb(machine,i,r,g,b);
 		}
 
@@ -456,7 +456,7 @@ static TILE_GET_INFO( dkong_bg_tile_info )
 	SET_TILE_INFO(0, code, color, 0);
 }
 
-static TILE_GET_INFO( radarsc1_bg_tile_info )
+static TILE_GET_INFO( radarscp1_bg_tile_info )
 {
 	dkong_state *state = (dkong_state *)machine->driver_data;
 	int code = state->video_ram[tile_index] + 256 * state->gfx_bank;
@@ -960,7 +960,7 @@ VIDEO_START( dkong )
 			tilemap_set_scrolldx(state->bg_tilemap, 0, 128);
 			break;
 		case HARDWARE_TRS01:
-			state->bg_tilemap = tilemap_create(machine, radarsc1_bg_tile_info, tilemap_scan_rows,  8, 8, 32, 32);
+			state->bg_tilemap = tilemap_create(machine, radarscp1_bg_tile_info, tilemap_scan_rows,  8, 8, 32, 32);
 			tilemap_set_scrolldx(state->bg_tilemap, 0, 128);
 
 			state->bg_bits = video_screen_auto_bitmap_alloc(machine->primary_screen);