Merge branch 'master' of https://github.com/mamedev/mame

scripts/target/mame/mess.lua

@@ -3129,6 +3129,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/mx2178.cpp",
 	MAME_DIR .. "src/mame/drivers/mycom.cpp",
 	MAME_DIR .. "src/mame/drivers/myvision.cpp",
+	MAME_DIR .. "src/mame/drivers/notetaker.cpp",
 	MAME_DIR .. "src/mame/drivers/ngen.cpp",
 	MAME_DIR .. "src/mame/machine/ngen_kb.cpp",
 	MAME_DIR .. "src/mame/machine/ngen_kb.h",

src/mame/drivers/hh_ucom4.cpp

@@ -46,7 +46,7 @@
 
  @512     uPD557LC 1980, Castle Toy Tactix
 
- *060     uPD650C  1979, Mattel Computer Gin
+ @060     uPD650C  1979, Mattel Computer Gin
  *085     uPD650C  1980, Roland TR-808
  *127     uPD650C  198?, Sony OA-S1100 Typecorder (subcpu, have dump)
   128     uPD650C  1981, Roland TR-606 -> tr606.cpp
@@ -65,6 +65,7 @@ TODO:
 
 // internal artwork
 #include "efball.lh"
+#include "mcompgin.lh"
 #include "mvbfree.lh"
 #include "tactix.lh" // clickable
 
@@ -1578,6 +1579,60 @@ MACHINE_CONFIG_END
 
 
 
+/***************************************************************************
+
+  Mattel Computer Gin
+  * NEC uCOM-43 MCU, labeled D650C 060
+
+***************************************************************************/
+
+class mcompgin_state : public hh_ucom4_state
+{
+public:
+	mcompgin_state(const machine_config &mconfig, device_type type, const char *tag)
+		: hh_ucom4_state(mconfig, type, tag)
+	{ }
+
+	void prepare_display();
+	DECLARE_WRITE8_MEMBER(grid_w);
+	DECLARE_WRITE8_MEMBER(plate_w);
+	DECLARE_WRITE8_MEMBER(speaker_w);
+};
+
+// handlers
+
+void mcompgin_state::prepare_display()
+{
+}
+
+WRITE8_MEMBER(mcompgin_state::speaker_w)
+{
+}
+
+
+// config
+
+static INPUT_PORTS_START( mcompgin )
+INPUT_PORTS_END
+
+static MACHINE_CONFIG_START( mcompgin, mcompgin_state )
+
+	/* basic machine hardware */
+	MCFG_CPU_ADD("maincpu", NEC_D650, 400000) // approximation
+
+	MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
+	MCFG_DEFAULT_LAYOUT(layout_mcompgin)
+
+	/* sound hardware */
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+	MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+MACHINE_CONFIG_END
+
+
+
+
+
 /***************************************************************************
 
   Mego Mini-Vid Break Free (manufactured in Japan)
@@ -2444,6 +2499,12 @@ ROM_START( edracula )
 ROM_END
 
 
+ROM_START( mcompgin )
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD( "d650c-060", 0x0000, 0x0800, CRC(92a4d8be) SHA1(d67f14a2eb53b79a7d9eb08103325299bc643781) )
+ROM_END
+
+
 ROM_START( mvbfree )
 	ROM_REGION( 0x0800, "maincpu", 0 )
 	ROM_LOAD( "d553c-049", 0x0000, 0x0800, CRC(d64a8399) SHA1(97887e486fa29b1fc4a5a40cacf3c960f67aacbf) )
@@ -2504,6 +2565,8 @@ CONS( 1981, galaxy2,  0,        0, galaxy2,  galaxy2,  driver_device, 0, "Epoch"
 CONS( 1982, astrocmd, 0,        0, astrocmd, astrocmd, driver_device, 0, "Epoch", "Astro Command", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 CONS( 1982, edracula, 0,        0, edracula, edracula, driver_device, 0, "Epoch", "Dracula (Epoch)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
+CONS( 1979, mcompgin, 0,        0, mcompgin, mcompgin, driver_device, 0, "Mattel", "Computer Gin", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+
 CONS( 1979, mvbfree,  0,        0, mvbfree,  mvbfree,  driver_device, 0, "Mego", "Mini-Vid Break Free", MACHINE_SUPPORTS_SAVE )
 
 CONS( 1980, tccombat, 0,        0, tccombat, tccombat, driver_device, 0, "Tomy", "Cosmic Combat", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )

src/mame/drivers/notetaker.cpp

@@ -0,0 +1,66 @@
+/* Xerox Notetaker
+ * Driver by Jonathan Gevaryahu
+ * prototype only, one? unit manufactured
+ * This device was the origin of Smalltalk-78
+ * NO MEDIA for this device has survived, only a ram dump
+ * see http://bitsavers.informatik.uni-stuttgart.de/pdf/xerox/notetaker
+ *
+ * MISSING DUMP for 8741 I/O MCU
+*/
+
+#include "cpu/i86/i86.h"
+
+class notetaker_state : public driver_device
+{
+public:
+	notetaker_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag) ,
+		m_maincpu(*this, "maincpu")
+	{
+	}
+// devices
+	required_device<cpu_device> m_maincpu;
+
+//declarations
+
+//variables
+
+};
+
+static ADDRESS_MAP_START(notetaker_mem, AS_PROGRAM, 16, notetaker_state)
+	AM_RANGE(0x00000, 0x01fff) AM_RAM
+	AM_RANGE(0xff000, 0xfffff) AM_ROM
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START(notetaker_io, AS_IO, 16, notetaker_state)
+	ADDRESS_MAP_UNMAP_HIGH
+ADDRESS_MAP_END
+
+/* Input ports */
+static INPUT_PORTS_START( notetakr )
+INPUT_PORTS_END
+
+static MACHINE_CONFIG_START( notetakr, notetaker_state )
+	/* basic machine hardware */
+	MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) /* unknown crystal and divider */
+	MCFG_CPU_PROGRAM_MAP(notetaker_mem)
+	MCFG_CPU_IO_MAP(notetaker_io)
+
+	/* video hardware */
+	//MCFG_DEFAULT_LAYOUT(layout_notetaker)
+
+	/* Devices */
+
+MACHINE_CONFIG_END
+
+/* ROM definition */
+ROM_START( notetakr )
+	ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASEFF ) 
+	ROMX_LOAD( "NTIOLO_EPROM.BIN", 0xff000, 0x0800, CRC(b72aa4c7) SHA1(85dab2399f906c7695dc92e7c18f32e2303c5892), ROM_SKIP(1))
+	ROMX_LOAD( "NTIOHI_EPROM.BIN", 0xff001, 0x0800, CRC(1119691d) SHA1(4c20b595b554e6f5489ab2c3fb364b4a052f05e3), ROM_SKIP(1))
+ROM_END
+
+/* Driver */
+
+/*    YEAR  NAME    PARENT  COMPAT   MACHINE    INPUT    INIT    COMPANY   FULLNAME       FLAGS */
+COMP( 1978, notetakr,  0,      0,    notetakr,  notetakr, driver_device,    0,    "Xerox",  "Notetaker", MACHINE_IS_SKELETON)

