From cfc84195670f58e56539e5b65360a25a64949231 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 27 Nov 2016 09:59:14 +1100 Subject: [PATCH 01/12] Version bump --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index eebca8ab551..e2aa57f29fb 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 263a3ccd07a..f342c481ac5 100644 --- a/makefile +++ b/makefile @@ -1527,14 +1527,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.179"' > $@ + @echo '#define BARE_BUILD_VERSION "0.180"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.179" > $@ + @echo #define BARE_BUILD_VERSION "0.180" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ From 22b192ac3ed039e0acc304f173f32dcfbd652c27 Mon Sep 17 00:00:00 2001 From: Lord-Nightmare Date: Sat, 26 Nov 2016 18:24:40 -0500 Subject: [PATCH 02/12] build fix (nw) --- scripts/target/mame/mess.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 4aac2b0235d..db741938f7b 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -2026,7 +2026,7 @@ files { MAME_DIR .. "src/mame/machine/isbc_215g.cpp", MAME_DIR .. "src/mame/machine/isbc_215g.h", MAME_DIR .. "src/mame/machine/isbc_208.cpp", - MAME_DIR .. "src/mame/machine/isbc_280.h", + MAME_DIR .. "src/mame/machine/isbc_208.h", MAME_DIR .. "src/mame/drivers/rex6000.cpp", MAME_DIR .. "src/mame/drivers/sdk80.cpp", MAME_DIR .. "src/mame/drivers/sdk85.cpp", From c4954da8af944dfd229179235ae295c779eddf01 Mon Sep 17 00:00:00 2001 From: briantro Date: Sat, 26 Nov 2016 19:13:52 -0600 Subject: [PATCH 03/12] peplus.cpp: Correct hashes as pointed out by MASH - NW --- src/mame/drivers/peplus.cpp | 100 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index b37b253dc4a..10078ec55cf 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -1421,7 +1421,7 @@ ROM_START( peset001 ) /* Normal board : Set Chip (Set001) - PE+ Set Denomination ROM_LOAD( "set001.u68", 0x00000, 0x10000, CRC(03397ced) SHA1(89d8ba7e6706e6d34ae9aae09a8a631fff06a36f) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1435,7 +1435,7 @@ ROM_START( peset004 ) /* Normal board : Set Chip (Set004) - PE+ Set Denomination ROM_LOAD( "set004.u68", 0x00000, 0x10000, CRC(b5729571) SHA1(fa3bb1fec81692a898213f9521ac0b2a4d1a8968) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1449,7 +1449,7 @@ ROM_START( peset012 ) /* Normal board : Set Chip (Set012) - PE+ Set Denomination ROM_LOAD( "set012.u68", 0x00000, 0x10000, CRC(761d2799) SHA1(eab8d7f1eb05f2657b007ecfe3b1f2b38658bcf1) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1463,7 +1463,7 @@ ROM_START( peset022 ) /* Normal board : Set Chip (Set022) - PE+ Set Denomination ROM_LOAD( "set022.u68", 0x00000, 0x10000, CRC(bf470acc) SHA1(2a219246d70e46dea62a0b5ca828b543b453ce03) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1479,7 +1479,7 @@ ROM_START( peset038 ) /* Normal board : Set Chip (Set038) - PE+ Set Denomination ROM_LOAD( "set038.u68", 0x00000, 0x10000, CRC(9c4b1d1a) SHA1(8a65cd1d8e2d74c7b66f4dfc73e7afca8458e979) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1493,7 +1493,7 @@ ROM_START( peset100 ) /* Normal board : Set Chip (Set100) - PE+ Set Denomination ROM_LOAD( "set100.u68", 0x00000, 0x10000, CRC(9c97a3b7) SHA1(0e22c9019ee02f8634436d8f3e1ba5ee2db0267c) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1507,7 +1507,7 @@ ROM_START( peset117 ) /* Normal board : Set Chip (Set100) - PE+ Set Denomination ROM_LOAD( "set117.u68", 0x00000, 0x10000, CRC(91f6e10e) SHA1(905ea19b2d031cdb4b4a51578ca42008c29c3e19) ) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1522,7 +1522,7 @@ ROM_START( peivc006 ) /* Normal board : Clear Chip (IVC006) - PE+ Clear CMOS / E ROM_RELOAD( 0x08000, 0x8000) ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -1760,7 +1760,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) Programs Available: PK0733 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "pk0873-pc093.u58", 0x00000, 0x8000, CRC(8921b56c) SHA1(dd4c1a2a40c28ad1e0cd5692deb13877c26fcdd0) ) /* Game Version: PC093 */ + ROM_LOAD( "pk0773-pc041.u58", 0x00000, 0x8000, CRC(4b4ce88a) SHA1(a597614365223c1f0bec331672a1cf44877162ce) ) /* Game Version: PC041 */ ROM_RELOAD( 0x08000, 0x8000) /* 32K version build for the original PE boards (non-plus) */ ROM_REGION( 0x020000, "gfx1", 0 ) @@ -2246,7 +2246,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2352,7 +2352,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2376,7 +2376,7 @@ This program set is superseded by PP0060 ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2436,12 +2436,12 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) Programs Available: PP0014 */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "pp0014_654-523.u68", 0x00000, 0x8000, CRC(1cf42d0e) SHA1(a5564a6ff31a24e6052c95eaacce65c61dd1600d) ) /* Game Version: 665, Library Version: 523, Video Lib Ver: 523 */ + ROM_LOAD( "pp0014_654-523.u68", 0x00000, 0x8000, CRC(1cf42d0e) SHA1(a5564a6ff31a24e6052c95eaacce65c61dd1600d) ) /* Game Version: 654, Library Version: 523, Video Lib Ver: 523 */ ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* Not 100% correct?? */ - ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ + ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) /* Not 100% correct?? */ ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2463,7 +2463,7 @@ NOTE: REQUIRES Progressive link which is not currently supported ROM_LOAD( "pp0021_723-703.u68", 0x00000, 0x10000, CRC(58f2a68b) SHA1(72c0a29016b17f7e308a9e9b2d724771b5e26560) ) /* Game Version: 723, Library Version: 703 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2485,7 +2485,7 @@ PayTable 10s+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2632,7 +2632,7 @@ PayTable 10s+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0042_768-761.u68", 0x00000, 0x10000, CRC(424def20) SHA1(4a0c142d907c0651eef3eb0de57e6212ec268005) ) /* Game Version: 768, Library Version: 761, Video Lib Ver: 761 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2866,7 +2866,7 @@ PayTable 10s+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2911,7 +2911,7 @@ PayTable Ks+ 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2934,7 +2934,7 @@ PayTable Ks+ 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -2957,7 +2957,7 @@ PayTable Ks+ 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3071,7 +3071,7 @@ Superseded by PP0428 (Non Double-up) / PP0459 ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3361,7 +3361,7 @@ PayTable 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3425,7 +3425,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3471,7 +3471,7 @@ PayTable 10s+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3495,7 +3495,7 @@ PayTable Ks+ 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3520,7 +3520,7 @@ Superseded by PP0429 (Non Double-up) / PP0458 ROM_LOAD( "pp0065_944-a00.u68", 0x00000, 0x10000, CRC(76c1a367) SHA1(ea8be9241e9925b5a4206db6875e1572f85fa5fe) ) /* Game Version: 944, Library Version: A00 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3542,7 +3542,7 @@ PayTable 10s+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3565,7 +3565,7 @@ PayTable 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3587,7 +3587,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3734,7 +3734,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0104_741-728.u68", 0x00000, 0x10000, CRC(e248de8c) SHA1(05b95040d88d3e053a1c5ebfccb1964311ed7540) ) /* Game Version: 741, Library Version: 728, Game Lib ver: 728 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3756,7 +3756,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -3800,7 +3800,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4009,7 +4009,7 @@ Internally the program erroneously reports a 95.50% return, same as X000550P doe ROM_LOAD( "pp0129_a1n-a3b.u68", 0x00000, 0x10000, CRC(088b4c99) SHA1(9d3161d273c3360a31115da35ac7e5ca26042e24) ) /* Game Version: A1N, Library Version: A3B */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4190,7 +4190,7 @@ NOTE: While this is a 32K version, it does require DOOR OPEN cycling and isn't c ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4300,7 +4300,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0181_648-667.u68", 0x00000, 0x10000, CRC(b38ff1e1) SHA1(ae8d725a3352000c57cef4b7e7a39dbad940e9de) ) /* Game Version: 648, Library Version: 667 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4321,7 +4321,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0188_986-a0u.u68", 0x00000, 0x10000, CRC(cf36a53c) SHA1(99b578538ab24d9ff91971b1f77599272d1dbfc6) ) /* Game Version: 986, Library Version: A0U */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4384,7 +4384,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0189_644-624.u68", 0x00000, 0x10000, CRC(e6ad123b) SHA1(6ea3f2586e3e5fd2664a977bdda7bfb714ac1b0d) ) /* Game Version: 644, Library Version: 624 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4607,7 +4607,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0197_689-654.u68", 0x00000, 0x10000, CRC(84a2fbde) SHA1(0515f2693d388e29cdf0de4d29708250c671e0a4) ) /* Game Version: 689, Library Version: 654 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4765,7 +4765,7 @@ NOTE: While this is a 32K version, it does require DOOR OPEN cycling and isn't c ROM_RELOAD( 0x08000, 0x8000) /* 32K version built using earlier gaming libraries */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4871,7 +4871,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0221_884-899.u68", 0x00000, 0x10000, CRC(e1fd28fc) SHA1(8bbb0dee89ad3c28f1d32980c322a9585f5b6b1f) ) /* Game Version: 884, Library Version: 899 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -4961,7 +4961,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0230_715-702.u68", 0x00000, 0x10000, CRC(0272d8d6) SHA1(659f9149ab5e26283eaccd31588183c21c291adb) ) /* Game Version: 715, Library Version: 702 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5190,7 +5190,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0274_741-728.u68", 0x00000, 0x10000, CRC(cd0b2890) SHA1(5f859dbc8d747a198c735a2bff42279c874928b0) ) /* Game Version: 741, Library Version: 728, Viedo Lib ver: 728 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5325,7 +5325,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF 5K RF (Bonus) ROM_LOAD( "pp0294_777-785.u68", 0x00000, 0x10000, CRC(aba331b8) SHA1(ce5db8d6682e1eb9b535b93d70c399f8bdc9ff65) ) /* Game Version: 777, Library Version: 785 - 10-23-91 @ IGT L91-1149 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5525,7 +5525,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0419_768-761.u68", 0x00000, 0x10000, CRC(204f9ffe) SHA1(adfdc8b22ba5cc69234ad88ab2f92393a5fb3aff) ) /* Game Version: 768, Library Version: 761, Game Lib ver: 761 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5609,7 +5609,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0423_836-847.u68", 0x00000, 0x10000, CRC(12eec557) SHA1(3721d068223262260ad22698e7dca0440becc53e) ) /* Game Version: 836, Library Version: 847 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5630,7 +5630,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus) ROM_LOAD( "pp0423_768-761.u68", 0x00000, 0x10000, CRC(03f8f7a5) SHA1(b4570b022d312211de5809b0db2c5b7d1e087190) ) /* Game Version: 768, Library Version: 761 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -5828,7 +5828,7 @@ PayTable Js+ 2PR 3K STR FL FH 4K 4K 4A SF RF 5K RF (Bonus) ROM_LOAD( "pp0445_777-785.u68", 0x00000, 0x10000, CRC(37ae0789) SHA1(0b41bc88a998a20074315f8daf59dddfd0c3b3b3) ) /* Game Version: 777, Library Version: 785 - 05/12/92 @ IGT L92-0623 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) @@ -6021,7 +6021,7 @@ PayTable Ks+ 2P 3K STR FL FH 4K SF RF 5K RF (Bonus) ROM_LOAD( "pp0453_782-779.u68", 0x00000, 0x10000, CRC(3d1e88c3) SHA1(9b8b313f6d81a5c6dffc081ef54f883f526e707b) ) /* Game Version: 782, Library Version: 779 - 05-14-92 @ IGT L92-0611 */ ROM_REGION( 0x020000, "gfx1", 0 ) - ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) + ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) ) /* 08/12/87 @ IGT L87-2243 */ ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) ) ROM_LOAD( "mbo-cg740.u74", 0x10000, 0x8000, CRC(92e8c33e) SHA1(05344664d6fdd3f4205c50fa4ca76fc46c18cf8f) ) ROM_LOAD( "mxo-cg740.u75", 0x18000, 0x8000, CRC(ce4cbe0b) SHA1(4bafcd68be94a5deaae9661584fa0fc940b834bb) ) From 58a7cffdb3bba15a2bc5fa6d80cfd5d9593bb757 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 27 Nov 2016 17:44:44 -0500 Subject: [PATCH 04/12] mac128: switch back to real-hw ROMs using Apple part numbers. [R. Belmont] --- src/mame/drivers/mac128.cpp | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 29cbbfaa5d0..1c5c788a1c9 100755 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -1515,11 +1515,15 @@ ROM_END ROM_START( mac128k ) ROM_REGION16_BE(0x100000, "bootrom", 0) - ROM_LOAD16_WORD( "mac128k.rom", 0x00000, 0x10000, CRC(6d0c8a28) SHA1(9d86c883aa09f7ef5f086d9e32330ef85f1bc93b) ) + // Apple used at least 3 manufacturers for these ROMs, but they're always Apple part numbers 342-0220-A and 342-0221-A + ROMX_LOAD("342-0220-a.u6d", 0x00000, 0x08000, CRC(198210ad) SHA1(2590ff4af5ac0361babdf0dc5da18e2eecad454a), ROM_SKIP(1) ) + ROMX_LOAD("342-0221-a.u8d", 0x00001, 0x08000, CRC(fd2665c2) SHA1(8507932a854bd28196a17785c8b1851cb53eaf64), ROM_SKIP(1) ) ROM_END ROM_START( mac512k ) ROM_REGION16_BE(0x100000, "bootrom", 0) + ROMX_LOAD("342-0220-b.u6d", 0x00000, 0x08000, CRC(0dce9a3f) SHA1(101ca6570f5a273e400d1a8bc63e15ee0e94153e), ROM_SKIP(1) ) // " 512 VH 6434 // 23256-1104 // 342-0220-B // (C) APPLE 84 // KOREA-A" + ROMX_LOAD("342-0221-b.u8d", 0x00001, 0x08000, CRC(d51f376e) SHA1(575586109e876cffa4a4d472cb38771aa21b70cb), ROM_SKIP(1) ) // " 512 VH 6709 // 23256-1105 // 342-0221-B // (C) APPLE 84 // KOREA-A" ROM_LOAD16_WORD( "mac512k.rom", 0x00000, 0x10000, CRC(cf759e0d) SHA1(5b1ced181b74cecd3834c49c2a4aa1d7ffe944d7) ) ROM_END @@ -1531,8 +1535,8 @@ ROM_END ROM_START( utrn1024 ) ROM_REGION16_BE(0x100000, "bootrom", 0) // CRCs match the original "Lonely Hearts" version 1 Mac Plus ROM: 4d1eeee1 - ROM_LOAD16_BYTE( "macplus_mem_h.e6", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b) ) - ROM_LOAD16_BYTE( "macplus_mem_l.e7", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7) ) + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) ROM_END /* @@ -1572,23 +1576,39 @@ ROM_END ROM_START( mac512ke ) ROM_REGION16_BE(0x100000, "bootrom", 0) - ROM_LOAD16_WORD( "macplus.rom", 0x00000, 0x20000, CRC(b2102e8e) SHA1(7d2f808a045aa3a1b242764f0e2c7d13e288bf1f)) + ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") + ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a different label when made by AMI: "342-0341-C // (C)APPLE 85,86 // (M)AMI 8849MBL // PHILLIPINES" + ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a later VLSI label like "VLSI // 8905AV 0 AS759 // 23512-1055 // 342-0342-B // (C)APPLE '85-'86" + ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present + ROM_FILL(0x40000, 0x2, 0xaa) + ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") + ROMX_LOAD( "342-0341-b.u6d", 0x000000, 0x010000, CRC(65341487) SHA1(bf43fa4f5a3dcbbac20f1fe1deedee0895454379), ROM_SKIP(1) | ROM_BIOS(2) ) + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(2) ) + ROM_FILL(0x20000, 0x2, 0xff) + ROM_FILL(0x40000, 0x2, 0xaa) + ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two roms may be slightly different from what is listed here, as they are very rare except in 512ke machines; the first part of this label is likely vti____23512-1008__ etc. + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two rom may be slightly different from what is listed here, as they are very rare except in 512ke machines; this rom is identical to one of the v2 roms. + ROM_FILL(0x20000, 0x2, 0xff) + ROM_FILL(0x40000, 0x2, 0xaa) ROM_END ROM_START( macplus ) ROM_REGION16_BE(0x100000, "bootrom", 0) ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") - ROMX_LOAD( "macplus.rom", 0x00000, 0x20000, CRC(b2102e8e) SHA1(7d2f808a045aa3a1b242764f0e2c7d13e288bf1f), ROM_GROUPWORD | ROM_BIOS(1) ) + ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a different label when made by AMI: "342-0341-C // (C)APPLE 85,86 // (M)AMI 8849MBL // PHILLIPINES" + ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a later VLSI label like "VLSI // 8905AV 0 AS759 // 23512-1055 // 342-0342-B // (C)APPLE '85-'86" ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present ROM_FILL(0x40000, 0x2, 0xaa) ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") - ROMX_LOAD( "23512-1007__342-0342-a.rom-lo.u7d", 0x000000, 0x010000, CRC(5aaa4a2f) SHA1(5dfbfbe279ddadfae691c95f552fd9db41e3ed90), ROM_SKIP(1) | ROM_BIOS(2) ) - ROMX_LOAD( "23512-1010__342-0341-b.rom-hi.u6d", 0x000001, 0x010000, CRC(65341487) SHA1(bf43fa4f5a3dcbbac20f1fe1deedee0895454379), ROM_SKIP(1) | ROM_BIOS(2) ) + ROMX_LOAD( "342-0341-b.u6d", 0x000000, 0x010000, CRC(65341487) SHA1(bf43fa4f5a3dcbbac20f1fe1deedee0895454379), ROM_SKIP(1) | ROM_BIOS(2) ) + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(2) ) ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") - ROMX_LOAD( "4d1eeee1 - macplus v1.rom", 0x000000, 0x020000, CRC(4fa5b399) SHA1(e0da7165b92dee90d8b1522429c033729fa73fd2), ROM_GROUPWORD | ROM_BIOS(3) ) + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two roms may be slightly different from what is listed here, as they are very rare except in 512ke machines; the first part of this label is likely vti____23512-1008__ etc. + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two rom may be slightly different from what is listed here, as they are very rare except in 512ke machines; this rom is identical to one of the v2 roms. ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) ROM_SYSTEM_BIOS(3, "romdisk", "mac68k.info self-boot (1/1/2015)") From 86d5a83a476d0c299d2dea0cc6734e8d6f1b0807 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 27 Nov 2016 21:12:56 -0500 Subject: [PATCH 05/12] (nw) --- src/mame/drivers/mac128.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 1c5c788a1c9..8ec8e19bbfe 100755 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -1524,7 +1524,6 @@ ROM_START( mac512k ) ROM_REGION16_BE(0x100000, "bootrom", 0) ROMX_LOAD("342-0220-b.u6d", 0x00000, 0x08000, CRC(0dce9a3f) SHA1(101ca6570f5a273e400d1a8bc63e15ee0e94153e), ROM_SKIP(1) ) // " 512 VH 6434 // 23256-1104 // 342-0220-B // (C) APPLE 84 // KOREA-A" ROMX_LOAD("342-0221-b.u8d", 0x00001, 0x08000, CRC(d51f376e) SHA1(575586109e876cffa4a4d472cb38771aa21b70cb), ROM_SKIP(1) ) // " 512 VH 6709 // 23256-1105 // 342-0221-B // (C) APPLE 84 // KOREA-A" - ROM_LOAD16_WORD( "mac512k.rom", 0x00000, 0x10000, CRC(cf759e0d) SHA1(5b1ced181b74cecd3834c49c2a4aa1d7ffe944d7) ) ROM_END ROM_START( unitron ) From 391c406c82ce1b470a0349672d48df01ba869a93 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 27 Nov 2016 20:28:34 -0500 Subject: [PATCH 06/12] Use autofinder for Seibu sound ROM bank; fix airraid regression (nw) --- src/mame/audio/seibu.cpp | 17 ++++++++++++----- src/mame/audio/seibu.h | 5 +++++ src/mame/drivers/airraid.cpp | 6 +++--- src/mame/drivers/bloodbro.cpp | 1 + src/mame/drivers/cabal.cpp | 4 ++-- src/mame/drivers/dcon.cpp | 2 ++ src/mame/drivers/deadang.cpp | 1 + src/mame/drivers/dynduke.cpp | 1 + src/mame/drivers/goodejan.cpp | 1 + src/mame/drivers/legionna.cpp | 6 ++++++ src/mame/drivers/nmk16.cpp | 2 ++ src/mame/drivers/r2dx_v33.cpp | 1 + src/mame/drivers/raiden.cpp | 1 + src/mame/drivers/raiden2.cpp | 2 ++ src/mame/drivers/sengokmj.cpp | 1 + src/mame/drivers/shanghai.cpp | 1 + src/mame/drivers/toki.cpp | 1 + 17 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp index f991dfa7685..9e2f8fe128e 100644 --- a/src/mame/audio/seibu.cpp +++ b/src/mame/audio/seibu.cpp @@ -79,6 +79,7 @@ seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char m_ym_write_cb(*this), m_sound_cpu(*this, finder_base::DUMMY_TAG), m_sound_rom(*this, finder_base::DUMMY_TAG), + m_rom_bank(*this, finder_base::DUMMY_TAG), m_main2sub_pending(0), m_sub2main_pending(0), m_rst10_irq(0xff), @@ -92,6 +93,11 @@ void seibu_sound_device::static_set_cpu_tag(device_t &device, const char *tag) downcast(device).m_sound_rom.set_tag(tag); } +void seibu_sound_device::static_set_rombank_tag(device_t &device, const char *tag) +{ + downcast(device).m_rom_bank.set_tag(tag); +} + //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -101,16 +107,16 @@ void seibu_sound_device::device_start() m_ym_read_cb.resolve_safe(0); m_ym_write_cb.resolve_safe(); - if (m_sound_rom.found() && membank(":seibu_bank1") != nullptr) + if (m_sound_rom.found() && m_rom_bank.found()) { if (m_sound_rom.length() > 0x10000) { - membank(":seibu_bank1")->configure_entries(0, (m_sound_rom.length() - 0x10000) / 0x8000, &m_sound_rom[0x10000], 0x8000); + m_rom_bank->configure_entries(0, (m_sound_rom.length() - 0x10000) / 0x8000, &m_sound_rom[0x10000], 0x8000); /* Denjin Makai definitely needs this at start-up, it never writes to the bankswitch */ - membank(":seibu_bank1")->set_entry(0); + m_rom_bank->set_entry(0); } else - membank(":seibu_bank1")->set_base(&m_sound_rom[0x8000]); + m_rom_bank->set_base(&m_sound_rom[0x8000]); } m_main2sub[0] = m_main2sub[1] = 0; @@ -205,7 +211,8 @@ WRITE8_MEMBER( seibu_sound_device::ym_w ) WRITE8_MEMBER( seibu_sound_device::bank_w ) { - membank(":seibu_bank1")->set_entry(data & 1); + if (m_rom_bank.found()) + m_rom_bank->set_entry(data & 1); } WRITE8_MEMBER( seibu_sound_device::coin_w ) diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index d28dde05343..20909371d2c 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -38,6 +38,7 @@ public: // static configuration static void static_set_cpu_tag(device_t &device, const char *tag); + static void static_set_rombank_tag(device_t &device, const char *tag); template static devcb_base &set_ym_read_callback(device_t &device, _Object object) { return downcast(device).m_ym_read_cb.set_callback(object); } template static devcb_base &set_ym_write_callback(device_t &device, _Object object) { return downcast(device).m_ym_write_cb.set_callback(object); } @@ -72,6 +73,7 @@ private: // internal state required_device m_sound_cpu; optional_region_ptr m_sound_rom; + optional_memory_bank m_rom_bank; uint8_t m_main2sub[2]; uint8_t m_sub2main[2]; int m_main2sub_pending; @@ -170,6 +172,9 @@ extern const device_type SEIBU_ADPCM; #define MCFG_SEIBU_SOUND_CPU(_audiocputag) \ seibu_sound_device::static_set_cpu_tag(*device, "^" _audiocputag); +#define MCFG_SEIBU_SOUND_ROMBANK(_banktag) \ + seibu_sound_device::static_set_rombank_tag(*device, "^" _banktag); + #define MCFG_SEIBU_SOUND_YM_READ_CB(_devcb) \ devcb = &seibu_sound_device::set_ym_read_callback(*device, DEVCB_##_devcb); diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index 4c8fe1ad569..66dca1cc59f 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -292,12 +292,12 @@ static ADDRESS_MAP_START( airraid_sound_map, AS_PROGRAM, 8, airraid_state ) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_DEVWRITE("seibu_sound", seibu_sound_device, main_data_w) AM_RANGE(0x401b, 0x401b) AM_DEVWRITE("seibu_sound", seibu_sound_device, coin_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1") + AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( airraid_sound_decrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, airraid_state ) AM_RANGE(0x0000, 0x1fff) AM_DEVREAD("sei80bu", sei80bu_device, opcode_r) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1") + AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("audiocpu", 0x8000) ADDRESS_MAP_END @@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( airraid, airraid_state ) MCFG_SOUND_ROUTE(1, "mono", 0.50) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) - MCFG_SEIBU_SOUND_CPU("audiocpu") //_ENCRYPTED_LOW("audiocpu") + MCFG_SEIBU_SOUND_CPU("audiocpu") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp index f4bd0d168e0..1e445a31e1b 100644 --- a/src/mame/drivers/bloodbro.cpp +++ b/src/mame/drivers/bloodbro.cpp @@ -519,6 +519,7 @@ static MACHINE_CONFIG_START( bloodbro, bloodbro_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 8181b360f0c..8d4ba39b7af 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cabal_state ) AM_RANGE(0x401b, 0x401b) AM_DEVWRITE("seibu_sound", seibu_sound_device, coin_w) AM_RANGE(0x6005, 0x6006) AM_DEVWRITE("adpcm2", seibu_adpcm_device, adr_w) AM_RANGE(0x601a, 0x601a) AM_DEVWRITE("adpcm2", seibu_adpcm_device, ctl_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1") + AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_decrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, cabal_state ) @@ -237,7 +237,7 @@ static ADDRESS_MAP_START( cabalbl2_sound_map, AS_PROGRAM, 8, cabal_state ) AM_RANGE(0x401b, 0x401b) AM_DEVWRITE("seibu_sound", seibu_sound_device, coin_w) AM_RANGE(0x6005, 0x6006) AM_DEVWRITE("adpcm2", seibu_adpcm_device, adr_w) AM_RANGE(0x601a, 0x601a) AM_DEVWRITE("adpcm2", seibu_adpcm_device, ctl_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1") + AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl2_predecrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, cabal_state ) diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp index 987a560f180..9a9aca38a4f 100644 --- a/src/mame/drivers/dcon.cpp +++ b/src/mame/drivers/dcon.cpp @@ -296,6 +296,7 @@ static MACHINE_CONFIG_START( dcon, dcon_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END @@ -340,6 +341,7 @@ static MACHINE_CONFIG_START( sdgndmps, dcon_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp index 56ba645b3b4..b3eccfcd52f 100644 --- a/src/mame/drivers/deadang.cpp +++ b/src/mame/drivers/deadang.cpp @@ -302,6 +302,7 @@ static MACHINE_CONFIG_START( deadang, deadang_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ym1", ym2203_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ym1", ym2203_device, write)) diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index 2dcc64d7a39..d9bc9ef20ef 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -349,6 +349,7 @@ static MACHINE_CONFIG_START( dynduke, dynduke_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index 0d546506d34..9b0dfac068a 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -667,6 +667,7 @@ static MACHINE_CONFIG_START( goodejan, goodejan_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 2cd7d796634..bdaf31ad51b 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1196,6 +1196,7 @@ static MACHINE_CONFIG_START( legionna, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END @@ -1248,6 +1249,7 @@ static MACHINE_CONFIG_START( heatbrl, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END @@ -1301,6 +1303,7 @@ static MACHINE_CONFIG_START( godzilla, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END @@ -1353,6 +1356,7 @@ static MACHINE_CONFIG_START( denjinmk, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END @@ -1405,6 +1409,7 @@ static MACHINE_CONFIG_START( grainbow, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END @@ -1458,6 +1463,7 @@ static MACHINE_CONFIG_START( cupsoc, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 83610b6d36f..0117753a91b 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -3977,6 +3977,7 @@ static MACHINE_CONFIG_START( mustangb, nmk16_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END @@ -4163,6 +4164,7 @@ static MACHINE_CONFIG_START( tdragonb, nmk16_state ) /* bootleg using Raiden MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index e7582d8bfbf..8f592bbae63 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -839,6 +839,7 @@ static MACHINE_CONFIG_START( nzerotea, r2dx_v33_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index d3077bf2d11..05bbd7cac43 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -338,6 +338,7 @@ static MACHINE_CONFIG_START( raiden, raiden_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index d35ba423225..ebc4557bae7 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -1456,6 +1456,7 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END @@ -1523,6 +1524,7 @@ static MACHINE_CONFIG_START( zeroteam, raiden2_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index fa6d50e17ca..1926b208b9a 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -605,6 +605,7 @@ static MACHINE_CONFIG_START( sengokmj, sengokmj_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index 97ce2bcd7dd..246ced6c2bf 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -486,6 +486,7 @@ static MACHINE_CONFIG_START( kothello, shanghai_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2203_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2203_device, write)) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 392762ca650..e2b56a2adc5 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -523,6 +523,7 @@ static MACHINE_CONFIG_START( toki, toki_state ) /* KOYO 20.000MHz near the cpu * MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END From b76db864d75e58bdd9c49223b76f34d7c718591d Mon Sep 17 00:00:00 2001 From: Lord-Nightmare Date: Sun, 27 Nov 2016 22:54:01 -0500 Subject: [PATCH 07/12] clean up comments, and removed an improper ROM_BIOS() entry. (nw) --- src/mame/drivers/mac128.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 8ec8e19bbfe..e11648e03c1 100755 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -1534,8 +1534,8 @@ ROM_END ROM_START( utrn1024 ) ROM_REGION16_BE(0x100000, "bootrom", 0) // CRCs match the original "Lonely Hearts" version 1 Mac Plus ROM: 4d1eeee1 - ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) - ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) ) // not correct label + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) ) // not correct label ROM_END /* @@ -1575,19 +1575,19 @@ ROM_END ROM_START( mac512ke ) ROM_REGION16_BE(0x100000, "bootrom", 0) - ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") - ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a different label when made by AMI: "342-0341-C // (C)APPLE 85,86 // (M)AMI 8849MBL // PHILLIPINES" - ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a later VLSI label like "VLSI // 8905AV 0 AS759 // 23512-1055 // 342-0342-B // (C)APPLE '85-'86" + ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") // AMI and VLSI manufacture + ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) + ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present ROM_FILL(0x40000, 0x2, 0xaa) - ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") + ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") // VTi manufacture ROMX_LOAD( "342-0341-b.u6d", 0x000000, 0x010000, CRC(65341487) SHA1(bf43fa4f5a3dcbbac20f1fe1deedee0895454379), ROM_SKIP(1) | ROM_BIOS(2) ) ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(2) ) ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) - ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") - ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two roms may be slightly different from what is listed here, as they are very rare except in 512ke machines; the first part of this label is likely vti____23512-1008__ etc. - ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two rom may be slightly different from what is listed here, as they are very rare except in 512ke machines; this rom is identical to one of the v2 roms. + ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") // VTi manufacture + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) ROM_END @@ -1595,19 +1595,19 @@ ROM_END ROM_START( macplus ) ROM_REGION16_BE(0x100000, "bootrom", 0) - ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") - ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a different label when made by AMI: "342-0341-C // (C)APPLE 85,86 // (M)AMI 8849MBL // PHILLIPINES" - ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) // these also appeared with a later VLSI label like "VLSI // 8905AV 0 AS759 // 23512-1055 // 342-0342-B // (C)APPLE '85-'86" + ROM_SYSTEM_BIOS(0, "v3", "Loud Harmonicas") // AMI and VLSI manufacture + ROMX_LOAD( "342-0341-c.u6d", 0x000000, 0x010000, CRC(f69697e6) SHA1(41317614ac71eb94941e9952f6ea37407e21ffff), ROM_SKIP(1) | ROM_BIOS(1) ) + ROMX_LOAD( "342-0342-b.u8d", 0x000001, 0x010000, CRC(49f25913) SHA1(72f658c02bae265e8845899582575fb7c784ee87), ROM_SKIP(1) | ROM_BIOS(1) ) ROM_FILL(0x20000, 0x2, 0xff) // ROM checks for same contents at 20000 and 40000 to determine if SCSI is present ROM_FILL(0x40000, 0x2, 0xaa) - ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") + ROM_SYSTEM_BIOS(1, "v2", "Lonely Heifers") // VTi manufacture ROMX_LOAD( "342-0341-b.u6d", 0x000000, 0x010000, CRC(65341487) SHA1(bf43fa4f5a3dcbbac20f1fe1deedee0895454379), ROM_SKIP(1) | ROM_BIOS(2) ) ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(2) ) ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) - ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") - ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two roms may be slightly different from what is listed here, as they are very rare except in 512ke machines; the first part of this label is likely vti____23512-1008__ etc. - ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) // label of these two rom may be slightly different from what is listed here, as they are very rare except in 512ke machines; this rom is identical to one of the v2 roms. + ROM_SYSTEM_BIOS(2, "v1", "Lonely Hearts") // VTi manufacture + ROMX_LOAD( "342-0341-a.u6d", 0x000000, 0x010000, CRC(5095fe39) SHA1(be780580033d914b5035d60b5ebbd66bd1d28a9b), ROM_SKIP(1) | ROM_BIOS(3) ) + ROMX_LOAD( "342-0342-a.u8d", 0x000001, 0x010000, CRC(fb766270) SHA1(679f529fbfc05f9cc98924c53457d2996dfcb1a7), ROM_SKIP(1) | ROM_BIOS(3) ) ROM_FILL(0x20000, 0x2, 0xff) ROM_FILL(0x40000, 0x2, 0xaa) ROM_SYSTEM_BIOS(3, "romdisk", "mac68k.info self-boot (1/1/2015)") From 4c0de7982e24e69214256db8a6974d36c30e8289 Mon Sep 17 00:00:00 2001 From: Brad Hughes Date: Mon, 28 Nov 2016 07:36:50 -0500 Subject: [PATCH 08/12] Small 32 bit windows monitor module fix (nw) --- src/osd/modules/monitor/monitor_win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/modules/monitor/monitor_win32.cpp b/src/osd/modules/monitor/monitor_win32.cpp index 60917b2adbd..f5e273a8bb6 100644 --- a/src/osd/modules/monitor/monitor_win32.cpp +++ b/src/osd/modules/monitor/monitor_win32.cpp @@ -31,7 +31,7 @@ private: public: win32_monitor_info(monitor_module& module, const HMONITOR handle, const char* monitor_device, float aspect) - : osd_monitor_info(module, std::intptr_t(handle), monitor_device, aspect) + : osd_monitor_info(module, std::uintptr_t(handle), monitor_device, aspect) { win32_monitor_info::refresh(); } From 0136468462dfe8d235bed2b3f2a4b501e5539b66 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Mon, 28 Nov 2016 19:16:39 +0100 Subject: [PATCH 09/12] dirom: Document the interface evalution [O. Galibert] --- docs/source/techspecs/device_rom_interface.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/source/techspecs/device_rom_interface.rst b/docs/source/techspecs/device_rom_interface.rst index 5d5dbc26192..ab5eb18737b 100644 --- a/docs/source/techspecs/device_rom_interface.rst +++ b/docs/source/techspecs/device_rom_interface.rst @@ -28,11 +28,17 @@ Use that method at machine config time to provide an address map for the bus to connect to. It has priority over a rom region if one is also present. +| **MCFG_DEVICE_ROM**\ (tag) + +Used to select a rom region to use if a device address map is not +given. Defaults to DEVICE_SELF, e.g. the device tag. + | **ROM_REGION**\ (length, tag, flags) -If a rom region with a tag identical to the device tag is provided in -the rom description for the system, it will be automatically picked up -as the connected rom. An address map has priority over the region if +If a rom region with a tag as given with **MCFG_DEVICE_ROM** if +present, or identical to the device tag otherwise, is provided in the +rom description for the system, it will be automatically picked up as +the connected rom. An address map has priority over the region if present in the machine config. | void **set_rom**\ (const void \*base, UINT32 size); From ad671198de5b0f7c223bad3ef696a9001cdd85cd Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 28 Nov 2016 10:03:34 -0500 Subject: [PATCH 10/12] Seibu Cup Soccer uses a YM3812, not YM2151 (nw) --- src/mame/drivers/legionna.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index bdaf31ad51b..7e420573db1 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1453,10 +1453,9 @@ static MACHINE_CONFIG_START( cupsoc, legionna_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 14318180/4) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) - MCFG_SOUND_ROUTE(0, "mono", 0.50) - MCFG_SOUND_ROUTE(1, "mono", 0.50) + MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4) + MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) @@ -1464,8 +1463,8 @@ static MACHINE_CONFIG_START( cupsoc, legionna_state ) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") - MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) + MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) + MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cupsocs, cupsoc ) From e2c6632bc43c19dedb393444cc7cc2979139cedd Mon Sep 17 00:00:00 2001 From: arbee Date: Mon, 28 Nov 2016 21:21:16 -0500 Subject: [PATCH 11/12] mac: Fix regression in IIvx & IIvi. [R. Belmont] --- src/mame/machine/mac.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp index 700b48f0586..a6dce23bc90 100644 --- a/src/mame/machine/mac.cpp +++ b/src/mame/machine/mac.cpp @@ -440,8 +440,8 @@ void mac_state::set_memory_overlay(int overlay) mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); } } - else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIVX) || (m_model == MODEL_MAC_IIFX)) - { + else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIFX)) + { address_space& space = m_maincpu->space(AS_PROGRAM); space.unmap_write(0x000000, 0x9fffff); mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); @@ -452,11 +452,11 @@ void mac_state::set_memory_overlay(int overlay) space.unmap_write(0x000000, 0xffffff); mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); } - else if ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30)) + else if ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30) && (m_model != MODEL_MAC_IIVX) && (m_model != MODEL_MAC_IIVI)) { mac_install_memory(0x00000000, 0x3fffffff, memory_size, memory_data, is_rom, "bank1"); } - else if ((m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB + else if ((m_model == MODEL_MAC_IIVX) || (m_model == MODEL_MAC_IIVI) || (m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB { mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); @@ -497,8 +497,8 @@ READ32_MEMBER(mac_state::rom_switch_r) { set_memory_overlay(0); } - -// printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2)); + + //printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2)); return ROM_data[offset & ((ROM_size - 1)>>2)]; } @@ -1966,6 +1966,10 @@ void mac_state::machine_reset() { m_overlay_timeout->adjust(attotime::never); } + else if ((m_model >= MODEL_MAC_IIVX) && (m_model <= MODEL_MAC_IIVI)) + { + m_overlay_timeout->adjust(attotime::never); + } else { m_overlay_timeout->adjust(m_maincpu->cycles_to_attotime(8)); From 66f1cb5f3a3b229d8192e1a0fd9db867e3f21d5c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 30 Nov 2016 07:04:04 +1100 Subject: [PATCH 12/12] srcclean again (nw) --- docs/source/advanced/index.rst | 2 +- docs/source/advanced/shiftertoggle.rst | 4 +-- docs/source/initialsetup/compilingmame.rst | 16 ++++----- docs/source/initialsetup/installingmame.rst | 2 +- docs/source/initialsetup/mameintro.rst | 4 +-- docs/source/security.rst | 2 +- docs/source/techspecs/floppy.rst | 12 +++---- docs/source/techspecs/index.rst | 2 +- docs/source/techspecs/nscsi.rst | 8 ++--- docs/source/tools/imgtool.rst | 36 ++++++++++----------- docs/source/tools/othertools.rst | 6 ++-- docs/source/usingmame/aboutromsets.rst | 4 +-- docs/source/usingmame/commonissues.rst | 2 +- docs/source/usingmame/frontends.rst | 6 ++-- docs/source/usingmame/index.rst | 2 +- docs/source/usingmame/mamemenus.rst | 2 +- docs/source/whatis.rst | 2 +- src/mame/machine/mac.cpp | 4 +-- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/docs/source/advanced/index.rst b/docs/source/advanced/index.rst index 8ce1dfee49c..8b7407dcdb8 100644 --- a/docs/source/advanced/index.rst +++ b/docs/source/advanced/index.rst @@ -10,4 +10,4 @@ Advanced configuration bgfx hlsl glsl - devicemap \ No newline at end of file + devicemap diff --git a/docs/source/advanced/shiftertoggle.rst b/docs/source/advanced/shiftertoggle.rst index 2148e1bd4fd..9ea5214b980 100644 --- a/docs/source/advanced/shiftertoggle.rst +++ b/docs/source/advanced/shiftertoggle.rst @@ -27,7 +27,7 @@ Inside the *spyhunt.cfg* file, you will find the following for the input. The ac | JOYCODE_1_RYAXIS_NEG_SWITCH OR JOYCODE_1_RYAXIS_POS_SWITCH | | -| +| The line you need to edit will be the port line defining the actual input. For Spy Hunter, that's going to be *P1_BUTTON2*. Add **toggle="no"** to the end of the tag, like follows: @@ -36,6 +36,6 @@ The line you need to edit will be the port line defining the actual input. For S | JOYCODE_1_RYAXIS_NEG_SWITCH OR JOYCODE_1_RYAXIS_POS_SWITCH | | -| +| Save and exit. To disable this, simply remove the **toggle="no"** from each desired .CFG input. diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst index 889658bb29e..7acedb69ff0 100644 --- a/docs/source/initialsetup/compilingmame.rst +++ b/docs/source/initialsetup/compilingmame.rst @@ -7,11 +7,11 @@ All Platforms ------------- * Whenever you are changing build parameters, (such as switching between a SDL-based build and a native Windows renderer one, or adding tools to the compile list) you need to run a **make REGENIE=1** to allow the settings to be regenerated. Failure to do this will cause you very difficult to troubleshoot problems. - + * If you want to add various additional tools to the compile, such as *CHDMAN*, add a **TOOLS=1** to your make statement, like **make REGENIE=1 TOOLS=1** - + * You can do driver specific builds by using *SOURCES=* in your make statement. For instance, building Pac-Man by itself would be **make SOURCES=src/mame/drivers/pacman.cpp REGENIE=1** including the necessary *REGENIE* for rebuilding the settings. - + * Speeding up the compilation can be done by using more cores from your CPU. This is done with the **-j** parameter. *Note: the maximum number you should use is the number of cores your CPU has, plus one. No higher than that will speed up the compilation, and may in fact slow it down.* For instance, **make -j5** on a quad-core CPU will provide optimal speed. * Debugging information can be added to a compile using *SYMBOLS=1* though most users will not want or need to use this. @@ -21,12 +21,12 @@ Putting all of these together, we get a couple of examples: Rebuilding MAME for just the Pac-Man driver, with tools, on a quad-core (e.g. i5 or i7) machine: | **make SOURCES=src/mame/drivers/pacman.cpp TOOLS=1 REGENIE=1 -j5** -| +| Rebuilding MAME on a dual-core (e.g. i3 or laptop i5) machine: | **make -j3** -| +| Microsoft Windows @@ -36,7 +36,7 @@ Here are specific notes about compiling MAME for Microsoft Windows. * Refer to `the MAME tools site `_ for the latest toolkit for getting MAME compiled on Windows. -* You will need to download the toolset from that link to begin. Periodically, these tools are updated and newer versions of MAME from that point on will **require** updated tools to compile. +* You will need to download the toolset from that link to begin. Periodically, these tools are updated and newer versions of MAME from that point on will **require** updated tools to compile. * You can do compilation on Visual Studio 2015 (if installed on your PC) by using **make vs2015**. This will always regenerate the settings, so **REGENIE=1** is *not* needed. @@ -96,12 +96,12 @@ It's possible to get MAME working from 10.6, but a bit more complicated: * You'll need to install clang-3.7, ld64, libcxx and python27 from MacPorts * Then add these options to your make command or useroptions.mak: -| +| | OVERRIDE_CC=/opt/local/bin/clang-mp-3.7 | OVERRIDE_CXX=/opt/local/bin/clang++-mp-3.7 | PYTHON_EXECUTABLE=/opt/local/bin/python2.7 | ARCHOPTS=-stdlib=libc++ -| +| Emscripten Javascript and HTML diff --git a/docs/source/initialsetup/installingmame.rst b/docs/source/initialsetup/installingmame.rst index fefaad06543..76aa4a51875 100644 --- a/docs/source/initialsetup/installingmame.rst +++ b/docs/source/initialsetup/installingmame.rst @@ -10,4 +10,4 @@ You simply have to download the latest binary archive available from http://www. Other Operating Systems ----------------------- -In this case, you can either look for pre-compiled (SDL)MAME binaries (e.g. in the repositories of your favorite Linux distro) which should simply extract all the needed files in a folder you choose, or compile the source code by yourself. In the latter case, see our section on :ref:`compiling-mame`. \ No newline at end of file +In this case, you can either look for pre-compiled (SDL)MAME binaries (e.g. in the repositories of your favorite Linux distro) which should simply extract all the needed files in a folder you choose, or compile the source code by yourself. In the latter case, see our section on :ref:`compiling-mame`. diff --git a/docs/source/initialsetup/mameintro.rst b/docs/source/initialsetup/mameintro.rst index 03577da2595..b63a6b3beda 100644 --- a/docs/source/initialsetup/mameintro.rst +++ b/docs/source/initialsetup/mameintro.rst @@ -18,10 +18,10 @@ Systems Emulated by MAME ======================== -ProjectMESS contains a complete list of the systems currently emulated. As you will notice, being supported does not always mean that the status of the emulation is perfect. You may want +ProjectMESS contains a complete list of the systems currently emulated. As you will notice, being supported does not always mean that the status of the emulation is perfect. You may want 1. to check the status of the emulation in the wiki pages of each system, accessible from the drivers page (e.g. for Apple Macintosh, from the page for the mac.c driver you can reach the pages for both **macplus** and **macse**), -2. to read the corresponding **sysinfo.dat** entry in order to better understand which issues you may encounter while running a system in MAME (again, for Apple Macintosh Plus you have to check this entry). +2. to read the corresponding **sysinfo.dat** entry in order to better understand which issues you may encounter while running a system in MAME (again, for Apple Macintosh Plus you have to check this entry). Alternatively, you can simply see the status by yourself, launching the system emulation and taking a look to the red or yellow warning screen which appears before the emulation starts, if any. Notice that if you have information which can help to improve the emulation of a supported system, or if you can directly contribute fixes and/or addition to the current source, you can follow the instructions at the contact page or post to the MAME Forums at http://forum.mamedev.org/ diff --git a/docs/source/security.rst b/docs/source/security.rst index e23979d2ac4..d8fc372c614 100644 --- a/docs/source/security.rst +++ b/docs/source/security.rst @@ -5,4 +5,4 @@ MAME is not intended or designed to run in secure sites. It has not been securit **We do not suggest or condone the use of MAME as administrator or root and use as such is done at your own risk.** -Bug reports, however, are always welcome. \ No newline at end of file +Bug reports, however, are always welcome. diff --git a/docs/source/techspecs/floppy.rst b/docs/source/techspecs/floppy.rst index af4b13dc367..2bb91c66ca0 100644 --- a/docs/source/techspecs/floppy.rst +++ b/docs/source/techspecs/floppy.rst @@ -115,7 +115,7 @@ Once the cell data stream is extracted decoding depends on the encoding. In the 2.3.2. Sector-level organization '''''''''''''''''''''''''''''''' - + Floppies have been designed for read/write random access to reasonably sized blocks of data. Track selection allows for a first level of random access and sizing, but the ~6K of a double density track would be too big a block to handle. 256/512 bytes are considered a more appropriate value. To that end data on a track is organized as a series of (sector header, sector data) pairs where the sector header indicates important information like the sector number and size, and the sector data contains the data. Sectors have to be broken in two parts because while reading is easy, read the header then read the data if you want it, writing requires reading the header to find the correct place then once that is done switching on the writing head for the data. Starting writing is not instantaneous and will not be perfectly phase-aligned with the read header, so space for synchronization is required between header and data. In addition somewhere in the sector header and in the sector data are pretty much always added some kind of checksum allowing to know whether the data was damaged or not. @@ -154,7 +154,7 @@ Then for each sector: The track is finished with a stream of '1' cells. -The 125KHz pulse trains are used to lock the PLL to the signal correctly. The specific 16-cells streams allow to distinguish between clock and data bits by providing a pattern that is not supposed to happen in normal FM-encoded data. In the sector header track numbers start at 0, heads are 0/1 depending on the size, sector numbers usually start at 1 and size code is 0 for 128 bytes, 1 for 256, 2 for 512, etc. +The 125KHz pulse trains are used to lock the PLL to the signal correctly. The specific 16-cells streams allow to distinguish between clock and data bits by providing a pattern that is not supposed to happen in normal FM-encoded data. In the sector header track numbers start at 0, heads are 0/1 depending on the size, sector numbers usually start at 1 and size code is 0 for 128 bytes, 1 for 256, 2 for 512, etc. The CRC is a cyclic redundancy check of the data bits starting with the mark just after the pulse train using polynom 0x11021. @@ -209,7 +209,7 @@ Similarly two write splices are created when a sector is written at the start an 3. The new implementation ------------------------- - + 3.1. Floppy disk representation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -234,7 +234,7 @@ The last cell implicit end position is of course 200,000,000. Unformatted tracks are encoded as zero-size. -The "track splice" information indicates where to start writing if you try to rewrite a physical disk with the data. Some preservation formats encode that information, it is guessed for others. The write track function of fdcs should set it. The representation is the angular position relative to the index. +The "track splice" information indicates where to start writing if you try to rewrite a physical disk with the data. Some preservation formats encode that information, it is guessed for others. The write track function of fdcs should set it. The representation is the angular position relative to the index. 3.2. Converting to and from the internal representation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -281,7 +281,7 @@ A number of methods are provided to simplify writing the converter classes. | **UINT8 \*cell stream,** | **int cell count,** | **floppy image)** -| +| Takes a stream of cell types (0/1), MSB-first, converts it to the internal format and stores it at the given track and head in the given image. @@ -344,7 +344,7 @@ A number of methods are provided to simplify writing the converter classes. | **sector size,** | **sector count,** | **UINT8 \*sector data)** -| +| Extract what you'd get by reading in order 'sector size'-sized sectors from number 1 to sector count and put the result in sector data. diff --git a/docs/source/techspecs/index.rst b/docs/source/techspecs/index.rst index 20b17b2378e..5b73caffd0c 100644 --- a/docs/source/techspecs/index.rst +++ b/docs/source/techspecs/index.rst @@ -11,4 +11,4 @@ This section covers technical specifications useful to programmers working on MA floppy nscsi luaengine - m6502 \ No newline at end of file + m6502 diff --git a/docs/source/techspecs/nscsi.rst b/docs/source/techspecs/nscsi.rst index bc907d881c3..ef5c7aacbe6 100644 --- a/docs/source/techspecs/nscsi.rst +++ b/docs/source/techspecs/nscsi.rst @@ -24,19 +24,19 @@ The nscsi subsystem leverages the slot interfaces and the device naming to allow First you need to create a list of acceptable devices to plug on the bus. This usually comprises of **cdrom**, **harddisk** and the controller chip. For instance: -| +| | static SLOT_INTERFACE_START( next_scsi_devices ) | SLOT_INTERFACE("cdrom", NSCSI_CDROM) | SLOT_INTERFACE("harddisk", NSCSI_HARDDISK) | SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) | SLOT_INTERFACE_END -| +| The **_INTERNAL** interface indicates a device that is not user-selectable, which is useful for the controller. Then in the machine config (or in a fragment config) you need to first add the bus, and then the (potential) devices as sub-devices of the bus with the SCSI ID as the name. For instance you can use: -| +| | MCFG_NSCSI_BUS_ADD("scsibus") | MCFG_NSCSI_ADD("scsibus:0", next_scsi_devices, "cdrom", 0, 0, 0, false) | MCFG_NSCSI_ADD("scsibus:1", next_scsi_devices, "harddisk", 0, 0, 0, false) @@ -46,7 +46,7 @@ Then in the machine config (or in a fragment config) you need to first add the b | MCFG_NSCSI_ADD("scsibus:5", next_scsi_devices, 0, 0, 0, 0, false) | MCFG_NSCSI_ADD("scsibus:6", next_scsi_devices, 0, 0, 0, 0, false) | MCFG_NSCSI_ADD("scsibus:7", next_scsi_devices, "ncr5390", 0, &next_ncr5390_interface, 10000000, true) -| +| That configuration puts as default a CD-ROM reader on SCSI ID 0 and a hard drive on SCSI ID 1, and forces the controller on ID 7. The parameters of add are: diff --git a/docs/source/tools/imgtool.rst b/docs/source/tools/imgtool.rst index 3d2b693f6c3..7edac078db5 100644 --- a/docs/source/tools/imgtool.rst +++ b/docs/source/tools/imgtool.rst @@ -5,7 +5,7 @@ Imgtool - *A generic image manipulation tool for MAME* Imgtool is a tool for the maintenance and manipulation of disk and other types of images that MAME users need to deal with. Functions include retrieving and storing files and CRC checking/validation. -Imgtool is part of the MAME project. It shares large portions of code with MAME, and its existence would not be if it were not for MAME. As such, the distribution terms are the same as MAME. Please read the MAME license thoroughly. +Imgtool is part of the MAME project. It shares large portions of code with MAME, and its existence would not be if it were not for MAME. As such, the distribution terms are the same as MAME. Please read the MAME license thoroughly. **Some portions of Imgtool are Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.** @@ -22,9 +22,9 @@ Imgtool is a command line program that contains several "subcommands" that actua Example usage: imgtool dir coco_jvc_rsdos myimageinazip.zip - + imgtool get coco_jvc_rsdos myimage.dsk myfile.bin mynewfile.txt - + imgtool getall coco_jvc_rsdos myimage.dsk @@ -41,7 +41,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Creates an image **dir** @@ -59,7 +59,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Gets a single file from an image **put** @@ -68,7 +68,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Puts a single file on an image (wildcards supported) **getall** @@ -77,7 +77,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Gets all files off an image **del** @@ -86,7 +86,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Deletes a file on an image **mkdir** @@ -95,7 +95,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Creates a subdirectory on an image **rmdir** @@ -104,7 +104,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Deletes a subdirectory on an image **readsector** @@ -113,11 +113,11 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + Read a sector on an image and output it to specified **writesector** - + **imgtool writesector ** * is the image format, e.g. coco_jvc_rsdos @@ -129,7 +129,7 @@ Imgtool Subcommands * is the image format, e.g. coco_jvc_rsdos * is the image filename; can specify a ZIP file for image name - + **imgtool identify ** **listformats** @@ -145,7 +145,7 @@ Imgtool Subcommands **imgtool listdriveroptions ** * is the image format, e.g. coco_jvc_rsdos - + Lists all format-specific options for the 'put' and 'create' commands @@ -170,7 +170,7 @@ Filters are a means to process data being written into or read out of an image i **macbinary** Processes Apple MacBinary-formatted (merged forks) files - + **vzsnapshot** [todo: VZ Snapshot? Find out what this is....] @@ -198,7 +198,7 @@ Filters are a means to process data being written into or read out of an image i **bm13bas** Basic Master Level 3 Tokenized Basic Files - + Imgtool Format Info =================== @@ -1672,5 +1672,5 @@ Option Allowed values Description - -[todo: fill out the command structures, describe commands better. These descriptions came from the imgtool.txt file and are barebones] \ No newline at end of file + +[todo: fill out the command structures, describe commands better. These descriptions came from the imgtool.txt file and are barebones] diff --git a/docs/source/tools/othertools.rst b/docs/source/tools/othertools.rst index 97abd598f4f..eb4c479b846 100644 --- a/docs/source/tools/othertools.rst +++ b/docs/source/tools/othertools.rst @@ -9,7 +9,7 @@ On Microsoft Windows, ledutil.exe can take control of your keyboard LEDs to mirr Start **ledutil.exe** from the command line to enable LED handling. Run **ledutil.exe -kill** to stop the handler. -On SDLMAME platforms such as Mac OS X and Linux, **ledutil.sh** can be used. Use **ledutil.sh -a** to have it automatically close when you exit SDLMAME. +On SDLMAME platforms such as Mac OS X and Linux, **ledutil.sh** can be used. Use **ledutil.sh -a** to have it automatically close when you exit SDLMAME. Developer-focused tools included with MAME @@ -45,7 +45,7 @@ ldresample This tool recompresses video data for laserdisc and VHS dumps. Most users will not need to work with this. -ldverify +ldverify -------- This tool is used for comparing laserdisc or VHS CHD images with the source AVI. Most users will not need to work with this. @@ -53,4 +53,4 @@ This tool is used for comparing laserdisc or VHS CHD images with the source AVI. unidasm ------- -Universal disassembler for many of the architectures supported in MAME. Most users will not need to work with this. \ No newline at end of file +Universal disassembler for many of the architectures supported in MAME. Most users will not need to work with this. diff --git a/docs/source/usingmame/aboutromsets.rst b/docs/source/usingmame/aboutromsets.rst index c27e0f31d12..e7649e6d9a4 100644 --- a/docs/source/usingmame/aboutromsets.rst +++ b/docs/source/usingmame/aboutromsets.rst @@ -36,7 +36,7 @@ MAME is extremely versatile about where ROM data is located and is quite intelli A **non-merged set** is one that contains absolutely everything necessary for a given game to run in one ZIP file. This is ordinarily very space-inefficient, but is a good way to go if you want to have very few sets and want everything self-contained and easy to work with. We do not recommend this for most users. -A **split set** is one where the parent set contains all of the normal data it should, and the clone sets contain *only* what has changed as compared to the parent set. This saves some space, but isn't quite as efficient as +A **split set** is one where the parent set contains all of the normal data it should, and the clone sets contain *only* what has changed as compared to the parent set. This saves some space, but isn't quite as efficient as A **merged set** takes the parent set and one or more clone sets and puts them all inside the parent set's storage. To use the existing Pac-Man example, combining the Puckman, Midway Pac-Man (USA) sets, along with various bootleg versions-- and combining it all into ((PUCKMAN.ZIP**, would be making a merged set. A complete merged set with the parent and all clones is the most common format MAME sets are stored in as it saves the most space. @@ -70,4 +70,4 @@ ROMs and CHDs ROM chip data tends to be relatively small and gets loaded to system memory outright. Some games also used additional storage mediums such as hard drives, CD-ROMs, DVDs, and Laserdiscs. Those storage mediums are, for multiple technical reasons, not well-suited to being stored the same way as ROM data and won't fit completely in memory in some cases. -Thus, a new format was created for these in the CHD file. **Compressed Hunks of Data**, or CHD for short, are designed very specifically around the needs of mass storage media. Some arcade games, consoles, and PCs will require a CHD to run. As CHDs are already compressed, they should **NOT** be stored in a ZIP or 7Z file as you would for ROM images. \ No newline at end of file +Thus, a new format was created for these in the CHD file. **Compressed Hunks of Data**, or CHD for short, are designed very specifically around the needs of mass storage media. Some arcade games, consoles, and PCs will require a CHD to run. As CHDs are already compressed, they should **NOT** be stored in a ZIP or 7Z file as you would for ROM images. diff --git a/docs/source/usingmame/commonissues.rst b/docs/source/usingmame/commonissues.rst index b47b55aaf31..b2c5e89d6bb 100644 --- a/docs/source/usingmame/commonissues.rst +++ b/docs/source/usingmame/commonissues.rst @@ -11,7 +11,7 @@ Why does my game show an error screen if I insert coins rapidly? This is not a bug in MAME. On original arcade hardware, you simply could not insert coins as fast as you can mashing the button. The only ways you could get credit feeding at that kind of pace was if the coin mech hardware was defective or if you were physically trying to cheat the coin mech. -In either case, the game would display an error for the operator to look into the situation to prevent cheating them out of their hard-earned cash. Keep a slow, coin-insert-ish pace and you'll not trigger this. +In either case, the game would display an error for the operator to look into the situation to prevent cheating them out of their hard-earned cash. Keep a slow, coin-insert-ish pace and you'll not trigger this. Why is my non-official MAME package (e.g. EmuCR build) broken? diff --git a/docs/source/usingmame/frontends.rst b/docs/source/usingmame/frontends.rst index 0a7caccc2a6..88ef7052a65 100644 --- a/docs/source/usingmame/frontends.rst +++ b/docs/source/usingmame/frontends.rst @@ -9,12 +9,12 @@ This following list is not an endorsement of any of these frontends by the MAME | QMC2 (multiple platforms) | Download: http://qmc2.batcom-it.net/ -| +| | IV/Play (Microsoft Windows) | Download: http://www.mameui.info/ -| +| | EmuLoader (Microsoft Windows) | Download: http://emuloader.mameworld.info/ -| +| The MAME team will not provide support for issues with frontends. For support, we suggest contacting the frontend author or trying any of the popular MAME-friendly forums on the internet. diff --git a/docs/source/usingmame/index.rst b/docs/source/usingmame/index.rst index 6f3fd3f61cd..7e85a5bd871 100644 --- a/docs/source/usingmame/index.rst +++ b/docs/source/usingmame/index.rst @@ -13,4 +13,4 @@ This section describes general usage information about MAME. It is intended to c aboutromsets commonissues - \ No newline at end of file + diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst index 7e005a686e6..38e66c81a35 100644 --- a/docs/source/usingmame/mamemenus.rst +++ b/docs/source/usingmame/mamemenus.rst @@ -1,7 +1,7 @@ MAME Menus ========== -If you started MAME without any command line parameters, you'll be shown the game selection menu immediately. While the keys listed above will let you navigate the menus, you can also use a mouse. +If you started MAME without any command line parameters, you'll be shown the game selection menu immediately. While the keys listed above will let you navigate the menus, you can also use a mouse. [todo: This needs SERIOUS expansion. Waiting on answer to a few questions..] diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst index 4ea0a3e9920..1233ad00080 100644 --- a/docs/source/whatis.rst +++ b/docs/source/whatis.rst @@ -5,7 +5,7 @@ MAME originally stood for Multiple Arcade Machine Emulator. MAME's purpose is to preserve decades of software history. As electronic technology continues to rush forward, MAME prevents this important "vintage" software from being lost and forgotten. This is achieved by documenting the hardware and how it functions. The source code to MAME serves as this documentation. The fact that the software is usable serves primarily to validate the accuracy of the documentation (how else can you prove that you have recreated the hardware faithfully?). Over time, MAME absorbed the sister-project MESS (Multi Emulator Super System), so MAME now documents a wide variety of (mostly vintage) computers, video game consoles and calculators, in addition to the arcade video games that were its initial focus. -| +| | **MAME(R), the Multiple Arcade Machine Emulator** | **Copyright (c) 1997-2016 by Nicola Salmoria and the MAME team** | **MAME is a trademark owned by Nicola Salmoria** diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp index a6dce23bc90..43cac6789cf 100644 --- a/src/mame/machine/mac.cpp +++ b/src/mame/machine/mac.cpp @@ -441,7 +441,7 @@ void mac_state::set_memory_overlay(int overlay) } } else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIFX)) - { + { address_space& space = m_maincpu->space(AS_PROGRAM); space.unmap_write(0x000000, 0x9fffff); mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); @@ -497,7 +497,7 @@ READ32_MEMBER(mac_state::rom_switch_r) { set_memory_overlay(0); } - + //printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2)); return ROM_data[offset & ((ROM_size - 1)>>2)];