Put mpu4 back into how it should be... not sure what went on there, but current state was unacceptable (nw)

This commit is contained in:
Olivier Galibert 2017-06-25 12:35:51 +02:00
parent 8d2a1d4268
commit 319eb61d0f
17 changed files with 5899 additions and 5853 deletions

View File

@ -1263,23 +1263,23 @@ createMAMEProjects(_target, _subtarget, "barcrest")
files { files {
MAME_DIR .. "src/mame/drivers/mpu2.cpp", MAME_DIR .. "src/mame/drivers/mpu2.cpp",
MAME_DIR .. "src/mame/drivers/mpu3.cpp", MAME_DIR .. "src/mame/drivers/mpu3.cpp",
MAME_DIR .. "src/mame/drivers/mpu4.cpp", MAME_DIR .. "src/mame/machine/mpu4.cpp",
MAME_DIR .. "src/mame/drivers/mpu4sw.hxx",
MAME_DIR .. "src/mame/drivers/mpu4.hxx",
MAME_DIR .. "src/mame/includes/mpu4.h", MAME_DIR .. "src/mame/includes/mpu4.h",
MAME_DIR .. "src/mame/drivers/mpu4mod2sw.hxx", MAME_DIR .. "src/mame/drivers/mpu4.cpp",
MAME_DIR .. "src/mame/drivers/mpu4mod4yam.hxx", MAME_DIR .. "src/mame/drivers/mpu4avan.cpp",
MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp", MAME_DIR .. "src/mame/drivers/mpu4bwb.cpp",
MAME_DIR .. "src/mame/drivers/mpu4concept.cpp",
MAME_DIR .. "src/mame/drivers/mpu4crystal.cpp",
MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp", MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp",
MAME_DIR .. "src/mame/drivers/mpu4empire.cpp",
MAME_DIR .. "src/mame/drivers/mpu4mdm.cpp",
MAME_DIR .. "src/mame/drivers/mpu4misc.cpp",
MAME_DIR .. "src/mame/drivers/mpu4mod2sw.cpp",
MAME_DIR .. "src/mame/drivers/mpu4mod4yam.cpp",
MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp",
MAME_DIR .. "src/mame/drivers/mpu4sw.cpp",
MAME_DIR .. "src/mame/drivers/mpu4union.cpp",
MAME_DIR .. "src/mame/drivers/mpu4vid.cpp", MAME_DIR .. "src/mame/drivers/mpu4vid.cpp",
MAME_DIR .. "src/mame/drivers/mpu4avan.hxx",
MAME_DIR .. "src/mame/drivers/mpu4union.hxx",
MAME_DIR .. "src/mame/drivers/mpu4concept.hxx",
MAME_DIR .. "src/mame/drivers/mpu4empire.hxx",
MAME_DIR .. "src/mame/drivers/mpu4mdm.hxx",
MAME_DIR .. "src/mame/drivers/mpu4crystal.hxx",
MAME_DIR .. "src/mame/drivers/mpu4bwb.hxx",
MAME_DIR .. "src/mame/drivers/mpu4misc.hxx",
MAME_DIR .. "src/mame/drivers/mpu5.cpp", MAME_DIR .. "src/mame/drivers/mpu5.cpp",
MAME_DIR .. "src/mame/drivers/mpu5.hxx", MAME_DIR .. "src/mame/drivers/mpu5.hxx",
} }

View File

@ -1,4 +1,4 @@
1942.cpp 942.cpp
1943.cpp 1943.cpp
1945kiii.cpp 1945kiii.cpp
20pacgal.cpp 20pacgal.cpp
@ -750,8 +750,19 @@ mpu12wbk.cpp
mpu2.cpp mpu2.cpp
mpu3.cpp mpu3.cpp
mpu4.cpp mpu4.cpp
mpu4avan.cpp
mpu4bwb.cpp
mpu4concept.cpp
mpu4crystal.cpp
mpu4dealem.cpp mpu4dealem.cpp
mpu4empire.cpp
mpu4mdm.cpp
mpu4misc.cpp
mpu4mod2sw.cpp
mpu4mod4yam.cpp
mpu4plasma.cpp mpu4plasma.cpp
mpu4sw.cpp
mpu4union.cpp
mpu4vid.cpp mpu4vid.cpp
mpu5.cpp mpu5.cpp
mquake.cpp mquake.cpp

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -7,11 +7,13 @@
I think some might be dual unit setups, some roms are marked top/bottom I think some might be dual unit setups, some roms are marked top/bottom
*/ */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
#undef GAME_CUSTOM #undef GAME_CUSTOM
#define GAME_CUSTOM(year, setname,parent,name,offset,length,hash,company,title) \ #define GAME_CUSTOM(year, setname,parent,name,offset,length,hash,company,title) \

