From a29920336dc4c7a9efe53b32bc821e421525f836 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 8 Feb 2016 19:29:42 +0100
Subject: [PATCH] real fix (nw)

---
 scripts/src/bus.lua          | 14 ++++++++++++++
 scripts/target/mame/mess.lua |  1 +
 src/devices/bus/m5/slot.cpp  | 11 ++++++-----
 src/devices/bus/m5/slot.h    |  1 -
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index bafa63a269d..9514e9f5a74 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2558,3 +2558,17 @@ if (BUSES["CGENIE_PARALLEL"]~=null) then
 		MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/bus/m5/slot.h,BUSES["M5"] = true
+---------------------------------------------------
+if (BUSES["M5"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/m5/slot.cpp",
+		MAME_DIR .. "src/devices/bus/m5/slot.h",
+		MAME_DIR .. "src/devices/bus/m5/rom.cpp",
+		MAME_DIR .. "src/devices/bus/m5/rom.h",
+	}
+end
+
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 5a7e1c82d3a..c1e73771342 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -619,6 +619,7 @@ BUSES["ISA"] = true
 BUSES["ISBX"] = true
 BUSES["KC"] = true
 BUSES["LPCI"] = true
+BUSES["M5"] = true
 BUSES["MACPDS"] = true
 BUSES["MIDI"] = true
 BUSES["MEGADRIVE"] = true
diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp
index 0f3d275f699..162d802136e 100644
--- a/src/devices/bus/m5/slot.cpp
+++ b/src/devices/bus/m5/slot.cpp
@@ -210,7 +210,7 @@ bool m5_cart_slot_device::call_load()
 
 bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
 {
-	load_software_part_region(*this, swlist, swname, start_entry);
+	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
 	return TRUE;
 }
 
@@ -219,12 +219,13 @@ bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const
  get default card software
  -------------------------------------------------*/
 
-void m5_cart_slot_device::get_default_card_software(std::string &result)
+std::string m5_cart_slot_device::get_default_card_software()
 {
+	std::string result;
 	if (open_image_file(mconfig().options()))
 	{
 		const char *slot_string = "std";
-		UINT32 size = core_fsize(m_file);
+		//UINT32 size = core_fsize(m_file);
 		int type = M5_STD;
 
 
@@ -234,10 +235,10 @@ void m5_cart_slot_device::get_default_card_software(std::string &result)
 		clear();
 
 		result.assign(slot_string);
-		return;
+		return result;
 	}
 
-	software_get_default_slot(result, "std");
+	return software_get_default_slot("std");
 }
 
 /*-------------------------------------------------
diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h
index 4f9c7e8fb41..177977043cf 100644
--- a/src/devices/bus/m5/slot.h
+++ b/src/devices/bus/m5/slot.h
@@ -93,7 +93,6 @@ public:
 	virtual DECLARE_READ8_MEMBER(read_rom);
 	virtual DECLARE_READ8_MEMBER(read_ram);
 	virtual DECLARE_WRITE8_MEMBER(write_ram);
-	virtual DECLARE_SETOFFSET_MEMBER (read_off);
 
 protected: