summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/drivers/coinmstr.c18
-rw-r--r--src/mame/drivers/eolith.c44
-rw-r--r--src/mame/drivers/gei.c138
-rw-r--r--src/mame/drivers/magic10.c26
-rw-r--r--src/mame/drivers/mcr.c57
-rw-r--r--src/mame/drivers/pingpong.c34
-rw-r--r--src/mame/drivers/pzletime.c4
-rw-r--r--src/mame/drivers/stlforce.c10
-rw-r--r--src/mame/drivers/tgtpanic.c4
-rw-r--r--src/mame/drivers/vegaeo.c6
10 files changed, 197 insertions, 144 deletions
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 98da44f036c..f644f979e07 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -981,7 +981,7 @@ static const mc6845_interface h46505_intf =
static MACHINE_DRIVER_START( coinmstr )
- MDRV_CPU_ADD("cpu",Z80,8000000) // ?
+ MDRV_CPU_ADD("maincpu",Z80,8000000) // ?
MDRV_CPU_PROGRAM_MAP(coinmstr_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
@@ -1015,25 +1015,25 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( quizmstr )
MDRV_IMPORT_FROM(coinmstr)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(quizmstr_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( trailblz )
MDRV_IMPORT_FROM(coinmstr)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(trailblz_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( supnudg2 )
MDRV_IMPORT_FROM(coinmstr)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(supnudg2_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pokeroul )
MDRV_IMPORT_FROM(coinmstr)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(pokeroul_io_map)
MACHINE_DRIVER_END
@@ -1080,7 +1080,7 @@ CN1/2 is connector for top ROM board * - unpopulated socket
*/
ROM_START( quizmstr )
- ROM_REGION( 0x10000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "nm_qm4_11.ic9", 0x0000, 0x4000, CRC(3a233bf0) SHA1(7b91b6f19093e67dd5513a000138421d4ef6f0af) )
ROM_LOAD( "np_qm4_21.ic6", 0x4000, 0x4000, CRC(a1cd39e4) SHA1(420b0726577471c762ae470bc2138c035f295ad9) )
/* 0x8000 - 0xbfff empty */
@@ -1114,7 +1114,7 @@ ROM_END
ROM_START( trailblz )
- ROM_REGION( 0x10000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "1-4.09", 0x0000, 0x4000, CRC(7c34749c) SHA1(3847188a734b32979f376f51f74dff050b610dfb) )
ROM_LOAD( "2-4.06", 0x4000, 0x4000, CRC(81a9809b) SHA1(4d2bfd5223713a9e2e15130a3176118d400ee63e) )
/* 0x8000 - 0xbfff empty */
@@ -1129,7 +1129,7 @@ ROM_END
ROM_START( supnudg2 )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "u3.bin", 0x0000, 0x8000, CRC(ed04e2cc) SHA1(7d90a588cca2d113487710e897771f9d99e37e62) )
ROM_LOAD( "u4.bin", 0x8000, 0x8000, CRC(0551e859) SHA1(b71640097cc75b78f3013f0e77de328bf1a205b1) )
@@ -1182,7 +1182,7 @@ ROM_END
*/
ROM_START( pokeroul )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "poker1.ic3", 0x0000, 0x8000, CRC(bfe78d09) SHA1(7cc0f57714ff808a41ce20027a283e5dff60f752) )
ROM_LOAD( "poker2.ic4", 0x8000, 0x8000, CRC(34c1b55c) SHA1(fa562d230a57dce3fff176c21c86b461a02749f6) )
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index c419fa567dd..f557cafe20b 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -135,7 +135,7 @@ static ADDRESS_MAP_START( eolith_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfca00000, 0xfca00003) AM_READ_PORT("DSW1")
AM_RANGE(0xfcc00000, 0xfcc0005b) AM_WRITENOP // crt registers ?
AM_RANGE(0xfd000000, 0xfeffffff) AM_ROM AM_REGION("user1", 0)
- AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("cpu", 0)
+ AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END
@@ -324,7 +324,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( eolith45 )
- MDRV_CPU_ADD("cpu", E132N, 45000000) /* 45 MHz */
+ MDRV_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */
MDRV_CPU_PROGRAM_MAP(eolith_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
@@ -351,12 +351,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( eolith50 )
MDRV_IMPORT_FROM(eolith45)
- MDRV_CPU_REPLACE("cpu", E132N, 50000000) /* 50 MHz */
+ MDRV_CPU_REPLACE("maincpu", E132N, 50000000) /* 50 MHz */
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ironfort )
MDRV_IMPORT_FROM(eolith45)
- MDRV_CPU_REPLACE("cpu", E132N, 44900000) /* Normaly 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
+ MDRV_CPU_REPLACE("maincpu", E132N, 44900000) /* Normaly 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
MACHINE_DRIVER_END
@@ -418,7 +418,7 @@ Notes:
*/
ROM_START( ironfort )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u43", 0x00000, 0x80000, CRC(29f55825) SHA1(e048ec0f5d83d4b64aa48d706fa0947afcdc1a3d) ) /* 27C040 eprom with no label */
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -446,7 +446,7 @@ ROM_END
/* Hidden Catch */
ROM_START( hidnctch )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "hc_u43.bin", 0x00000, 0x80000, CRC(635b4478) SHA1(31ea4a9725e0c329447c7d221c22494c905f6940) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -519,7 +519,7 @@ Notes:
*/
ROM_START( nhidctch )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u43", 0x00000, 0x80000, CRC(44296fdb) SHA1(1faf7061342d4c86f6ca416d922cb98ffb72f250) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -595,7 +595,7 @@ Notes:
*/
ROM_START( hidctch2 )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u43", 0x00000, 0x80000, CRC(326d1dbc) SHA1(b33434cd263dc40ee2b6562f72a87a0439a9833e) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -698,7 +698,7 @@ All ROMs 27C160 EPROM
*/
ROM_START( raccoon )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "racoon-u.43", 0x00000, 0x80000, CRC(711ee026) SHA1(c55dfaa24cbaa7a613657cfb25e7f0085f1e4cbf) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -729,7 +729,7 @@ ROM_END
/* Land Breaker */
ROM_START( landbrk )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "rom3.u43", 0x00000, 0x80000, CRC(8429189a) SHA1(f38e4792426ca2c138c44053a6c7525906281dff) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -767,7 +767,7 @@ ROM_START( landbrk )
ROM_END
ROM_START( landbrka )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "lb_1.u43", 0x00000, 0x80000, CRC(f8bbcf44) SHA1(ad85a890ae2f921cd08c1897b4d9a230ccf9e072) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -800,7 +800,7 @@ ROM_END
/* Fortress 2 Blue */
ROM_START( fort2b )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "1.u43", 0x00000, 0x80000, CRC(b2279485) SHA1(022591b260be28820f04a1c1fdd61cb9b68d6703) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -838,7 +838,7 @@ ROM_START( fort2b )
ROM_END
ROM_START( fort2ba )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "ftii012.u43", 0x00000, 0x80000, CRC(6424e05f) SHA1(2f02f103de180561e372ce897f8410a11c4cb58d) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -870,7 +870,7 @@ ROM_END
/* Puzzle King */
ROM_START( puzzlekg )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u43.bin", 0x00000, 0x80000, CRC(c3db7424) SHA1(5ee2be0f06fddb0c74fc6e82679b275cc4e86bcc) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -959,7 +959,7 @@ Notes:
*/
ROM_START( hidctch3 )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u43", 0x00000, 0x80000, CRC(7b861339) SHA1(fca7d47d7d538774ec6462deebc0a367ac073b67) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */
@@ -1012,7 +1012,7 @@ static DRIVER_INIT( landbrka )
//it fails compares with memories:
//$4002d338 -> $4002d348 .... $4002d33f -> $4002d34f
//related with bits 0x100 - 0x200 read at startup from input(0) ?
- UINT32 *rombase = (UINT32*)memory_region(machine, "cpu");
+ UINT32 *rombase = (UINT32*)memory_region(machine, "maincpu");
rombase[0x14f00/4] = (rombase[0x14f00/4] & 0xffff) | 0x03000000; /* Change BR to NOP */
coin_counter_bit = 0x2000;
@@ -1022,22 +1022,22 @@ static DRIVER_INIT( landbrka )
static DRIVER_INIT( hidctch2 )
{
//it fails compares in memory like in landbrka
- UINT32 *rombase = (UINT32*)memory_region(machine, "cpu");
+ UINT32 *rombase = (UINT32*)memory_region(machine, "maincpu");
rombase[0xbcc8/4] = (rombase[0xbcc8/4] & 0xffff) | 0x03000000; /* Change BR to NOP */
init_eolith_speedup(machine);
}
static DRIVER_INIT( hidctch3 )
{
- memory_nop_write(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0xfc200000, 0xfc200003, 0, 0); // this generates pens vibration
+ memory_nop_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xfc200000, 0xfc200003, 0, 0); // this generates pens vibration
// It is not clear why the first reads are needed too
- memory_install_read32_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0xfce00000, 0xfce00003, 0, 0, hidctch3_pen1_r);
- memory_install_read32_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0xfce80000, 0xfce80003, 0, 0, hidctch3_pen1_r);
+ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xfce00000, 0xfce00003, 0, 0, hidctch3_pen1_r);
+ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xfce80000, 0xfce80003, 0, 0, hidctch3_pen1_r);
- memory_install_read32_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0xfcf00000, 0xfcf00003, 0, 0, hidctch3_pen2_r);
- memory_install_read32_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0xfcf80000, 0xfcf80003, 0, 0, hidctch3_pen2_r);
+ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xfcf00000, 0xfcf00003, 0, 0, hidctch3_pen2_r);
+ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xfcf80000, 0xfcf80003, 0, 0, hidctch3_pen2_r);
init_eolith_speedup(machine);
}
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 40c14cf5e02..5ab77af9ddd 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -133,7 +133,7 @@ static WRITE8_DEVICE_HANDLER( lamps_w )
static WRITE8_DEVICE_HANDLER( sound_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM);
+ const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
coin_lockout_global_w(device->machine, ~data & 0x08);
@@ -174,7 +174,7 @@ static WRITE8_DEVICE_HANDLER( lamps2_w )
static WRITE8_DEVICE_HANDLER( nmi_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM);
+ const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
set_led_status(device->machine, 8,data & 0x10);
@@ -200,68 +200,68 @@ static READ8_DEVICE_HANDLER( portC_r )
static WRITE8_HANDLER( banksel_main_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x8000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x8000);
}
static WRITE8_HANDLER( banksel_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x10000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x10000);
}
static WRITE8_HANDLER( banksel_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x18000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x18000);
}
static WRITE8_HANDLER( banksel_3_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x20000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x20000);
}
static WRITE8_HANDLER( banksel_4_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x28000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x28000);
}
static WRITE8_HANDLER( banksel_5_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x30000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x30000);
}
static WRITE8_HANDLER( banksel_1_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x10000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x10000);
}
static WRITE8_HANDLER( banksel_2_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x14000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x14000);
}
static WRITE8_HANDLER( banksel_3_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x18000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x18000);
}
static WRITE8_HANDLER( banksel_4_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1c000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1c000);
}
static WRITE8_HANDLER( banksel_5_1_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x20000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x20000);
}
static WRITE8_HANDLER( banksel_1_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x12000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x12000);
}
static WRITE8_HANDLER( banksel_2_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x16000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x16000);
}
static WRITE8_HANDLER( banksel_3_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1a000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1a000);
}
static WRITE8_HANDLER( banksel_4_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1e000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1e000);
}
static WRITE8_HANDLER( banksel_5_2_w )
{
- memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x22000);
+ memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x22000);
}
static WRITE8_HANDLER(geimulti_bank_w)
@@ -1002,7 +1002,7 @@ static MACHINE_RESET( gselect )
}
static MACHINE_DRIVER_START( getrivia )
- MDRV_CPU_ADD("cpu",Z80,4000000) /* 4 MHz */
+ MDRV_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(getrivia_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
@@ -1036,7 +1036,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( findout )
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(findout_map)
MDRV_PPI8255_RECONFIG( "ppi8255_0", findout_ppi8255_intf[0] )
@@ -1048,7 +1048,7 @@ static MACHINE_DRIVER_START( gselect )
/* basic machine hardware */
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(gselect_map)
MDRV_MACHINE_RESET(gselect)
@@ -1062,7 +1062,7 @@ static MACHINE_DRIVER_START( jokpokera )
/* basic machine hardware */
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(gselect_map)
MDRV_MACHINE_RESET(gselect)
@@ -1074,7 +1074,7 @@ static MACHINE_DRIVER_START( amuse )
/* basic machine hardware */
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(amuse_map)
MACHINE_DRIVER_END
@@ -1083,7 +1083,7 @@ static MACHINE_DRIVER_START( gepoker )
/* basic machine hardware */
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(gepoker_map)
MACHINE_DRIVER_END
@@ -1091,7 +1091,7 @@ static MACHINE_DRIVER_START( amuse1 )
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(amuse1_map)
MACHINE_DRIVER_END
@@ -1099,7 +1099,7 @@ static MACHINE_DRIVER_START( suprpokr )
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(suprpokr_map)
MACHINE_DRIVER_END
@@ -1107,7 +1107,7 @@ static MACHINE_DRIVER_START( geimulti )
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(geimulti_map)
MACHINE_DRIVER_END
@@ -1115,7 +1115,7 @@ static MACHINE_DRIVER_START( sprtauth )
MDRV_IMPORT_FROM(getrivia)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(sprtauth_map)
MACHINE_DRIVER_END
@@ -1132,14 +1132,14 @@ PCB labeled M075
****************************************************/
ROM_START( jokpoker )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "m075.1", 0x00000, 0x1000, CRC(ad42465b) SHA1(3f06847a9aecb0592f99419dba9be5f18005d57b) ) /* rom board UMV-1A */
ROM_LOAD( "m075.2", 0x01000, 0x1000, CRC(bd129fc2) SHA1(2e05ba34922c16d127be32941447013efea05bcd) )
ROM_LOAD( "m075.3", 0x02000, 0x1000, CRC(45725bc9) SHA1(9e6dcbec955ef8190f2307ddb367b24b7f34338d) )
ROM_END
ROM_START( jokpokera )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "jpbiwr930-1.bin", 0x00000, 0x2000, CRC(d0f4fec5) SHA1(5fcc72522df66464759d5ba3d5209bc7a3a80002) ) /* rom board UMV-7C */
ROM_LOAD( "jpbiwr930-2.bin", 0x02000, 0x2000, CRC(824d1aee) SHA1(6eebde351c3b5bbed3796846d8d651b41ed6f84a) )
ROM_END
@@ -1153,7 +1153,7 @@ UVM 7S REV A romboard
*/
ROM_START( jokpokerb )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "jp_bi_10-19-88.e1", 0x00000, 0x2000, CRC(d59a78e2) SHA1(d8463675f30a52e0f93c5ea5c2ee663095d3d5ea) )
ROM_LOAD( "jp_bi_10-19-88.e2", 0x02000, 0x2000, CRC(1a34dc80) SHA1(27dff743e661ae7421fef0b046e3ae205b842603) )
ROM_END
@@ -1167,7 +1167,7 @@ UVM7-C romboard
*/
ROM_START( jokpokerc )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "jp_bi_5-10-85.1", 0x00000, 0x2000, CRC(d0f4fec5) SHA1(5fcc72522df66464759d5ba3d5209bc7a3a80002) )
ROM_LOAD( "jp_bi_5-10-85.2", 0x02000, 0x2000, CRC(9f8bee22) SHA1(8d894d2a07bd18d731b7a54a16bb9b9230c79306) )
ROM_END
@@ -1183,7 +1183,7 @@ Contains:
****************************************************/
ROM_START( superbwl )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "super_bowl.1", 0x00000, 0x1000, CRC(82edf064) SHA1(8a26377590282f51fb39d013452ba11252e7dd05) ) /* rom board UMV-1B */
ROM_LOAD( "super_bowl.2", 0x01000, 0x1000, CRC(2438dd1f) SHA1(26bbd1cb3d0d5b93f61b92ff95948ac9de060715) )
ROM_LOAD( "super_bowl.3", 0x02000, 0x1000, CRC(9b111430) SHA1(9aaa755f3e4b369477c1a0525c994a19fe0f6107) )
@@ -1213,7 +1213,7 @@ Note: Question roms that contain "#1" (or 2 ect)
****************************************************/
ROM_START( gtsers1 ) /* Series 1 (Complete) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog101c_right", 0x00000, 0x2000, CRC(767f0e46) SHA1(5de7b54876fcbfb2328174ffe6b656ffea886fcb) ) /* rom board UMV 10 B */
ROM_LOAD( "prog101c_left", 0x0a000, 0x2000, CRC(24c0a097) SHA1(b8de58baecb92775e0882cd6eca3b9e07cf7c5a5) )
/* Question roms */
@@ -1225,7 +1225,7 @@ ROM_START( gtsers1 ) /* Series 1 (Complete) */
ROM_END
ROM_START( gtsers2 ) /* Series 2 (Complete - question roms dated 2/9) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog101c_right", 0x00000, 0x2000, CRC(767f0e46) SHA1(5de7b54876fcbfb2328174ffe6b656ffea886fcb) ) /* rom board UMV 10 B */
ROM_LOAD( "prog101c_left", 0x0a000, 0x2000, CRC(24c0a097) SHA1(b8de58baecb92775e0882cd6eca3b9e07cf7c5a5) )
/* Question roms */
@@ -1237,7 +1237,7 @@ ROM_START( gtsers2 ) /* Series 2 (Complete - question roms dated 2/9) */
ROM_END
ROM_START( gtsers3 ) /* Series 3 (Complete - question roms dated 3/9) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102b_right", 0x00000, 0x2000, CRC(e8391f71) SHA1(a955eff87d622d4fcfd25f6d888c48ff82556879) )
ROM_LOAD( "prog102b_left", 0x0a000, 0x2000, CRC(cc7b45a7) SHA1(c708f56feb36c1241358a42bb7dce25b799f1f0b) )
/* Question roms */
@@ -1249,7 +1249,7 @@ ROM_START( gtsers3 ) /* Series 3 (Complete - question roms dated 3/9) */
ROM_END
ROM_START( gtsers4 ) /* Series 4 (Incomplete - question roms dated 4/9) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102c_right", 0x00000, 0x2000, CRC(76fdc3a3) SHA1(212e09644b9cab334aad22ec5860e8638c6ba3fa) )
ROM_LOAD( "prog102c_left", 0x0a000, 0x2000, CRC(901fb2f9) SHA1(98e49c74d89c4911a1f4d5ccf3e6cf3226c6a178) )
/* Question roms */
@@ -1261,7 +1261,7 @@ ROM_START( gtsers4 ) /* Series 4 (Incomplete - question roms dated 4/9) */
ROM_END
ROM_START( gtsers5 ) /* Series 5 (Incomplete - question roms dated 5/9) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102c_right", 0x00000, 0x2000, CRC(76fdc3a3) SHA1(212e09644b9cab334aad22ec5860e8638c6ba3fa) )
ROM_LOAD( "prog102c_left", 0x0a000, 0x2000, CRC(901fb2f9) SHA1(98e49c74d89c4911a1f4d5ccf3e6cf3226c6a178) )
/* Question roms */
@@ -1273,7 +1273,7 @@ ROM_START( gtsers5 ) /* Series 5 (Incomplete - question roms dated 5/9) */
ROM_END
ROM_START( gtsers7 ) /* Series 7 (Incomplete - question roms dated 7/9?) */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102c_right", 0x00000, 0x2000, CRC(76fdc3a3) SHA1(212e09644b9cab334aad22ec5860e8638c6ba3fa) )
ROM_LOAD( "prog102c_left", 0x0a000, 0x2000, CRC(901fb2f9) SHA1(98e49c74d89c4911a1f4d5ccf3e6cf3226c6a178) )
/* Question roms */
@@ -1285,7 +1285,7 @@ ROM_START( gtsers7 ) /* Series 7 (Incomplete - question roms dated 7/9?) */
ROM_END
ROM_START( gtsersa ) /* alt or older version questions */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102c_right", 0x00000, 0x2000, CRC(76fdc3a3) SHA1(212e09644b9cab334aad22ec5860e8638c6ba3fa) )
ROM_LOAD( "prog102c_left", 0x0a000, 0x2000, CRC(901fb2f9) SHA1(98e49c74d89c4911a1f4d5ccf3e6cf3226c6a178) )
/* Question roms */
@@ -1297,7 +1297,7 @@ ROM_START( gtsersa ) /* alt or older version questions */
ROM_END
ROM_START( gtsersb ) /* alt or older version questions */
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog102c_right", 0x00000, 0x2000, CRC(76fdc3a3) SHA1(212e09644b9cab334aad22ec5860e8638c6ba3fa) )
ROM_LOAD( "prog102c_left", 0x0a000, 0x2000, CRC(901fb2f9) SHA1(98e49c74d89c4911a1f4d5ccf3e6cf3226c6a178) )
/* Question roms */
@@ -1309,7 +1309,7 @@ ROM_START( gtsersb ) /* alt or older version questions */
ROM_END
ROM_START( sextriv1 )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog1_right", 0x00000, 0x2000, CRC(73abcd12) SHA1(3b985f25a11507878cef6d11420e215065fb0906) )
ROM_LOAD( "prog1_left", 0x0a000, 0x2000, CRC(04ee6ecd) SHA1(28342fcdcf36b34fa93f1a985163ca5aab03defe) )
/* Question roms */
@@ -1320,7 +1320,7 @@ ROM_START( sextriv1 )
ROM_END
ROM_START( sextriv2 )
- ROM_REGION( 0x24000, "cpu", 0 )
+ ROM_REGION( 0x24000, "maincpu", 0 )
ROM_LOAD( "prog1_right", 0x00000, 0x2000, CRC(73abcd12) SHA1(3b985f25a11507878cef6d11420e215065fb0906) )
ROM_LOAD( "prog1_left", 0x0a000, 0x2000, CRC(04ee6ecd) SHA1(28342fcdcf36b34fa93f1a985163ca5aab03defe) )
/* Question roms */
@@ -1352,7 +1352,7 @@ sets as the alt set also included that name on the labels
****************************************************/
ROM_START( gs4002 )
- ROM_REGION( 0x18000, "cpu", 0 )
+ ROM_REGION( 0x18000, "maincpu", 0 )
ROM_LOAD( "4-1.1", 0x00000, 0x2000, CRC(a456e456) SHA1(f36b96ac31ce0f128ecb94f94d1dbdd88ee03c77) ) /* V16M 5-4-84 */
/* Banked roms */
ROM_LOAD( "bljk_3-16-84.2", 0x10000, 0x2000, CRC(c3785523) SHA1(090f324fc7adb0a36b189cf04086f0e050895ee4) )
@@ -1362,7 +1362,7 @@ ROM_START( gs4002 )
ROM_END
ROM_START( gs4002a )
- ROM_REGION( 0x18000, "cpu", 0 )
+ ROM_REGION( 0x18000, "maincpu", 0 )
ROM_LOAD( "4-1.1", 0x00000, 0x2000, CRC(a456e456) SHA1(f36b96ac31ce0f128ecb94f94d1dbdd88ee03c77) ) /* V16M 5-4-84 */
/* Banked roms */
ROM_LOAD( "bljk_3-16-84.2", 0x10000, 0x2000, CRC(c3785523) SHA1(090f324fc7adb0a36b189cf04086f0e050895ee4) )
@@ -1412,7 +1412,7 @@ The ICB set is known as the M105 set as some label sets included that name.
*/
ROM_START( gepoker ) /* v50.02 with most roms for ICB dated 8-16-84 */
- ROM_REGION( 0x1b000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1b000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "control_icb_8-16", 0x00000, 0x2000, CRC(0103963d) SHA1(9bc646e721048b84111e0686eaca23bc24eee3e2) )
ROM_LOAD( "high_icb_6-25-85-5", 0x0e000, 0x2000, CRC(dfb6592e) SHA1(d68de9f537d3c14279dc576424d195bb266e3897) )
/* Banked roms */
@@ -1424,7 +1424,7 @@ ROM_START( gepoker ) /* v50.02 with most roms for ICB dated 8-16-84 */
ROM_END
ROM_START( gepoker1 ) /* v50.02 with roms for ICB dated 9-30-86 */
- ROM_REGION( 0x1b000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1b000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "control_icb_9-30", 0x00000, 0x2000, CRC(08b996f2) SHA1(5f5efb5015ec9571cc94734c18debfadaa28f585) )
ROM_LOAD( "high_icb_6-25-85-5a", 0x0e000, 0x2000, CRC(6ddc1750) SHA1(ee19206b7f4a98e3e7647414127f4e09b3e9134f) )
/* Banked roms */
@@ -1436,7 +1436,7 @@ ROM_START( gepoker1 ) /* v50.02 with roms for ICB dated 9-30-86 */
ROM_END
ROM_START( gepoker2 ) /* v50.02 with control dated 9-30-84 */
- ROM_REGION( 0x1b000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1b000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "control_icb_9-30", 0x00000, 0x2000, CRC(08b996f2) SHA1(5f5efb5015ec9571cc94734c18debfadaa28f585) )
ROM_LOAD( "high_icb_6-25a", 0x0e000, 0x2000, CRC(6ddc1750) SHA1(ee19206b7f4a98e3e7647414127f4e09b3e9134f) )
/* Banked roms */
@@ -1445,7 +1445,7 @@ ROM_START( gepoker2 ) /* v50.02 with control dated 9-30-84 */
ROM_END
ROM_START( amuse ) /* v50.08 with most roms for IAM dated 8-16-84 */
- ROM_REGION( 0x24000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x24000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "control_iam_8-16", 0x00000, 0x4000, CRC(345434b9) SHA1(ec880f6f5e90aa971937e0270701e323f6a83671) ) /* all roms were 27128, twice the size of other sets */
ROM_LOAD( "high_iam_8-16", 0x08000, 0x4000, CRC(57000fb7) SHA1(144723eb528c4816b9aa4b0ba77d2723c6442546) ) /* Is only the 1st half used by the board / program? */
/* Banked roms */
@@ -1463,7 +1463,7 @@ UVM-8B romboard
*/
ROM_START( amuse1 ) /* v30.08 */
- ROM_REGION( 0x20000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "m108_control_5-16-84", 0x00000, 0x4000, CRC(9dda922f) SHA1(ded42adda8376452e0ac4f771ebb42fd86811dc5) )
ROM_LOAD( "m108_hcon_5-16-84", 0x05800, 0x1000, CRC(ade5c42d) SHA1(d3e32ecaeb21a4e5eedd243c42d5914b03f572bd) )
/* Banked roms */
@@ -1474,13 +1474,13 @@ ROM_END
ROM_START( suprpokr )
- ROM_REGION( 0x10000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "10-19s-1.e1", 0x00000, 0x4000, CRC(50662b4d) SHA1(967161a755db43d2cfd5ce92e14c5284f1f1f8ad) )
ROM_LOAD( "10-19s-1.e2", 0x08000, 0x4000, BAD_DUMP CRC(22b45aeb) SHA1(006c3072cc44c6fde9b4d15163dc70707bbd5a9c) ) /* Self test reports this ROM bad */
ROM_END
ROM_START( reelfun ) /* v7.01 */
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "reelfun.cnt", 0x00000, 0x4000, CRC(d9d1e92b) SHA1(337f66a37b3734d565b3ff3d912e0f690fd7c445) )
ROM_LOAD( "reelfun.prg", 0x08000, 0x2000, CRC(615d846a) SHA1(ffa1c47393f4f364aa34d14cf3ac2f56d9eaecb0) ) /* banked */
ROM_LOAD( "reelfun-1-title", 0x10000, 0x8000, CRC(0e165fbc) SHA1(a3a5b7db72ab86efe973f649f5dfe5133830e3fc) ) /* banked ROMs for solution data */
@@ -1491,7 +1491,7 @@ ROM_START( reelfun ) /* v7.01 */
ROM_END
ROM_START( findout )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "12.bin", 0x00000, 0x4000, CRC(21132d4c) SHA1(e3562ee2f46b3f022a852a0e0b1c8fb8164f64a3) )
ROM_LOAD( "11.bin", 0x08000, 0x2000, CRC(0014282c) SHA1(c6792f2ff712ba3759ff009950d78750df844d01) ) /* banked */
ROM_LOAD( "13.bin", 0x10000, 0x8000, CRC(cea91a13) SHA1(ad3b395ab0362f3decf178824b1feb10b6335bb3) ) /* banked ROMs for solution data */
@@ -1505,7 +1505,7 @@ ROM_START( findout )
ROM_END
ROM_START( gt507uk )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "triv_3_2.bin", 0x00000, 0x4000, CRC(2d72a081) SHA1(8aa32acf335d027466799b097e0de66bcf13247f) )
ROM_LOAD( "rom_ad.bin", 0x08000, 0x2000, CRC(c81cc847) SHA1(057b7b75a2fe1abf88b23e7b2de230d9f96139f5) )
ROM_LOAD( "aerospace", 0x10000, 0x8000, CRC(cb555d46) SHA1(559ae05160d7893ff96311a2177eba039a4cf186) )
@@ -1516,7 +1516,7 @@ ROM_START( gt507uk )
ROM_END
ROM_START( gt5 ) /* v5.06, From a TRIV3D romboard */
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "program", 0x00000, 0x4000, CRC(e9d6226c) SHA1(42e62c5cafa3f051bf48c18c8c549ffcd4c766c5) )
ROM_LOAD( "entertainment_2", 0x10000, 0x8000, CRC(c75c2331) SHA1(9c5947616a4cba2623c599def6cf3b2b1981b681) ) /* rom / question set #15 */
ROM_LOAD( "facts_2", 0x18000, 0x8000, CRC(7836ef31) SHA1(6a84cfa39de392eed46a4b37752e00b6d094bbd6) )
@@ -1526,7 +1526,7 @@ ROM_START( gt5 ) /* v5.06, From a TRIV3D romboard */
ROM_END
ROM_START( gtsers8 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versionc", 0x00000, 0x4000, CRC(340246a4) SHA1(d655e1cf2b1e87a05e87ff6af4b794e6d54a2a52) )
ROM_LOAD( "science", 0x10000, 0x8000, CRC(2f940ebd) SHA1(bead4988ac0a97d70f2a3c0b40a05968436de2ed) )
ROM_LOAD( "general", 0x18000, 0x8000, CRC(1efa01c3) SHA1(801ef5ab55184e488b08ef99ebd641ea4f7edb24) )
@@ -1537,7 +1537,7 @@ ROM_START( gtsers8 )
ROM_END
ROM_START( gtsers9 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versionc", 0x00000, 0x4000, CRC(340246a4) SHA1(d655e1cf2b1e87a05e87ff6af4b794e6d54a2a52) )
ROM_LOAD( "facts", 0x10000, 0x8000, CRC(21bd6181) SHA1(609ae1097a4011e90d03d4c4f03140fbe84c084a) )
ROM_LOAD( "rock-n-roll", 0x18000, 0x8000, CRC(1be036b1) SHA1(0b262906044950319dd911b956ac2e0b433f6c7f) )
@@ -1548,7 +1548,7 @@ ROM_START( gtsers9 )
ROM_END
ROM_START( gtsers10 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versionc", 0x00000, 0x4000, CRC(340246a4) SHA1(d655e1cf2b1e87a05e87ff6af4b794e6d54a2a52) )
ROM_LOAD( "new_general", 0x10000, 0x8000, CRC(ba1f5b92) SHA1(7e94be0ef6904331d3a6b266e5887e9a15c5e7f9) )
ROM_LOAD( "new_tv_mash", 0x18000, 0x8000, CRC(f73240c6) SHA1(78020644074da719414133a86a91c1328e5d8929) )
@@ -1559,7 +1559,7 @@ ROM_START( gtsers10 )
ROM_END
ROM_START( gtsers11 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versionc", 0x00000, 0x4000, CRC(340246a4) SHA1(d655e1cf2b1e87a05e87ff6af4b794e6d54a2a52) )
ROM_LOAD( "rich-famous", 0x10000, 0x8000, CRC(39e07e4a) SHA1(6e5a0bcefaa1169f313e8818cf50919108b3e121) )
ROM_LOAD( "cars-women", 0x18000, 0x8000, CRC(4c5dd1df) SHA1(f3e2146eeab07ec71617c7614c6e8f6bc844e6e3) )
@@ -1570,7 +1570,7 @@ ROM_START( gtsers11 )
ROM_END
ROM_START( gt103a1 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versiona", 0x00000, 0x4000, CRC(537d6566) SHA1(282a33e4a9fc54d34094393c00026bf31ccd6ab5) )
ROM_LOAD( "new_science_2", 0x10000, 0x8000, CRC(3bd80fb8) SHA1(9a196595bc5dc6ed5ee5853786839ed4847fa436) ) /* Questions from an unknown set, will be corrected when verified */
ROM_LOAD( "nfl_football", 0x18000, 0x8000, CRC(d676b7cd) SHA1(d652d2441adb500f7af526d110d0335ea453d75b) ) /* These questions are likely mix-n-match do to opperator swaps */
@@ -1580,7 +1580,7 @@ ROM_START( gt103a1 )
ROM_END
ROM_START( gt103a2 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "prog1_versionc", 0x00000, 0x4000, CRC(340246a4) SHA1(d655e1cf2b1e87a05e87ff6af4b794e6d54a2a52) )
ROM_LOAD( "vices", 0x10000, 0x8000, CRC(e6069955) SHA1(68f7453f21a4ce1be912141bbe947fbd81d918a3) ) /* Questions from an unknown set, will be corrected when verified */
ROM_LOAD( "cops_&_robbers", 0x18000, 0x8000, CRC(8b367c33) SHA1(013468157bf469c9cf138809fdc45b3ba60a423b) ) /* These questions are likely mix-n-match do to opperator swaps */
@@ -1589,7 +1589,7 @@ ROM_START( gt103a2 )
ROM_END
ROM_START( gt103a3 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "t_3a-8_1.bin", 0x00000, 0x4000, CRC(02aef306) SHA1(1ffc10c79a55d41ea36bcaab13cb3f02cb3f9712) )
ROM_LOAD( "rock-n-roll_alt", 0x10000, 0x8000, CRC(8eb83052) SHA1(93e3c1ae6c2048fb44ecafe1013b6a96da38fa84) ) /* Questions from an unknown set, will be corrected when verified */
ROM_LOAD( "history-geog.", 0x18000, 0x8000, CRC(c9a70fc3) SHA1(4021e5d702844416e8c798ed0a57c9ecd20b1d4b) ) /* These questions are likely mix-n-match do to opperator swaps */
@@ -1598,7 +1598,7 @@ ROM_START( gt103a3 )
ROM_END
ROM_START( gt103aa )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "t_3a-8_1.bin", 0x00000, 0x4000, CRC(02aef306) SHA1(1ffc10c79a55d41ea36bcaab13cb3f02cb3f9712) )
ROM_LOAD( "entertainment_alt", 0x10000, 0x8000, CRC(9a6628b9) SHA1(c0cb7e974329d4d5b91f107296d21a674e35a51b) ) /* Questions from an unknown set, will be corrected when verified */
ROM_LOAD( "general_alt", 0x18000, 0x8000, CRC(df34f7f9) SHA1(329d123eea711d5135dc02dd7b89b220ce8ddd28) ) /* These questions are likely mix-n-match do to opperator swaps */
@@ -1608,7 +1608,7 @@ ROM_START( gt103aa )
ROM_END
ROM_START( gt103asx )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "t_3a-8_1.bin", 0x00000, 0x4000, CRC(02aef306) SHA1(1ffc10c79a55d41ea36bcaab13cb3f02cb3f9712) )
ROM_LOAD( "adult_sex_2", 0x10000, 0x8000, CRC(0d683f21) SHA1(f47ce3c31c4c5ed02247fa280303e6ae760315df) )
ROM_LOAD( "adult_sex_2_alt", 0x18000, 0x8000, CRC(8c0eacc8) SHA1(ddaa25548d161394b41c65a2db57a9fcf793062b) )
@@ -1618,7 +1618,7 @@ ROM_START( gt103asx )
ROM_END
ROM_START( quiz )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "1.bin", 0x00000, 0x4000, CRC(4e3204da) SHA1(291f1c9b8c4c07881621c3ecbba7af80f86b9520) )
ROM_LOAD( "2.bin", 0x10000, 0x8000, CRC(b79f3ae1) SHA1(4b4aa50ec95138bc8ee4bc2a61bcbfa2515ac854) )
ROM_LOAD( "3.bin", 0x18000, 0x8000, CRC(9c7e9608) SHA1(35ee9aa36d16bca64875640224c7fe9d327a95c3) )
@@ -1631,7 +1631,7 @@ ROM_START( quiz )
ROM_END
ROM_START( quiz211 )
- ROM_REGION( 0x38000, "cpu", 0 )
+ ROM_REGION( 0x38000, "maincpu", 0 )
ROM_LOAD( "1a.bin", 0x000000, 0x4000, CRC(116de0ea) SHA1(9af97b100aa2c79a58de055abe726d6e2e00aab4) )
ROM_CONTINUE( 0x000000, 0x4000 ) // halves identical
ROM_LOAD( "hobby.bin", 0x10000, 0x8000, CRC(c86d0c2b) SHA1(987ef17c7b9cc119511a16cbd98ec44d24665af5) )
@@ -1689,7 +1689,7 @@ All roms are 27C256 type eproms
*/
ROM_START( geimulti )
- ROM_REGION( 0x10000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "cont", 0x00000, 0x8000, CRC(920020df) SHA1(01cb0a58bf863d63bcafe1e198ce5ea10bb8f59e) )
ROM_REGION( 0x8000*(13 + 1), "bank", ROMREGION_ERASEFF )
@@ -1711,7 +1711,7 @@ ROM_START( geimulti )
ROM_END
ROM_START( sprtauth )
- ROM_REGION( 0x10000, "cpu", ROMREGION_ERASEFF )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "sprt-auth-rev1-cont.cont", 0x00000, 0x8000, CRC(19dd0aa6) SHA1(7805d8139ac20061fc782bcaeff2202ed451fa91) )
ROM_REGION( 0x8000*(13 + 1), "bank", ROMREGION_ERASEFF )
@@ -1730,7 +1730,7 @@ ROM_END
static DRIVER_INIT( setbank )
{
- memory_set_bankptr(machine, "bank1",memory_region(machine, "cpu") + 0x2000);
+ memory_set_bankptr(machine, "bank1",memory_region(machine, "maincpu") + 0x2000);
}
static DRIVER_INIT( geimulti )
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index e210c6718dd..91eb650e376 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -647,7 +647,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( magic10 )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu", M68000, 10000000) // ?
+ MDRV_CPU_ADD("maincpu", M68000, 10000000) // ?
MDRV_CPU_PROGRAM_MAP(magic10_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
@@ -677,7 +677,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magic10a )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(magic10a_map)
MACHINE_DRIVER_END
@@ -685,7 +685,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magic102 )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(magic102_map)
MDRV_SCREEN_MODIFY("screen")
@@ -696,7 +696,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotslot )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(hotslot_map)
MDRV_SCREEN_MODIFY("screen")
@@ -707,7 +707,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sgsafari )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(sgsafari_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold) /* L1 interrupts */
@@ -734,7 +734,7 @@ Magic 10 (videopoker)
*/
ROM_START( magic10 )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "u3.bin", 0x000000, 0x20000, CRC(191a46f4) SHA1(65bc22cdcc4b2f102d3eef595626819af709cacb) )
ROM_LOAD16_BYTE( "u2.bin", 0x000001, 0x20000, CRC(a03a80bc) SHA1(a21da8912f1d2c8c2fa4a8d3ce4d43da8a934e21) )
@@ -749,7 +749,7 @@ ROM_START( magic10 )
ROM_END
ROM_START( magic10a )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "u3_1645.bin", 0x00000, 0x20000, CRC(7f2549e4) SHA1(6578ad29273c357faae7c6be3fa1b49087e088a2) )
ROM_LOAD16_BYTE( "u2_1645.bin", 0x00001, 0x20000, CRC(c075234e) SHA1(d9bc38f0b984082a77088fbb52b02c8f5c49846c) )
@@ -797,7 +797,7 @@ Note:
*/
ROM_START( magic10b )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "2.u3", 0x000000, 0x20000, CRC(32c12ad6) SHA1(93340df2c0f4c260837bd6649008e26a17a22015) )
ROM_LOAD16_BYTE( "3.u2", 0x000001, 0x20000, CRC(a9945aaa) SHA1(97d4f6441b96618f2e3ce14095ffc5628cb14f0e) )
@@ -826,7 +826,7 @@ pcb is marked: Copyright ABM - 9605 Rev.02
*/
ROM_START( magic102 )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "2.u3", 0x00000, 0x20000, CRC(6fc55fe4) SHA1(392ad92e55aeac9bf5235cceb6b0b415942105a4) )
ROM_LOAD16_BYTE( "1.u2", 0x00001, 0x20000, CRC(501507af) SHA1(ceed50c9380a9838cd3d171d2387334edfeff77f) )
@@ -885,7 +885,7 @@ ABM (Nazionale Elettronica Giochi S.A.S.), 1998.
*/
ROM_START( suprpool )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "2-1.22a.u3", 0x00000, 0x20000,CRC(5d15037a) SHA1(74cab79a1b08910267262a4c6b501126a4df6cda) )
ROM_LOAD16_BYTE( "3-1.22a.u2", 0x00001, 0x20000,CRC(c762cd1c) SHA1(ee05a9e8147d613eb14333e6e7b743fc05982e7c) )
@@ -958,7 +958,7 @@ Note:
*/
ROM_START( hotslot )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "hotslot2.u3", 0x00000, 0x20000, CRC(676cbe32) SHA1(78721326f3334fcdfdaffb72dbcacfb8bb591d51) )
ROM_LOAD16_BYTE( "hotslot3.u2", 0x00001, 0x20000, CRC(2c362765) SHA1(c41741c97fe8e5b3a66eb08ebf68d24c6c771ba8) )
@@ -1015,7 +1015,7 @@ Note:
*/
ROM_START( mcolors )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "m.colors1.7a-2.u3", 0x00000, 0x20000, CRC(02ce6aab) SHA1(349cb639024a818cb88e911788a0146f48d25333) )
ROM_LOAD16_BYTE( "m.colors1.7a-3.u2", 0x00001, 0x20000, CRC(076b9680) SHA1(856d1cfaca886d78a36e129a7b41455362932e66) )
@@ -1073,7 +1073,7 @@ Note:
*/
ROM_START( sgsafari )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "2.u7", 0x00000, 0x10000, CRC(797ceeac) SHA1(19055b6700f8523785790992adfeb67faa2358e0) )
ROM_LOAD16_BYTE( "1.u2", 0x00001, 0x10000, CRC(549872f5) SHA1(2228c51541e3b059d5b16f50387e4215b82f78f6) )
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 2c4044093d6..911743479b2 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -944,6 +944,59 @@ static INPUT_PORTS_START( tron )
INPUT_PORTS_END
+static INPUT_PORTS_START( tron3 )
+ PORT_START("SSIO.IP0") /* J4 1-8 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
+
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
+
+ PORT_START("SSIO.IP2") /* J5 1-8 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
+// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
+// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
+// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
+
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_DIPNAME( 0x01, 0x00, "Coin Meters" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPSETTING( 0x01, "1" )
+ PORT_DIPSETTING( 0x00, "2" )
+ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) )
+ PORT_DIPNAME( 0x04, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:3")
+ PORT_DIPSETTING( 0x04, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
+ PORT_DIPUNUSED_DIPLOC( 0x08, 0x00, "SW1:4" )
+ PORT_DIPUNUSED_DIPLOC( 0x10, 0x00, "SW1:5" )
+ PORT_DIPUNUSED_DIPLOC( 0x20, 0x00, "SW1:6" )
+ PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "SW1:7" )
+// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+
+ // According to the manual, SW1 is a bank of *10* switches (9 is unused and 10 is freeze)
+ // Where are the values for the other two bits read?
+
+ PORT_START("SSIO.IP4") /* J6 1-8 */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+// PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
+
+ PORT_START("SSIO.DIP")
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+INPUT_PORTS_END
+
+
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( kroozr )
@@ -2623,8 +2676,8 @@ GAME( 1981, shollow, 0, mcr_90010, shollow, mcr_90010, ROT90, "Ball
GAME( 1981, shollow2, shollow, mcr_90010, shollow, mcr_90010, ROT90, "Bally Midway", "Satan's Hollow (set 2)", GAME_SUPPORTS_SAVE )
GAME( 1982, tron, 0, mcr_90010, tron, mcr_90010, ROT90, "Bally Midway", "Tron (8/9)", GAME_SUPPORTS_SAVE )
GAME( 1982, tron2, tron, mcr_90010, tron, mcr_90010, ROT90, "Bally Midway", "Tron (6/25)", GAME_SUPPORTS_SAVE )
-GAME( 1982, tron3, tron, mcr_90010, tron, mcr_90010, ROT90, "Bally Midway", "Tron (6/17)", GAME_SUPPORTS_SAVE )
-GAME( 1982, tron4, tron, mcr_90010, tron, mcr_90010, ROT90, "Bally Midway", "Tron (6/15)", GAME_SUPPORTS_SAVE )
+GAME( 1982, tron3, tron, mcr_90010, tron3, mcr_90010, ROT90, "Bally Midway", "Tron (6/17)", GAME_SUPPORTS_SAVE )
+GAME( 1982, tron4, tron, mcr_90010, tron3, mcr_90010, ROT90, "Bally Midway", "Tron (6/15)", GAME_SUPPORTS_SAVE )
GAME( 1982, domino, 0, mcr_90010, domino, mcr_90010, ROT0, "Bally Midway", "Domino Man", GAME_SUPPORTS_SAVE )
GAME( 1982, wacko, 0, mcr_90010, wacko, wacko, ROT0, "Bally Midway", "Wacko", GAME_SUPPORTS_SAVE )
GAME( 1984, twotigerc,twotiger, mcr_90010, twotigrc, mcr_90010, ROT0, "Bally Midway", "Two Tigers (Tron conversion)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 536d93f569a..79b41225cfb 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -457,7 +457,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pingpong )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu",Z80,18432000/6) /* 3.072 MHz (probably) */
+ MDRV_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
MDRV_CPU_PROGRAM_MAP(pingpong_map)
MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */
@@ -486,7 +486,7 @@ MACHINE_DRIVER_END
/* too fast! */
static MACHINE_DRIVER_START( merlinmm )
MDRV_IMPORT_FROM( pingpong )
- MDRV_CPU_MODIFY("cpu")
+ MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(merlinmm_map)
MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,2)
@@ -501,7 +501,7 @@ MACHINE_DRIVER_END
***************************************************************************/
ROM_START( pingpong )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "pp_e04.rom", 0x0000, 0x4000, CRC(18552f8f) SHA1(cb03659b5e8a68003e72182a20979384d829280f) )
ROM_LOAD( "pp_e03.rom", 0x4000, 0x4000, CRC(ae5f01e8) SHA1(f0d6a2c64822f2662fed3f601e279db18246f894) )
@@ -518,7 +518,7 @@ ROM_START( pingpong )
ROM_END
ROM_START( merlinmm )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "merlinmm.ic2", 0x0000, 0x4000, CRC(ea5b6590) SHA1(fdd5873c67761955e33260743cc45075dea34fb4) )
ROM_REGION( 0x2000, "gfx1", 0 )
@@ -534,7 +534,7 @@ ROM_START( merlinmm )
ROM_END
ROM_START( cashquiz )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "cashqcv5.ic3", 0x0000, 0x4000, CRC(8e9e2bed) SHA1(1894d40f89226a810c703ce5e49fdfd64d70287f) )
/* 0x4000 - 0x7fff = extra hardware for question board */
@@ -571,7 +571,7 @@ ROM_END
static DRIVER_INIT( merlinmm )
{
- UINT8 *ROM = memory_region(machine, "cpu");
+ UINT8 *ROM = memory_region(machine, "maincpu");
int i;
/* decrypt program code */
@@ -585,7 +585,7 @@ static DRIVER_INIT( cashquiz )
int i;
/* decrypt program code */
- ROM = memory_region(machine, "cpu");
+ ROM = memory_region(machine, "maincpu");
for( i = 0; i < 0x4000; i++ )
ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7);
@@ -595,18 +595,18 @@ static DRIVER_INIT( cashquiz )
ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7);
/* questions banking handlers */
- memory_install_write8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x4000, 0, 0, cashquiz_question_bank_high_w);
- memory_install_write8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w);
+ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x4000, 0, 0, cashquiz_question_bank_high_w);
+ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w);
// 8 independents banks for questions
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
- memory_install_read_bank(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
+ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
// setup default banks
memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x100*0 );
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index bad973f6458..1b8bc1cb144 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -273,7 +273,7 @@ static PALETTE_INIT( pzletime )
static MACHINE_DRIVER_START( pzletime )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu",M68000,10000000)
+ MDRV_CPU_ADD("maincpu",M68000,10000000)
MDRV_CPU_PROGRAM_MAP(pzletime_map)
MDRV_CPU_VBLANK_INT("screen",irq4_line_hold)
@@ -306,7 +306,7 @@ MACHINE_DRIVER_END
***************************************************************************/
ROM_START( pzletime )
- ROM_REGION( 0x400000, "cpu", 0 )
+ ROM_REGION( 0x400000, "maincpu", 0 )
ROM_LOAD16_BYTE( "5.bin", 0x000000, 0x80000, CRC(78b027dc) SHA1(6719908a075ecf0666bb817ac8a31056a7f315c6) )
ROM_LOAD16_BYTE( "1.bin", 0x000001, 0x80000, CRC(0a69cbc7) SHA1(bae8b5746209c6773da27acaec7bd535a69019d2) )
ROM_LOAD16_BYTE( "6.bin", 0x100000, 0x80000, CRC(526733ef) SHA1(21a921416d1ae7b9d49789d70ae99f240b012489) )
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 761ba9b6023..3154c5e7fae 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -236,7 +236,7 @@ static NVRAM_HANDLER( stlforce )
static MACHINE_DRIVER_START( stlforce )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu", M68000, 15000000)
+ MDRV_CPU_ADD("maincpu", M68000, 15000000)
MDRV_CPU_PROGRAM_MAP(stlforce_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
@@ -267,14 +267,14 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( twinbrat )
/* basic machine hardware */
MDRV_IMPORT_FROM(stlforce)
- MDRV_CPU_REPLACE("cpu", M68000, 14745600)
+ MDRV_CPU_REPLACE("maincpu", M68000, 14745600)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(3*8, 45*8-1, 0*8, 30*8-1)
MACHINE_DRIVER_END
ROM_START( stlforce )
- ROM_REGION( 0x80000, "cpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "stlforce.105", 0x00000, 0x20000, CRC(3ec804ca) SHA1(4efcf3321b7111644ac3ee0a83ad95d0571a4021) )
ROM_LOAD16_BYTE( "stlforce.104", 0x00001, 0x20000, CRC(69b5f429) SHA1(5bd20fad91a22f4d62f85a5190d72dd824ee26a5) )
@@ -336,7 +336,7 @@ Notes:
ROM_START( twinbrat )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 Code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 Code */
ROM_LOAD16_BYTE( "2.u105", 0x00000, 0x20000, CRC(33a9bb82) SHA1(0f54239397c93e264b9b211f67bf626acf1246a9) )
ROM_LOAD16_BYTE( "3.u104", 0x00001, 0x20000, CRC(b1186a67) SHA1(502074063101885874db76ae707db1082313efcf) )
@@ -369,7 +369,7 @@ ROM_START( twinbrat )
ROM_END
ROM_START( twinbrata )
- ROM_REGION( 0x40000, "cpu", 0 ) /* 68000 Code */
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 Code */
ROM_LOAD16_BYTE( "2.bin", 0x00000, 0x20000, CRC(5e75f568) SHA1(f42d2a73d737e6b01dd049eea2a10fc8c8096d8f) )
ROM_LOAD16_BYTE( "3.bin", 0x00001, 0x20000, CRC(0e3fa9b0) SHA1(0148cc616eac84dc16415e1557ec6040d14392d4) )
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index a01cc98f919..18953471fc8 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -120,7 +120,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tgtpanic )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu", Z80, XTAL_4MHz)
+ MDRV_CPU_ADD("maincpu", Z80, XTAL_4MHz)
MDRV_CPU_PROGRAM_MAP(prg_map)
MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 20) /* Unverified */
@@ -144,7 +144,7 @@ MACHINE_DRIVER_END
*************************************/
ROM_START( tgtpanic )
- ROM_REGION( 0x10000, "cpu", 0 )
+ ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "601_ja_a01.13e", 0x0000, 0x8000, CRC(ece71952) SHA1(0f9cbd8adac2b1950bc608d51f0f122399c8f00f) )
ROM_END
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index 701b55a75b4..0452572a73d 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( vega_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfcc00000, 0xfcc00003) AM_READ(vegaeo_custom_read)
AM_RANGE(0xfce00000, 0xfce00003) AM_READ_PORT("P1_P2")
AM_RANGE(0xfd000000, 0xfeffffff) AM_ROM AM_REGION("user1", 0)
- AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("cpu", 0)
+ AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END
static INPUT_PORTS_START( crazywar )
@@ -163,7 +163,7 @@ static VIDEO_UPDATE( vega )
static MACHINE_DRIVER_START( vega )
- MDRV_CPU_ADD("cpu", GMS30C2132, 55000000) /* 55 MHz */
+ MDRV_CPU_ADD("maincpu", GMS30C2132, 55000000) /* 55 MHz */
MDRV_CPU_PROGRAM_MAP(vega_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
@@ -233,7 +233,7 @@ Notes:
ROM_START( crazywar )
- ROM_REGION( 0x80000, "cpu", 0 ) /* Hyperstone CPU Code */
+ ROM_REGION( 0x80000, "maincpu", 0 ) /* Hyperstone CPU Code */
ROM_LOAD( "u7", 0x00000, 0x80000, CRC(697c2505) SHA1(c787007f05d2ddf1706e15e9d9ef9b2479708f12) )
ROM_REGION32_BE( 0x2000000, "user1", ROMREGION_ERASE00 ) /* Game Data - banked ROM, swapping necessary */