DRAFT: Removing emu_options reference from machine_config

src/devices/bus/a7800/a78_slot.cpp

@@ -565,7 +565,7 @@ std::string a78_cart_slot_device::get_default_card_software(get_default_card_sof
 		return std::string(slot_string);
 	}
 	else
-		return software_get_default_slot("a78_rom");
+		return software_get_default_slot(hook.image_name(), "a78_rom");
 }
 
 

src/devices/bus/a800/a800_slot.cpp

@@ -683,7 +683,7 @@ std::string a800_cart_slot_device::get_default_card_software(get_default_card_so
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot(is_xegs ? "xegs" : "a800_8k");
+	return software_get_default_slot(hook.image_name(), is_xegs ? "xegs" : "a800_8k");
 }
 
 
@@ -716,7 +716,7 @@ std::string a5200_cart_slot_device::get_default_card_software(get_default_card_s
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("a5200_rom");
+	return software_get_default_slot(hook.image_name(), "a5200_rom");
 }
 
 

src/devices/bus/adam/exp.cpp

@@ -107,7 +107,7 @@ std::pair<std::error_condition, std::string> adam_expansion_slot_device::call_lo
 
 std::string adam_expansion_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("standard");
+	return software_get_default_slot(hook.image_name(), "standard");
 }
 
 

src/devices/bus/apf/slot.cpp

