From f0fa05178b291085dab9862cf0f4bcb838098c93 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 26 Aug 2010 16:31:58 +0000 Subject: [PATCH] Fix the bad trend I started long ago in naming the MIPS CPU configuration structs 'config', as this now conflicts with a local variable name in the machine config constructor, causing problems with some games. --- src/mame/drivers/aleck64.c | 4 ++-- src/mame/drivers/cojag.c | 4 ++-- src/mame/drivers/hng64.c | 4 ++-- src/mame/drivers/kinst.c | 4 ++-- src/mame/drivers/magictg.c | 4 ++-- src/mame/drivers/namcops2.c | 4 ++-- src/mame/drivers/namcos23.c | 8 ++++---- src/mame/drivers/policetr.c | 4 ++-- src/mame/drivers/seattle.c | 12 ++++++------ src/mame/drivers/speglsht.c | 4 ++-- src/mame/drivers/srmp5.c | 4 ++-- src/mame/drivers/turrett.c | 4 ++-- src/mame/drivers/vegas.c | 8 ++++---- src/mame/drivers/vp101.c | 4 ++-- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index e855580e495..2fb0d32f423 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -555,7 +555,7 @@ static INPUT_PORTS_START( starsldr ) INPUT_PORTS_END /* ?? */ -static const mips3_config config = +static const mips3_config vr4300_config = { 16384, /* code cache size */ 8192, /* data cache size */ @@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( aleck64 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", VR4300BE, 93750000) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(vr4300_config) MDRV_CPU_PROGRAM_MAP(n64_map) MDRV_CPU_VBLANK_INT("screen", n64_vblank) diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 09b1d937c0d..861c67ac11a 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -1082,7 +1082,7 @@ INPUT_PORTS_END * *************************************/ -static const r3000_cpu_core config = +static const r3000_cpu_core r3000_config = { 0, /* 1 if we have an FPU, 0 otherwise */ 4096, /* code cache size */ @@ -1106,7 +1106,7 @@ static MACHINE_DRIVER_START( cojagr3k ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R3041BE, R3000_CLOCK) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r3000_config) MDRV_CPU_PROGRAM_MAP(r3000_map) MDRV_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK/2) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 465d8eeb14a..b1a2a2e258a 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1608,7 +1608,7 @@ static DRIVER_INIT(hng64_shoot) /* ?? */ -static const mips3_config config = +static const mips3_config vr4300_config = { 16384, /* code cache size */ 16384 /* data cache size */ @@ -1695,7 +1695,7 @@ static MACHINE_RESET(hyperneo) static MACHINE_DRIVER_START( hng64 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", VR4300BE, MASTER_CLOCK) // actually R4300 - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(vr4300_config) MDRV_CPU_PROGRAM_MAP(hng_map) MDRV_CPU_VBLANK_INT_HACK(irq_start,4) diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 59b3b8ecbc2..4a1802f6b3a 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -629,7 +629,7 @@ INPUT_PORTS_END * *************************************/ -static const mips3_config config = +static const mips3_config r4600_config = { 16384, /* code cache size */ 16384 /* data cache size */ @@ -640,7 +640,7 @@ static MACHINE_DRIVER_START( kinst ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r4600_config) MDRV_CPU_PROGRAM_MAP(main_map) MDRV_CPU_VBLANK_INT("screen", irq0_start) diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index c4a19ab9ecc..13535d8cf03 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -125,7 +125,7 @@ static VIDEO_UPDATE(magictg) } /* ?? */ -static const mips3_config config = +static const mips3_config r4600_config = { 16384, /* code cache size */ 16384 /* data cache size */ @@ -142,7 +142,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( magictg ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4600BE, 10000000) // ?? what cpu? - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r4600_config) MDRV_CPU_PROGRAM_MAP(magictg_map) MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c index 299db42dea9..389fe5f4792 100644 --- a/src/mame/drivers/namcops2.c +++ b/src/mame/drivers/namcops2.c @@ -41,7 +41,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( system246 ) INPUT_PORTS_END -static const mips3_config config = +static const mips3_config r5000_config = { 16384, /* code cache size - probably wrong */ 16384 /* data cache size */ @@ -50,7 +50,7 @@ static const mips3_config config = static MACHINE_DRIVER_START( system246 ) MDRV_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz MDRV_CPU_PROGRAM_MAP(ps2_map) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 60051ad2bed..06a438a4e51 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2865,7 +2865,7 @@ static GFXDECODE_START( namcos23 ) GFXDECODE_ENTRY( NULL, 0, namcos23_cg_layout, 0x7f00, 0x80 ) GFXDECODE_END -static const mips3_config config = +static const mips3_config r4650_config = { 8192, /* code cache size - VERIFIED */ 8192 /* data cache size - VERIFIED */ @@ -2875,7 +2875,7 @@ static MACHINE_DRIVER_START( gorgon ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r4650_config) MDRV_CPU_PROGRAM_MAP(gorgon_map) MDRV_CPU_VBLANK_INT("screen", s23_interrupt) @@ -2921,7 +2921,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( s23 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r4650_config) MDRV_CPU_PROGRAM_MAP(ss23_map) MDRV_CPU_VBLANK_INT("screen", s23_interrupt) @@ -2967,7 +2967,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ss23 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*5) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r4650_config) MDRV_CPU_PROGRAM_MAP(ss23_map) MDRV_CPU_VBLANK_INT("screen", s23_interrupt) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index c63e8082b03..1017cf77c7b 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -417,7 +417,7 @@ INPUT_PORTS_END * *************************************/ -static const r3000_cpu_core config = +static const r3000_cpu_core r3000_config = { 0, /* 1 if we have an FPU, 0 otherwise */ 4096, /* code cache size */ @@ -429,7 +429,7 @@ static MACHINE_DRIVER_START( policetr ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R3000BE, MASTER_CLOCK/2) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r3000_config) MDRV_CPU_PROGRAM_MAP(policetr_map) MDRV_CPU_VBLANK_INT("screen", irq4_gen) diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index c725792ecf1..b1aa6bcaf4b 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -2450,7 +2450,7 @@ INPUT_PORTS_END * *************************************/ -static const mips3_config config = +static const mips3_config r5000_config = { 16384, /* code cache size */ 16384, /* data cache size */ @@ -2461,7 +2461,7 @@ static MACHINE_DRIVER_START( seattle_common ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(seattle_map) MDRV_MACHINE_START(seattle) @@ -2495,7 +2495,7 @@ static MACHINE_DRIVER_START( phoenixsa ) MDRV_IMPORT_FROM(dcs2_audio_2115) MDRV_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(seattle_map) MACHINE_DRIVER_END @@ -2505,7 +2505,7 @@ static MACHINE_DRIVER_START( seattle150 ) MDRV_IMPORT_FROM(dcs2_audio_2115) MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(seattle_map) MACHINE_DRIVER_END @@ -2521,7 +2521,7 @@ static MACHINE_DRIVER_START( seattle200 ) MDRV_IMPORT_FROM(dcs2_audio_2115) MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(seattle_map) MACHINE_DRIVER_END @@ -2537,7 +2537,7 @@ static MACHINE_DRIVER_START( flagstaff ) MDRV_IMPORT_FROM(cage_seattle) MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(seattle_map) MDRV_SMC91C94_ADD("ethernet", ethernet_interrupt) diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 190b1499d1b..c3bca69229a 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -307,7 +307,7 @@ static const st0016_interface st0016_config = &st0016_charram }; -static const r3000_cpu_core config = +static const r3000_cpu_core r3000_config = { 0, 4096, /* code cache size */ @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( speglsht ) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) MDRV_CPU_ADD("sub", R3000LE, 25000000) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r3000_config) MDRV_CPU_PROGRAM_MAP(speglsht_mem) MDRV_CPU_VBLANK_INT("screen", irq4_line_assert) diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 8638eb71781..067a2e7c5f2 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -521,7 +521,7 @@ static const st0016_interface st0016_config = &st0016_charram }; -static const r3000_cpu_core config = +static const r3000_cpu_core r3000_config = { 1, /* 1 if we have an FPU, 0 otherwise */ 4096, /* code cache size */ @@ -568,7 +568,7 @@ static MACHINE_DRIVER_START( srmp5 ) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) MDRV_CPU_ADD("sub", R3000LE, 25000000) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r3000_config) MDRV_CPU_PROGRAM_MAP(srmp5_mem) MDRV_CPU_VBLANK_INT("screen", irq4_line_assert) diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c index 50ed3dbb8ef..d10c99b2206 100644 --- a/src/mame/drivers/turrett.c +++ b/src/mame/drivers/turrett.c @@ -95,7 +95,7 @@ static INPUT_PORTS_START( turrett ) INPUT_PORTS_END -static const r3000_cpu_core config = +static const r3000_cpu_core r3000_config = { 0, /* 1 if we have an FPU, 0 otherwise */ 2048, /* code cache size */ @@ -107,7 +107,7 @@ static MACHINE_DRIVER_START( turrett ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R3041BE, R3041_CLOCK) MDRV_CPU_PROGRAM_MAP(cpu_map) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r3000_config) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index 092aa138dc5..028e276ae9f 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -2213,7 +2213,7 @@ INPUT_PORTS_END * *************************************/ -static const mips3_config config = +static const mips3_config r5000_config = { 16384, /* code cache size */ 16384, /* data cache size */ @@ -2224,7 +2224,7 @@ static MACHINE_DRIVER_START( vegascore ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*2) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(vegas_map_8mb) MDRV_MACHINE_START(vegas) @@ -2294,7 +2294,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vegasv3 ) MDRV_IMPORT_FROM(vegas32m) MDRV_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(vegas_map_8mb) MDRV_DEVICE_REMOVE("voodoo") @@ -2309,7 +2309,7 @@ static MACHINE_DRIVER_START( denver ) MDRV_IMPORT_FROM(dcs2_audio_denver) MDRV_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5) - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(vegas_map_32mb) MDRV_DEVICE_REMOVE("voodoo") diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c index e2045b44083..8a1035a46ed 100644 --- a/src/mame/drivers/vp101.c +++ b/src/mame/drivers/vp101.c @@ -48,7 +48,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( vp101 ) INPUT_PORTS_END -static const mips3_config config = +static const mips3_config r5000_config = { 32768, /* code cache size */ 32768, /* data cache size */ @@ -57,7 +57,7 @@ static const mips3_config config = static MACHINE_DRIVER_START( vp101 ) MDRV_CPU_ADD("maincpu", R5000LE, 300000000) /* actually VR5500 with added NEC VR-series custom instructions */ - MDRV_CPU_CONFIG(config) + MDRV_CPU_CONFIG(r5000_config) MDRV_CPU_PROGRAM_MAP(main_map) MDRV_SCREEN_ADD("screen", RASTER)