From 672e6ea3a131fa37c2e3515dcc909183b838fcef Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Mon, 17 Feb 2014 03:42:14 +0000
Subject: [PATCH] make it a bit clearer how to load floppies in msx1 by
 actually recognizing the floppy ROM.

added a skeleton list I used for some quick testing.

the driver really needs a significant overhaul, but at least this makes usage a little less opaque.
---
 .gitattributes         |  1 +
 hash/msx1_cart.xml     | 16 +++++++++--
 hash/msx1_flop.xml     | 62 ++++++++++++++++++++++++++++++++++++++++++
 src/mess/drivers/msx.c |  4 ++-
 src/mess/machine/msx.c |  1 +
 5 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 hash/msx1_flop.xml

diff --git a/.gitattributes b/.gitattributes
index 953d2d7d8e1..f27aa3e102d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -168,6 +168,7 @@ hash/mpz80.xml svneol=native#text/xml
 hash/msx.hsi svneol=native#text/xml
 hash/msx1_cart.xml svneol=native#text/xml
 hash/msx1_cass.xml svneol=native#text/xml
+hash/msx1_flop.xml svneol=native#text/xml
 hash/msx2.hsi svneol=native#text/xml
 hash/msx2_cart.xml svneol=native#text/xml
 hash/myvision.xml svneol=native#text/xml
diff --git a/hash/msx1_cart.xml b/hash/msx1_cart.xml
index 9c6e24fb830..f98cbbadf83 100644
--- a/hash/msx1_cart.xml
+++ b/hash/msx1_cart.xml
@@ -16845,10 +16845,22 @@ kept for now until finding out what those bytes affect...
 
 
 
+  <!-- Devices -->
 
+  <!-- mounting this should add the floppy drive, rather than it always being there? -->
+  <software name="diskbas">
+    <description>Disk BASIC v1.0 for FS-FD1 (Japan)</description>
+    <year>1987</year>
+    <publisher>Matsushita</publisher>
+    <part name="cart" interface="msx_cart">
+      <feature name="mapper" value="DISK_ROM" />
+      <dataarea name="rom" size="0x4000">
+        <rom name="disk basic v1.0 for fs-fd1 (1987)(matsushita electric industrial)(jp).rom" size="0x4000" crc="4c9b8214" sha1="8e3f6f08309f082a82be8298a66c9b90f2d34ad4" offset="0" />
+      </dataarea>
+    </part>
+  </software>
 
-
-<!-- SORT -->
+  <!-- SORT -->
 
 
 
diff --git a/hash/msx1_flop.xml b/hash/msx1_flop.xml
new file mode 100644
index 00000000000..05802f60520
--- /dev/null
+++ b/hash/msx1_flop.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="msx1_flop" description="MSX1 disk images">
+
+<!--
+   Things listed here should have a requirement of BASIC 1.0 + Disk Basic 1.0 (ie a Standard MSX1 type system with FDD)
+   I've noticed some 'MSX1' floppy images in TOSEC seem to require a higher BASIC version?
+   Some also require more RAM? the driver currently isn't very flexible.
+   
+   This for now is just a skeleton list for quick testing.
+   
+   To use the floppy drive the disk basic ROM must be mounted, example use case.
+   msx -cart1 diskbas -flop1 ohshit
+   
+-->
+
+	<software name="jsw2">
+		<description>Jet Set Willy II (trained)</description>
+		<year>1986</year>
+		<publisher>bootleg</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="737280">
+				<rom name="jet set willy ii - the final frontier (1985)(software projects)(gb)[t].dsk" size="737280" crc="af505b0c" sha1="80c9d7d113acbda75f92d10bec1b8f3322e62176" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+  <software name="ohmummy">
+    <description>Oh Mummy!!</description>
+    <year>1984</year>
+    <publisher>Longman Software</publisher>
+    <part name="flop1" interface="floppy_5_25">
+      <dataarea name="flop" size="737280">
+        <rom name="oh mummy!! (1984)(longman software)(gb).dsk" size="737280" crc="9cf775cc" sha1="cd7db0faf25ae33699b1708a19a874e3662e158a" offset="0" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="ohshit">
+    <description>Oh Shit!</description>
+    <year>1986</year>
+    <publisher>Aackosoft</publisher>
+    <part name="flop1" interface="floppy_5_25">
+      <dataarea name="flop" size="737280">
+        <rom name="oh shit! (1986)(aackosoft)(nl).dsk" size="737280" crc="735ebc21" sha1="7de3f69a8a5136e0dd25214d36b1194a6506b377" offset="0" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="ohno" cloneof="ohshit">
+    <description>Oh No!</description>
+    <year>1986</year>
+    <publisher>Eaglesoft</publisher>
+    <part name="flop1" interface="floppy_5_25">
+      <dataarea name="flop" size="737280">
+        <rom name="oh no! (1986)(eaglesoft)(nl)[aka oh shit!].dsk" size="737280" crc="aee65f34" sha1="5c2cd6dd8192a8c29fc0e272181272cb26cc2af6" offset="0" />
+      </dataarea>
+    </part>
+  </software>
+
+
+</softwarelist>
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index 05b7d5f3d11..9c92d055a68 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1062,7 +1062,7 @@ static const floppy_interface msx_floppy_interface =
 	DEVCB_NULL,
 	FLOPPY_STANDARD_5_25_DSHD,
 	LEGACY_FLOPPY_OPTIONS_NAME(msx),
-	NULL,
+	"floppy_5_25",
 	NULL
 };
 
@@ -1127,6 +1127,8 @@ static MACHINE_CONFIG_START( msx, msx_state )
 
 	MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(msx_floppy_interface)
 
+	MCFG_SOFTWARE_LIST_ADD("flop_list","msx1_flop")
+
 	MCFG_FRAGMENT_ADD(msx_cartslot)
 
 	/* Software lists */
diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c
index b403d836970..43fdce1b9ca 100644
--- a/src/mess/machine/msx.c
+++ b/src/mess/machine/msx.c
@@ -120,6 +120,7 @@ DEVICE_IMAGE_LOAD_MEMBER(msx_state,msx_cart)
 				{ "KONAMI-SCC",         SLOT_KONAMI_SCC },
 				{ "SUPERLODE",          SLOT_SUPERLODERUNNER },
 				{ "MAJUTSUSHI",         SLOT_MAJUTSUSHI },
+				{ "DISK_ROM",           SLOT_DISK_ROM },
 			};
 
 			for (int i = 0; i < ARRAY_LENGTH(mapper_types) && type < 0; i++)