@@ -214,7 +214,7 @@ std::string apf_cart_slot_device::get_default_card_software(get_default_card_sof
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("std");
+	return software_get_default_slot(hook.image_name(), "std");
 }
 
 /*-------------------------------------------------

src/devices/bus/aquarius/slot.cpp

@@ -129,7 +129,7 @@ std::string aquarius_cartridge_slot_device::get_default_card_software(get_defaul
 		return std::string(slot_string);
 	}
 	else
-		return software_get_default_slot("rom");
+		return software_get_default_slot(hook.image_name(), "rom");
 }
 
 //-------------------------------------------------

src/devices/bus/arcadia/slot.cpp

@@ -205,7 +205,7 @@ std::pair<std::error_condition, std::string> arcadia_cart_slot_device::call_load
 
 std::string arcadia_cart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("std");
+	return software_get_default_slot(hook.image_name(), "std");
 }
 
 /*-------------------------------------------------

src/devices/bus/astrocde/slot.cpp

@@ -193,7 +193,7 @@ std::string astrocade_cart_slot_device::get_default_card_software(get_default_ca
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("rom");
+	return software_get_default_slot(hook.image_name(), "rom");
 }
 
 /*-------------------------------------------------

src/devices/bus/bbc/rom/slot.cpp

@@ -163,7 +163,7 @@ void bbc_romslot_device::call_unload()
 
 std::string bbc_romslot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("rom");
+	return software_get_default_slot(hook.image_name(), "rom");
 }
 
 

src/devices/bus/c64/exp.cpp

@@ -224,7 +224,7 @@ std::string c64_expansion_slot_device::get_default_card_software(get_default_car
 			return cbm_crt_get_card(*hook.image_file());
 	}
 
-	return software_get_default_slot("standard");
+	return software_get_default_slot(hook.image_name(), "standard");
 }
 
 

src/devices/bus/casloopy/slot.cpp

@@ -145,5 +145,5 @@ void casloopy_cart_slot_device::call_unload()
 
 std::string casloopy_cart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("std");
+	return software_get_default_slot(hook.image_name(), "std");
 }

src/devices/bus/cbm2/exp.cpp

@@ -140,7 +140,7 @@ std::pair<std::error_condition, std::string> cbm2_expansion_slot_device::call_lo
 
 std::string cbm2_expansion_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("standard");
+	return software_get_default_slot(hook.image_name(), "standard");
 }
 
 

src/devices/bus/chanf/slot.cpp

@@ -209,7 +209,7 @@ std::string channelf_cart_slot_device::get_default_card_software(get_default_car
 
 		return std::string(slot_string);
 	}
-	return software_get_default_slot("chess");
+	return software_get_default_slot(hook.image_name(), "chess");
 }
 
 /*-------------------------------------------------

src/devices/bus/coco/cococart.cpp

@@ -636,7 +636,7 @@ std::string cococart_slot_device::get_default_card_software(get_default_card_sof
 	}
 
 	// lookup the default slot
-	return software_get_default_slot(coco_rpk_cardslottypes[pcb_type]);
+	return software_get_default_slot(hook.image_name(), coco_rpk_cardslottypes[pcb_type]);
 }
 
 

src/devices/bus/coleco/cartridge/exp.cpp

@@ -113,13 +113,13 @@ std::string colecovision_cartridge_slot_device::get_default_card_software(get_de
 		hook.image_file()->length(length); // FIXME: check error return
 
 		if (length == 0x100000 || length == 0x200000)
-			return software_get_default_slot("xin1");
+			return software_get_default_slot(hook.image_name(), "xin1");
 
 		if (length > 0x8000) // Assume roms longer than 32K are megacarts.
-			return software_get_default_slot("megacart");
+			return software_get_default_slot(hook.image_name(), "megacart");
 	}
 
-	return software_get_default_slot("standard");
+	return software_get_default_slot(hook.image_name(), "standard");
 }
 
 

src/devices/bus/crvision/slot.cpp

@@ -240,7 +240,7 @@ std::string crvision_cart_slot_device::get_default_card_software(get_default_car
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("crv_rom4k");
+	return software_get_default_slot(hook.image_name(), "crv_rom4k");
 }
 
 /*-------------------------------------------------

src/devices/bus/ekara/slot.cpp

@@ -195,7 +195,7 @@ std::string ekara_cart_slot_device::get_default_card_software(get_default_card_s
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("plain");
+	return software_get_default_slot(hook.image_name(), "plain");
 }
 
 /*-------------------------------------------------

src/devices/bus/electron/cart/slot.cpp

@@ -208,7 +208,7 @@ void electron_cartslot_device::call_unload()
 
 std::string electron_cartslot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("std");
+	return software_get_default_slot(hook.image_name(), "std");
 }
 
 

src/devices/bus/gamate/slot.cpp

@@ -211,7 +211,7 @@ std::string gamate_cart_slot_device::get_default_card_software(get_default_card_
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("plain");
+	return software_get_default_slot(hook.image_name(), "plain");
 }
 
 /*-------------------------------------------------

src/devices/bus/gameboy/gbslot.cpp

@@ -1043,7 +1043,7 @@ std::string gb_cart_slot_device::get_default_card_software(get_default_card_soft
 	}
 
 	// this will return the explicit setting for a software list item
-	return software_get_default_slot(slotoptions::GB_STD);
+	return software_get_default_slot(hook.image_name(), slotoptions::GB_STD);
 }
 
 

src/devices/bus/gameboy/mdslot.cpp

@@ -60,7 +60,7 @@ std::string megaduck_cart_slot_device::get_default_card_software(get_default_car
 	else
 	{
 		// loading from software list - try to find matching software part
-		std::string const image_name(mconfig().options().image_option(instance_name()).value());
+		std::string const image_name(machine().options().image_option(instance_name()).value());
 		software_part const *const part(!image_name.empty() ? find_software_item(image_name, true) : nullptr);
 		if (part)
 		{

src/devices/bus/gba/gba_slot.cpp

@@ -891,7 +891,7 @@ std::string gba_cart_slot_device::get_default_card_software(get_default_card_sof
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("gba_rom");
+	return software_get_default_slot(hook.image_name(), "gba_rom");
 }
 
 /*-------------------------------------------------

src/devices/bus/generic/slot.cpp

@@ -207,7 +207,7 @@ void generic_slot_device::call_unload()
 
 std::string generic_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot(m_default_card);
+	return software_get_default_slot(hook.image_name(), m_default_card);
 }
 
 

src/devices/bus/intv/slot.cpp

@@ -480,7 +480,7 @@ std::string intv_cart_slot_device::get_default_card_software(get_default_card_so
 
 		return std::string(slot_string);
 	}
-	return software_get_default_slot("intv_rom");
+	return software_get_default_slot(hook.image_name(), "intv_rom");
 }
 
 /*-------------------------------------------------

src/devices/bus/iq151/iq151.cpp

@@ -176,5 +176,5 @@ std::pair<std::error_condition, std::string> iq151cart_slot_device::call_load()
 
 std::string iq151cart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("basic6");
+	return software_get_default_slot(hook.image_name(), "basic6");
 }

src/devices/bus/jakks_gamekey/slot.cpp

@@ -193,7 +193,7 @@ std::string jakks_gamekey_slot_device::get_default_card_software(get_default_car
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("plain");
+	return software_get_default_slot(hook.image_name(), "plain");
 }
 
 /*-------------------------------------------------

src/devices/bus/kc/kc.cpp

@@ -343,5 +343,5 @@ std::pair<std::error_condition, std::string> kccart_slot_device::call_load()
 
 std::string kccart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("standard");
+	return software_get_default_slot(hook.image_name(), "standard");
 }

src/devices/bus/m5/slot.cpp

@@ -208,7 +208,7 @@ std::string m5_cart_slot_device::get_default_card_software(get_default_card_soft
 		return result;
 	}
 
-	return software_get_default_slot("std");
+	return software_get_default_slot(hook.image_name(), "std");
 }
 
 /*-------------------------------------------------

src/devices/bus/mc10/mc10_cart.cpp

@@ -127,7 +127,7 @@ std::pair<std::error_condition, std::string> mc10cart_slot_device::call_load()
 
 std::string mc10cart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("pak");
+	return software_get_default_slot(hook.image_name(), "pak");
 }
 
 //**************************************************************************

src/devices/bus/megadrive/cart/slot.cpp

@@ -217,7 +217,7 @@ std::string megadrive_cart_slot_device::get_default_card_software(get_default_ca
 	}
 	else
 	{
-		return software_get_default_slot(slotoptions::MD_STD);
+		return software_get_default_slot(hook.image_name(), slotoptions::MD_STD);
 	}
 }
 

src/devices/bus/megadrive/md_slot.cpp

@@ -920,7 +920,7 @@ std::string base_md_cart_slot_device::get_default_card_software(get_default_card
 	}
 	else
 	{
-		return software_get_default_slot("rom");
+		return software_get_default_slot(hook.image_name(), "rom");
 	}
 }
 

src/devices/bus/mononcol/slot.cpp

@@ -96,5 +96,5 @@ std::pair<std::error_condition, std::string> mononcol_cartslot_device::call_load
 
 std::string mononcol_cartslot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("rom");
+	return software_get_default_slot(hook.image_name(), "rom");
 }

src/devices/bus/msx/cart/beepack.cpp

@@ -72,7 +72,7 @@ std::pair<std::error_condition, std::string> msx_cart_beepack_device::call_load(
 
 std::string msx_cart_beepack_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("nomapper");
+	return software_get_default_slot(hook.image_name(), "nomapper");
 }
 
 

src/devices/bus/msx/cart/cartridge.cpp

@@ -180,7 +180,7 @@ std::string msx_slot_cartridge_device::get_default_card_software(get_default_car
 		}
 		return std::string(get_cart_type(&rom[0], length));
 	}
-	return software_get_default_slot(bus::msx::cart::slotoptions::NOMAPPER);
+	return software_get_default_slot(hook.image_name(), bus::msx::cart::slotoptions::NOMAPPER);
 }
 
 

src/devices/bus/msx/cart/softcard.cpp

@@ -72,7 +72,7 @@ std::pair<std::error_condition, std::string> msx_cart_softcard_device::call_load
 
 std::string msx_cart_softcard_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("nomapper");
+	return software_get_default_slot(hook.image_name(), "nomapper");
 }
 
 

src/devices/bus/msx/minicart/minicart.cpp

@@ -31,5 +31,5 @@ void msx_slot_yamaha_minicart_device::device_start()
 std::string msx_slot_yamaha_minicart_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
 	using namespace bus::msx::minicart::slotoptions;
-	return software_get_default_slot(NOMAPPER);
+	return software_get_default_slot(hook.image_name(), NOMAPPER);
 }

src/devices/bus/msx/module/module.cpp

@@ -37,5 +37,5 @@ void msx_slot_yamaha_expansion_device::device_start()
 std::string msx_slot_yamaha_expansion_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
 	using namespace bus::msx::module;
-	return software_get_default_slot(slotoptions::SFG01);
+	return software_get_default_slot(hook.image_name(), slotoptions::SFG01);
 }

src/devices/bus/mtx/exp.cpp

@@ -117,10 +117,10 @@ std::string mtx_exp_slot_device::get_default_card_software(get_default_card_soft
 		hook.image_file()->length(len); // FIXME: check error return
 
 		if (len == 0x80000)
-			return software_get_default_slot("magrom");
+			return software_get_default_slot(hook.image_name(), "magrom");
 	}
 
-	return software_get_default_slot("rompak");
+	return software_get_default_slot(hook.image_name(), "rompak");
 }
 
 

src/devices/bus/neogeo/slot.cpp

@@ -324,7 +324,7 @@ void neogeo_cart_slot_device::call_unload()
 
 std::string neogeo_cart_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("rom");
+	return software_get_default_slot(hook.image_name(), "rom");
 }
 
 /*-------------------------------------------------

src/devices/bus/nes/aladdin.cpp

@@ -158,7 +158,7 @@ std::string nes_aladdin_slot_device::get_default_card_software(get_default_card_
 		return std::string(slot_string);
 	}
 
-	return software_get_default_slot("algn");
+	return software_get_default_slot(hook.image_name(), "algn");
 }
 
 

src/devices/bus/nes/datach.cpp

@@ -139,7 +139,7 @@ std::pair<std::error_condition, std::string> nes_datach_slot_device::call_load()
 std::string nes_datach_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
 	// any way to detect the game with X24C01?
-	return software_get_default_slot("datach_rom");
+	return software_get_default_slot(hook.image_name(), "datach_rom");
 }
 
 

src/devices/bus/nes/karastudio.cpp

@@ -127,7 +127,7 @@ std::pair<std::error_condition, std::string> nes_kstudio_slot_device::call_load(
 
 std::string nes_kstudio_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("ks_exp");
+	return software_get_default_slot(hook.image_name(), "ks_exp");
 }
 
 

src/devices/bus/nes/nes_slot.cpp

@@ -810,7 +810,7 @@ std::string nes_cart_slot_device::get_default_card_software(get_default_card_sof
 		return std::string(slot_string);
 	}
 	else
-		return software_get_default_slot("nrom");
+		return software_get_default_slot(hook.image_name(), "nrom");
 }
 
 

src/devices/bus/nes/sunsoft_dcs.cpp

@@ -106,7 +106,7 @@ std::pair<std::error_condition, std::string> nes_ntb_slot_device::call_load()
 
 std::string nes_ntb_slot_device::get_default_card_software(get_default_card_software_hook &hook) const
 {
-	return software_get_default_slot("ntbrom");
+	return software_get_default_slot(hook.image_name(), "ntbrom");
 }
 
 //-----------------------------------------------