From 8085d235f59a3f54824d4662bd7e3ae92721da41 Mon Sep 17 00:00:00 2001
From: Curt Coder <curtcoder@mail.com>
Date: Mon, 4 Sep 2017 21:14:14 +0300
Subject: [PATCH] crvision: Added Laser 2001 ROM. [cvemu] laser2001_cart: Added
 Salora Disk Drive cartridge. [cvemu]

---
 hash/laser2001_cart.xml       | 19 +++++++++++++++++++
 src/mame/drivers/crvision.cpp | 13 ++++++++-----
 src/mame/mame.lst             |  1 +
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 hash/laser2001_cart.xml

diff --git a/hash/laser2001_cart.xml b/hash/laser2001_cart.xml
new file mode 100644
index 00000000000..230f683d636
--- /dev/null
+++ b/hash/laser2001_cart.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="laser2001_cart" description="V-Tech Laser 2001 / Salora Manager cartridges">
+
+	<software name="disk">
+		<description>Disk Drive</description>
+		<year>198?</year>
+		<publisher>Salora</publisher>
+		
+		<part name="cart" interface="crvision_cart">
+			<feature name="slot" value="disk" />
+
+			<dataarea name="rom" size="0x2000">
+				<rom name="disk.rom" size="0x1e00" crc="c76900e3" sha1="3d1d6c0c2fd8039c042e5985da3a501e378bbad3" offset="0x0200" />
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index 8676d756ccf..5cb3fa790bf 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -860,6 +860,7 @@ static MACHINE_CONFIG_START( lasr2001 )
 
 	// software list
 	MCFG_SOFTWARE_LIST_ADD("cart_list","crvision")
+	MCFG_SOFTWARE_LIST_ADD("cart_list2","laser2001_cart")
 MACHINE_CONFIG_END
 
 /***************************************************************************
@@ -882,13 +883,15 @@ ROM_END
 #define rom_rameses rom_fnvision
 #define rom_vz2000 rom_fnvision
 
+ROM_START( lasr2001 )
+	ROM_REGION( 0x10000, M6502_TAG, 0 )
+	ROM_LOAD( "laser2001.rom", 0x0000, 0x4000, CRC(4dc35c39) SHA1(c12e098c14ac0724869053df2b63277a3e413802) )
+ROM_END
+
 ROM_START( manager )
 	ROM_REGION( 0x10000, M6502_TAG, 0 )
 	ROM_LOAD( "01", 0x0000, 0x2000, CRC(702f4cf5) SHA1(cd14ee74e787d24b76c166de484dae24206e219b) )
 	ROM_LOAD( "23", 0x2000, 0x2000, CRC(46489d88) SHA1(467f5bcd62d0b4117c443e13373df8f3c45df7b2) )
-
-	ROM_REGION( 0x1000, "disk", 0 )
-	ROM_LOAD( "floppy interface cartridge", 0x0000, 0x1000, NO_DUMP )
 ROM_END
 
 /***************************************************************************
@@ -903,6 +906,6 @@ CONS( 1982, wizzard,    crvision,   0,      pal,      crvision, crvision_pal_sta
 CONS( 1982, rameses,    crvision,   0,      pal,      crvision, crvision_pal_state, 0,    "Hanimex",                "Rameses (Oceania)",           0 )
 CONS( 1983, vz2000,     crvision,   0,      pal,      crvision, crvision_pal_state, 0,    "Dick Smith Electronics", "VZ 2000 (Oceania)",           0 )
 CONS( 1983, crvisio2,   crvision,   0,      pal,      crvision, crvision_pal_state, 0,    "Video Technology",       "CreatiVision MK-II (Europe)", 0 )
-//COMP( 1983, lasr2001,   0,          0,      lasr2001, lasr2001, laser2001_state,    0,    "Video Technology",       "Laser 2001",                  MACHINE_NOT_WORKING )
-//COMP( 1983, vz2001,     lasr2001,   0,      lasr2001, lasr2001, laser2001_state,    0,    "Dick Smith Electronics", "VZ 2001 (Oceania)",           MACHINE_NOT_WORKING )
+COMP( 1983, lasr2001,   0,          0,      lasr2001, manager,  laser2001_state,    0,    "Video Technology",       "Laser 2001",                  0 )
+//COMP( 1983, vz2001,     lasr2001,   0,      lasr2001, lasr2001, laser2001_state,    0,    "Dick Smith Electronics", "VZ 2001 (Oceania)",           0 )
 COMP( 1983, manager,    0,          0,      lasr2001, manager, laser2001_state,     0,     "Salora",                "Manager (Finland)",           0 )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 048c39664c4..6dfd2b9389b 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -10511,6 +10511,7 @@ crvisioj                        //
 crvision                        // 1981 creatiVision
 fnvision                        // 1983 FunVision
 manager                         //
+lasr2001
 rameses                         //
 vz2000                          //
 wizzard                         //