summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-01-08 18:01:19 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2020-01-08 18:01:19 +0100
commitfc674f99607e80fa7677d410d93ccf36a13d9225 (patch)
tree6905a4132bb1fb5202a78ee641aecb73b3a2c7f7
parent9fa3b5d9e040dbc13d18ed81588c32326ff06ce5 (diff)
New machines marked as NOT_WORKING
---------------------------------- Scorpion (Jun 15, 1999) [ClawGrip, Rampa] New clones marked as NOT_WORKING -------------------------------- Scorpion (Oct 01, 1997) [ClawGrip, Rampa]
-rw-r--r--scripts/target/mame/arcade.lua1
-rw-r--r--src/mame/arcade.flt1
-rw-r--r--src/mame/drivers/merits.cpp83
-rw-r--r--src/mame/mame.lst4
4 files changed, 89 insertions, 0 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 6b5e46067b9..ba359a63a16 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2670,6 +2670,7 @@ files {
MAME_DIR .. "src/mame/drivers/merit.cpp",
MAME_DIR .. "src/mame/drivers/merit3xx.cpp",
MAME_DIR .. "src/mame/drivers/meritm.cpp",
+ MAME_DIR .. "src/mame/drivers/merits.cpp",
MAME_DIR .. "src/mame/drivers/mtouchxl.cpp",
MAME_DIR .. "src/mame/drivers/pubtimed.cpp",
MAME_DIR .. "src/mame/machine/at.h",
diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 0a1c8fba1cb..cd1ed0ca95a 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -741,6 +741,7 @@ mephistp.cpp
merit.cpp
merit3xx.cpp
meritm.cpp
+merits.cpp
mermaid.cpp
metalmx.cpp
metlclsh.cpp
diff --git a/src/mame/drivers/merits.cpp b/src/mame/drivers/merits.cpp
new file mode 100644
index 00000000000..db8da9526e5
--- /dev/null
+++ b/src/mame/drivers/merits.cpp
@@ -0,0 +1,83 @@
+// license:BSD-3-Clause
+// copyright-holders:
+/*******************************************************************************
+
+ Skeleton driver for Merit Scorpion darts machines
+
+ Hardware overview:
+ Main CPU: Dallas DS80C3202-UM or compatible
+ Sound: DAC?
+ Other: Dallas DS1220Y-120 or compatible
+ OSCs: 12.000 MHz, 3.2768 MHz
+ Dips: 2 x 8 dips banks
+
+*******************************************************************************/
+
+#include "emu.h"
+#include "cpu/mcs51/mcs51.h"
+#include "machine/nvram.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "speaker.h"
+
+
+class merits_state : public driver_device
+{
+public:
+ merits_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ {
+ }
+
+ void scrpiond(machine_config &config);
+
+private:
+ void mem_map(address_map &map);
+ void io_map(address_map &map);
+
+ required_device<cpu_device> m_maincpu;
+};
+
+void merits_state::mem_map(address_map &map)
+{
+ map(0x0000, 0xffff).rom().region("maincpu", 0);
+}
+
+void merits_state::io_map(address_map &map)
+{
+ map(0x8000, 0x87ff).ram().share("nvram");
+ //map(0x9000, 0x9000).r();
+ //map(0xa000, 0xa000).r();
+ //map(0xc000, 0xc000).w();
+ //map(0xd000, 0xd000).w();
+ //map(0xe000, 0xe000).w();
+ //map(0xf000, 0xf000).w();
+ //map(0xf800, 0xf800).w();
+}
+
+static INPUT_PORTS_START(scrpiond)
+INPUT_PORTS_END
+
+void merits_state::scrpiond(machine_config &config)
+{
+ I80C32(config, m_maincpu, 12_MHz_XTAL);
+ m_maincpu->set_addrmap(AS_PROGRAM, &merits_state::mem_map);
+ m_maincpu->set_addrmap(AS_IO, &merits_state::io_map);
+
+ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // DS1220Y
+}
+
+ROM_START(scrpiond)
+ ROM_REGION(0x10000, "maincpu", 0)
+ ROM_LOAD( "27c512.u7", 0x00000, 0x10000, CRC(06cdf965) SHA1(4cdac131063fc0dd954eaaee2ae40d5731f83469) )
+ROM_END
+
+ROM_START(scrpionda)
+ ROM_REGION(0x10000, "maincpu", 0)
+ ROM_LOAD( "4978-22_u7-r5_c1997_mii.u7", 0x00000, 0x10000, CRC(e647a17e) SHA1(4a7b9e2af3656a1b6f4ffd8c17b68eec5c534776) )
+ROM_END
+
+
+GAME(1999, scrpiond, 0, scrpiond, scrpiond, merits_state, empty_init, ROT0, "Merit", "Scorpion (Jun 15, 1999)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1997, scrpionda, scrpiond, scrpiond, scrpiond, merits_state, empty_init, ROT0, "Merit", "Scorpion (Oct 01, 1997)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 0ce3cffee8d..5743682de21 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -22057,6 +22057,10 @@ realbrod // (c) 1996 Merit
realbroda // (c) 1995 Merit
spitboss // (c) 1988 Merit
+@source:merits.cpp
+scrpiond //
+scrpionda //
+
@source:meritum.cpp
meritum1 //
meritum2 //