From 245a3693dfb65eed81f57ad3663fbb8e2e8413da Mon Sep 17 00:00:00 2001 From: arbee Date: Fri, 24 Oct 2025 22:48:14 -0400 Subject: akai/mpc3000.cpp: Reordered headers to spec, added software list, and updated the layout. [R. Belmont, Guru] --- hash/mpc3000_flop.xml | 55 ++++++++++++++++++++ src/mame/akai/mpc3000.cpp | 19 ++++--- src/mame/layout/mpc3000.lay | 121 +++++++++++++++++++++++--------------------- 3 files changed, 129 insertions(+), 66 deletions(-) create mode 100644 hash/mpc3000_flop.xml diff --git a/hash/mpc3000_flop.xml b/hash/mpc3000_flop.xml new file mode 100644 index 00000000000..5c8aff25d75 --- /dev/null +++ b/hash/mpc3000_flop.xml @@ -0,0 +1,55 @@ + + + + + + MPC60 Disk 1 - Studio Set + 1988 + Akai + + + + + + + + + MPC60 Disk 2 - Rock Set + 1988 + Akai + + + + + + + + + MPC60 Disk 3 - Dry Set + 1988 + Akai + + + + + + + + + MPC60 Disk 4 - Synth Set + 1988 + Akai + + + + + + + + diff --git a/src/mame/akai/mpc3000.cpp b/src/mame/akai/mpc3000.cpp index f36242f7a82..ef5e77c332e 100644 --- a/src/mame/akai/mpc3000.cpp +++ b/src/mame/akai/mpc3000.cpp @@ -76,13 +76,12 @@ MPCs on other hardware: ***************************************************************************/ #include "emu.h" + +#include "bus/midi/midi.h" +#include "bus/nscsi/devices.h" #include "cpu/nec/v5x.h" #include "cpu/upd7810/upd7810.h" #include "imagedev/floppy.h" -#include "sound/l7a1045_l6028_dsp_a.h" -#include "video/hd61830.h" -#include "bus/midi/midi.h" -#include "bus/nscsi/devices.h" #include "formats/dfi_dsk.h" #include "formats/hxchfe_dsk.h" #include "formats/hxcmfm_dsk.h" @@ -92,9 +91,6 @@ MPCs on other hardware: #include "formats/dsk_dsk.h" #include "formats/pc_dsk.h" #include "formats/ipf_dsk.h" -#include "speaker.h" -#include "screen.h" -#include "emupal.h" #include "machine/74259.h" #include "machine/i8255.h" #include "machine/input_merger.h" @@ -104,6 +100,13 @@ MPCs on other hardware: #include "machine/te7774.h" #include "machine/timer.h" #include "machine/upd765.h" +#include "sound/l7a1045_l6028_dsp_a.h" +#include "video/hd61830.h" + +#include "emupal.h" +#include "screen.h" +#include "softlist_dev.h" +#include "speaker.h" #include "mpc3000.lh" @@ -568,6 +571,8 @@ void mpc3000_state::mpc3000(machine_config &config) TIMER(config, "dialtimer").configure_periodic(FUNC(mpc3000_state::dial_timer_tick), attotime::from_hz(60.0)); + SOFTWARE_LIST(config, "flop_mpc3000").set_original("mpc3000_flop"); + config.set_default_layout(layout_mpc3000); } diff --git a/src/mame/layout/mpc3000.lay b/src/mame/layout/mpc3000.lay index dd59d3bce90..b91af75ebfe 100644 --- a/src/mame/layout/mpc3000.lay +++ b/src/mame/layout/mpc3000.lay @@ -29,7 +29,6 @@ - ]]> @@ -52,7 +51,7 @@ - + @@ -87,24 +86,24 @@ - + - + - + - - - - + + + + - + - - + + @@ -117,7 +116,7 @@ + ]]> @@ -251,12 +250,12 @@ - - - + + + - + @@ -444,7 +443,7 @@ - + @@ -624,13 +623,13 @@ - + - + @@ -672,7 +671,7 @@ - + @@ -730,7 +729,7 @@ - + @@ -740,14 +739,14 @@ - + - + @@ -849,6 +848,9 @@ + + + @@ -898,7 +900,7 @@ + An alternative overlay can be done to switch pad names --> @@ -927,13 +929,13 @@ + ]]> + ]]> @@ -942,7 +944,7 @@ + ]]> @@ -958,28 +960,28 @@ - + - + - + - + @@ -987,28 +989,28 @@ - + - + - + - + @@ -1016,28 +1018,28 @@ - + - + - + - + @@ -1045,28 +1047,28 @@ - + - + - + - + @@ -1099,8 +1101,6 @@ - - @@ -1117,6 +1117,11 @@ + + + + + @@ -1149,18 +1154,21 @@ - + + + + - + - + - - - + + + @@ -1169,7 +1177,6 @@ - @@ -1186,17 +1193,13 @@ - -