View File

@ -21,11 +21,15 @@
*/ */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
MACHINE_CONFIG_EXTERN( bwboki ); MACHINE_CONFIG_EXTERN( bwboki );
MACHINE_CONFIG_EXTERN( mod2 ); MACHINE_CONFIG_EXTERN( mod2 );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
#define M4BIGMT_EXTRA_ROMS \ #define M4BIGMT_EXTRA_ROMS \
ROM_REGION( 0x180000, "altmsm6376", 0 ) /* this is NOT the same, some samples are changed */ \ ROM_REGION( 0x180000, "altmsm6376", 0 ) /* this is NOT the same, some samples are changed */ \

View File

@ -2,9 +2,14 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* MPU4 games by 'Concept' */ /* MPU4 games by 'Concept' */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
#define M4RHFEVC_EXTRA_ROMS \ #define M4RHFEVC_EXTRA_ROMS \
ROM_REGION( 0x080000, "msm6376", 0 ) \ ROM_REGION( 0x080000, "msm6376", 0 ) \
ROM_LOAD( "rhfs1.bin", 0x0000, 0x03de5e, CRC(0dddd05f) SHA1(908a58752fb1cf76667695a40bcaa7778201c3a2) ) ROM_LOAD( "rhfs1.bin", 0x0000, 0x03de5e, CRC(0dddd05f) SHA1(908a58752fb1cf76667695a40bcaa7778201c3a2) )

View File

@ -4,6 +4,9 @@
/* Crystal games tend to have scrambled ROM + a different sound chip */ /* Crystal games tend to have scrambled ROM + a different sound chip */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
MACHINE_CONFIG_EXTERN( mpu4crys ); MACHINE_CONFIG_EXTERN( mpu4crys );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -752,7 +755,7 @@ ROM_START( m4ndupc )
M4NDUP_SOUND M4NDUP_SOUND
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
GAME(199?, m4frkstn ,0 ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 1)", GAME_FLAGS|MACHINE_NO_SOUND ) GAME(199?, m4frkstn ,0 ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 1)", GAME_FLAGS|MACHINE_NO_SOUND )
GAME(199?, m4frkstna,m4frkstn ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 2)", GAME_FLAGS|MACHINE_NO_SOUND ) GAME(199?, m4frkstna,m4frkstn ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 2)", GAME_FLAGS|MACHINE_NO_SOUND )

View File

@ -2,6 +2,9 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* MPU4 games by 'Empire' */ /* MPU4 games by 'Empire' */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -852,6 +855,7 @@ ROM_START( m4jne )
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
/* Empire /* Empire

View File

@ -2,6 +2,9 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* MPU4 games by MDM */ /* MPU4 games by MDM */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -404,6 +407,7 @@ ROM_START( m4ewshft )
ROM_LOAD( "each_way_shifter-snd2.bin", 0x080000, 0x080000, CRC(e3ce5ec5) SHA1(9c7eefa4042b1b1aca3d0fbefcad10db34992c43) ) ROM_LOAD( "each_way_shifter-snd2.bin", 0x080000, 0x080000, CRC(e3ce5ec5) SHA1(9c7eefa4042b1b1aca3d0fbefcad10db34992c43) )
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
/* MDM /* MDM
most of these boot and act similar to the Empire games (ie bad text, but run OK) */ most of these boot and act similar to the Empire games (ie bad text, but run OK) */

View File

@ -2,6 +2,9 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* MPU4 sets from various other manufactuers which appear to be based off unique code / behaviors (no barcrest headers etc.) */ /* MPU4 sets from various other manufactuers which appear to be based off unique code / behaviors (no barcrest headers etc.) */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -138,6 +141,7 @@ ROM_START( m4jiggina )
M4JIGGIN_SOUND M4JIGGIN_SOUND
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
#define M4DCRLS_EXTRA_ROMS \ #define M4DCRLS_EXTRA_ROMS \
ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \

View File