src/mame/layout/mcompgin.lay

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="led" defstate="0">
+		<disk state="0"><color red="0.2" green="0.04" blue="0.046" /></disk>
+		<disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+	</element>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="0" right="100" top="0" bottom="100" />
+
+		<bezel name="0.0" element="led"><bounds x="1" y="1" width="1" height="1" /></bezel>
+
+	</view>
+</mamelayout>

src/mame/mame.lst

@@ -2,7 +2,7 @@
 // copyright-holders:Aaron Giles
 /******************************************************************************
 
-    ume.lst
+    mame.lst
 
     List of all enabled drivers in the system. This file is parsed by
     makelist.exe, sorted, and output as C code describing the drivers.

src/mame/mess.lst

@@ -2261,7 +2261,6 @@ gckong      // Gakken
 gdigdug     // Gakken
 mwcbaseb    // Mattel
 pbqbert     // Parker Brothers
-mvbfree     // Mego
 kingman     // Tomy
 tmtron      // Tomy
 vinvader    // VTech
@@ -2374,6 +2373,8 @@ efball      // Epoch
 galaxy2     // Epoch
 astrocmd    // Epoch
 edracula    // Epoch
+mcompgin    // Mattel
+mvbfree     // Mego
 tccombat    // Tomy
 tmpacman    // Tomy
 tmtennis    // Tomy
@@ -2453,6 +2454,7 @@ vcs80
 v1050
 x820
 x820ii
+notetakr
 x168
 xor100
 iq151