@ -13,6 +13,10 @@
sounds for me to know they use the AY. sounds for me to know they use the AY.
*/ */
#include "emu.h"
#include "includes/mpu4.h"
#include "m4actclb.lh" #include "m4actclb.lh"
#include "m4actpak.lh" #include "m4actpak.lh"
#include "m4alladv.lh" #include "m4alladv.lh"
@ -1754,7 +1758,7 @@ ROM_START( m4brktak )
ROM_LOAD( "b-t v1-0 p2", 0x8000, 0x004000, CRC(7465cc6f) SHA1(f984e41c310bc58d7a668ec9f31c238fbf5de9c6) ) ROM_LOAD( "b-t v1-0 p2", 0x8000, 0x004000, CRC(7465cc6f) SHA1(f984e41c310bc58d7a668ec9f31c238fbf5de9c6) )
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
GAME(199?, m4rsg ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Ready Steady Go (Barcrest) (MPU4, Mod 2 type, V1.2)",GAME_FLAGS ) GAME(199?, m4rsg ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Ready Steady Go (Barcrest) (MPU4, Mod 2 type, V1.2)",GAME_FLAGS )
GAME(199?, m4rsga ,m4rsg ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Ready Steady Go (Barcrest) (MPU4, Mod 2 type, V1.0)",GAME_FLAGS ) GAME(199?, m4rsga ,m4rsg ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Ready Steady Go (Barcrest) (MPU4, Mod 2 type, V1.0)",GAME_FLAGS )

View File

@ -2,6 +2,9 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* This is MPU4 MOD4 with a Y2413 instead of an OKI */ /* This is MPU4 MOD4 with a Y2413 instead of an OKI */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4yam ); MACHINE_CONFIG_EXTERN( mod4yam );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -227,7 +230,7 @@ ROM_START( m4voodoo )
ROM_LOAD( "ddo32", 0x0000, 0x010000, CRC(260dfef1) SHA1(2b4918e40808963a86d289cd251740a9b0bed70a) ) ROM_LOAD( "ddo32", 0x0000, 0x010000, CRC(260dfef1) SHA1(2b4918e40808963a86d289cd251740a9b0bed70a) )
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
#undef GAME_CUSTOM #undef GAME_CUSTOM
#define GAME_CUSTOM(year, setname,parent,name,offset,length,hash,company,title) \ #define GAME_CUSTOM(year, setname,parent,name,offset,length,hash,company,title) \

View File

@ -19,6 +19,9 @@
*/ */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4yam ); MACHINE_CONFIG_EXTERN( mod4yam );
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
MACHINE_CONFIG_EXTERN( mod2 ); MACHINE_CONFIG_EXTERN( mod2 );
@ -202,6 +205,8 @@ ROM_START( m4andycp10c )
M4ANDYCP_EXTRA_ROMS M4ANDYCP_EXTRA_ROMS
ROM_END ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
GAME( 1994, m4andycp10c, m4andycp, mod4oki, mpu4, mpu4_state, m4_andycp10c , ROT0, "Bwb", "Andy Capp (Bwb / Barcrest) (MPU4) (AC10C)",GAME_FLAGS ) GAME( 1994, m4andycp10c, m4andycp, mod4oki, mpu4, mpu4_state, m4_andycp10c , ROT0, "Bwb", "Andy Capp (Bwb / Barcrest) (MPU4) (AC10C)",GAME_FLAGS )
GAME_CUSTOM( 1994, m4andycp10d, m4andycp, "ac_10sd_.1_1", 0x0000, 0x010000, CRC(ec800208) SHA1(47734ae5a3184e4805a7620287fb5da7fe823929), "Bwb", "Andy Capp (Bwb / Barcrest) (MPU4) (AC10D)" ) // datapak GAME_CUSTOM( 1994, m4andycp10d, m4andycp, "ac_10sd_.1_1", 0x0000, 0x010000, CRC(ec800208) SHA1(47734ae5a3184e4805a7620287fb5da7fe823929), "Bwb", "Andy Capp (Bwb / Barcrest) (MPU4) (AC10D)" ) // datapak

View File

@ -2,6 +2,9 @@
// copyright-holders:David Haywood // copyright-holders:David Haywood
/* MPU4 games by 'Union' */ /* MPU4 games by 'Union' */
#include "emu.h"
#include "includes/mpu4.h"
MACHINE_CONFIG_EXTERN( mod4oki ); MACHINE_CONFIG_EXTERN( mod4oki );
MACHINE_CONFIG_EXTERN( mod2 ); MACHINE_CONFIG_EXTERN( mod2 );
INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4 );
@ -250,6 +253,7 @@ ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
/* Union /* Union

3184
src/mame/machine/mpu4.cpp Normal file

File diff suppressed because it is too large Load Diff

View File

@ -21388,7 +21388,7 @@ m4wnud // Unknown MPU4 'W Nudge'
m4zill // Zillionare's Challenge (Pure Leisure) m4zill // Zillionare's Challenge (Pure Leisure)
m4zilla // m4zilla //
//@source:mpu4avan.inc @source:mpu4avan.cpp
m4abeaut // m4abeaut //
m4abeaut_1 // m4abeaut_1 //
m4abeaut_2 // m4abeaut_2 //
@ -21890,7 +21890,7 @@ m4trg__x //
m4trg__y // m4trg__y //
m4trg__z // m4trg__z //
//@source:mpu4bwb.inc @source:mpu4bwb.cpp
m4abra // Abracadabra (Bwb) m4abra // Abracadabra (Bwb)
m4abra__a // m4abra__a //
m4abra__b // m4abra__b //
@ -22352,7 +22352,7 @@ m4xtrm // X-treme (Bwb)
m4xtrm__a // m4xtrm__a //
m4xtrm__b // m4xtrm__b //
//@source:mpu4concept.inc @source:mpu4concept.cpp
m4nudgwc // Nudge a Win (Concept) m4nudgwc // Nudge a Win (Concept)
m4nudgwc__a // m4nudgwc__a //
m4nudgwc__b // m4nudgwc__b //
@ -22424,7 +22424,7 @@ m4spnwnc // Spin-A-Win (Concept)
m4spnwnc__a // m4spnwnc__a //
m4spnwnc__b // m4spnwnc__b //
//@source:mpu4crystal.inc @source:mpu4crystal.cpp
m4aladn // Aladdin's Cave (Crystal) m4aladn // Aladdin's Cave (Crystal)
m4aladna // m4aladna //
m4aladnb // m4aladnb //
@ -22527,7 +22527,7 @@ m4twstrd //
m4tylb // Thank Your Lucky Bars (Crystal) m4tylb // Thank Your Lucky Bars (Crystal)
m4tylba // m4tylba //
//@source:mpu4empire.inc @source:mpu4empire.cpp
m4apachg // Apache Gold (Empire) m4apachg // Apache Gold (Empire)
m4apachga // m4apachga //
m4apachgb // m4apachgb //
@ -22610,7 +22610,7 @@ m4ttrail // Treasure Trail (Empire)
m4ttraila // m4ttraila //
m4ttrailb // m4ttrailb //
//@source:mpu4mdm.inc @source:mpu4mdm.cpp
m42punlm // 2p Unlimited (Mdm) m42punlm // 2p Unlimited (Mdm)
m4bigapl // The Big Apple (Mdm) m4bigapl // The Big Apple (Mdm)
m4bigapla // m4bigapla //
@ -22656,7 +22656,7 @@ m4themob // The Mob (Mdm)
m4themoba // m4themoba //
m4themobb // m4themobb //
//@source:mpu4misc.inc @source:mpu4misc.cpp
m4bangin // Bangin' Away (Global) m4bangin // Bangin' Away (Global)
m4bangina // m4bangina //
m4banginb // m4banginb //
@ -22795,7 +22795,7 @@ m4wwc // Wacky Weekend Club (Global)
m4wwca // m4wwca //
m4wwcb // m4wwcb //
//@source:mpu4mod2sw.inc @source:mpu4mod2sw.cpp
m421 // Twenty One (Barcrest) m421 // Twenty One (Barcrest)
m421club // 21 Club (Barcrest) m421club // 21 Club (Barcrest)
m4actbnka // m4actbnka //
@ -23040,7 +23040,7 @@ m4wayin // Way In (Barcrest)
m4wayina // m4wayina //
m4wildms // Wild Mystery (Barcrest) m4wildms // Wild Mystery (Barcrest)
//@source:mpu4mod4yam.inc @source:mpu4mod4yam.cpp
m4acechs // Ace Chase (Bwb) m4acechs // Ace Chase (Bwb)
m4acechs__a // m4acechs__a //
m4acechs__b // m4acechs__b //
@ -23324,7 +23324,7 @@ m4vivalv__y //
m4vivalv__z // m4vivalv__z //
m4voodoo // Voodoo 1000 (Barcrest) m4voodoo // Voodoo 1000 (Barcrest)
//@source:mpu4sw.inc @source:mpu4sw.cpp
m4actbnk // Action Bank (Barcrest) m4actbnk // Action Bank (Barcrest)
m4actbnk__a // m4actbnk__a //
m4actbnk__b // m4actbnk__b //
@ -26703,7 +26703,7 @@ m4wta__x //
m4wta__y // m4wta__y //
m4wta__z // m4wta__z //
//@source:mpu4union.inc @source:mpu4union.cpp
m4crzbn // Crazy Bingo m4crzbn // Crazy Bingo
m4cwalk // Cake Walk (Union) m4cwalk // Cake Walk (Union)
m4eezee // Eezee Fruits (Union) m4eezee // Eezee Fruits (Union)