device_image_interface::call_softlist_load() was a virtual function where every implementation was one of two copy-and-paste jobs. This change consolidates all of these implementations, replacing that virtual function with a mere hook that chooses which technique to perform

src/devices/bus/a7800/a78_slot.cpp

@@ -494,16 +494,6 @@ void a78_cart_slot_device::call_unload()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool a78_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
 /*-------------------------------------------------
  verify_header - check the image (from fullpath)
  has an admissible header

src/devices/bus/a7800/a78_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_cart_type() { return m_type; };
 	bool has_cart() { return m_cart != nullptr; }

src/devices/bus/a800/a800_slot.cpp

@@ -303,16 +303,6 @@ void a800_cart_slot_device::call_unload()
 {
 }
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool a800_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
 /*-------------------------------------------------
  identify_cart_type - code to detect cart type from
  fullpath

src/devices/bus/a800/a800_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_cart_type() { return m_type; };
 	int identify_cart_type(UINT8 *header);

src/devices/bus/adam/exp.cpp

@@ -108,18 +108,6 @@ bool adam_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool adam_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/adam/exp.h

@@ -73,7 +73,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/apf/slot.cpp

@@ -206,17 +206,6 @@ bool apf_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool apf_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/apf/slot.h

@@ -67,7 +67,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/arcadia/slot.cpp

@@ -214,18 +214,6 @@ bool arcadia_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool arcadia_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/arcadia/slot.h

@@ -58,7 +58,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/astrocde/slot.cpp

@@ -183,17 +183,6 @@ bool astrocade_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool astrocade_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/astrocde/slot.h

@@ -58,7 +58,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/c64/exp.cpp

@@ -201,18 +201,6 @@ bool c64_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool c64_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/c64/exp.h

@@ -135,7 +135,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/cbm2/exp.cpp

@@ -139,18 +139,6 @@ bool cbm2_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool cbm2_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/cbm2/exp.h

@@ -82,7 +82,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/chanf/slot.cpp

@@ -201,18 +201,6 @@ bool channelf_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool channelf_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/chanf/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/coco/cococart.cpp

@@ -347,18 +347,6 @@ bool cococart_slot_device::call_load()
 
 
 
-//-------------------------------------------------
-//  call_softlist_load
-//-------------------------------------------------
-
-bool cococart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
-
-
 //-------------------------------------------------
 //  get_default_card_software
 //-------------------------------------------------

src/devices/bus/coco/cococart.h

@@ -88,7 +88,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/coleco/exp.cpp

@@ -96,18 +96,6 @@ bool colecovision_cartridge_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool colecovision_cartridge_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/coleco/exp.h

@@ -79,7 +79,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/crvision/slot.cpp

@@ -214,17 +214,6 @@ bool crvision_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool crvision_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/crvision/slot.h

@@ -63,7 +63,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/gameboy/gb_slot.cpp

@@ -451,16 +451,6 @@ void base_gb_cart_slot_device::setup_ram(UINT8 banks)
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool base_gb_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return true;
-}
-
 // This fails to catch Mani 4-in-1 carts... even when they match this, then they have MBC1/3 in the internal header instead of MMM01...
 bool base_gb_cart_slot_device::get_mmm01_candidate(UINT8 *ROM, UINT32 len)
 {

src/devices/bus/gameboy/gb_slot.h

@@ -118,7 +118,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/gba/gba_slot.cpp

@@ -254,18 +254,6 @@ void gba_cart_slot_device::call_unload()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool gba_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get_cart_type - code to detect NVRAM type from
  fullpath

src/devices/bus/gba/gba_slot.h

@@ -87,7 +87,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/generic/slot.cpp

@@ -164,18 +164,6 @@ void generic_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool generic_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/generic/slot.h

@@ -114,7 +114,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	UINT32 common_get_size(const char *region);
 	void common_load_rom(UINT8 *ROM, UINT32 len, const char *region);

src/devices/bus/hp_optroms/hp_optrom.cpp

@@ -126,13 +126,6 @@ void hp_optrom_slot_device::call_unload()
 		}
 }
 
-bool hp_optrom_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-		logerror("hp_optrom: call_softlist_load\n");
-		machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-		return TRUE;
-}
-
 std::string hp_optrom_slot_device::get_default_card_software()
 {
 		return software_get_default_slot("rom");

src/devices/bus/hp_optroms/hp_optrom.h

@@ -43,7 +43,7 @@ public:
 		// image-level overrides
 		virtual bool call_load() override;
 		virtual void call_unload() override;
-		virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+		virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 		virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 		virtual bool is_readable()  const override { return true; }

src/devices/bus/intv/slot.cpp

@@ -444,17 +444,6 @@ bool intv_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool intv_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/intv/slot.h

@@ -102,7 +102,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int load_fullpath();

src/devices/bus/iq151/iq151.cpp

@@ -189,16 +189,6 @@ bool iq151cart_slot_device::call_load()
 	return IMAGE_INIT_PASS;
 }
 
-/*-------------------------------------------------
-    call softlist load
--------------------------------------------------*/
-
-bool iq151cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 /*-------------------------------------------------
     get default card software
 -------------------------------------------------*/

src/devices/bus/iq151/iq151.h

@@ -93,7 +93,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/isa/sc499.h

@@ -30,7 +30,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
 	virtual void call_unload() override;
 	virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
 

src/devices/bus/kc/kc.cpp

@@ -355,16 +355,6 @@ bool kccart_slot_device::call_load()
 	return IMAGE_INIT_PASS;
 }
 
-/*-------------------------------------------------
-    call softlist load
--------------------------------------------------*/
-
-bool kccart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 /*-------------------------------------------------
     get default card software
 -------------------------------------------------*/

src/devices/bus/kc/kc.h

@@ -91,7 +91,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/m5/slot.cpp

@@ -203,17 +203,6 @@ bool m5_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/m5/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/megadrive/md_slot.cpp

@@ -683,16 +683,6 @@ void base_md_cart_slot_device::setup_nvram()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool base_md_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
 int base_md_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
 {
 	int type = SEGA_STD;

src/devices/bus/megadrive/md_slot.h

@@ -153,7 +153,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/msx_slot/cartridge.cpp

@@ -198,13 +198,6 @@ void msx_slot_cartridge_device::call_unload()
 }
 
 
-bool msx_slot_cartridge_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return true;
-}
-
-
 WRITE_LINE_MEMBER(msx_slot_cartridge_device::irq_out)
 {
 	m_irq_handler(state);

src/devices/bus/msx_slot/cartridge.h

@@ -43,7 +43,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return true; }
 	virtual bool is_writeable() const override { return false; }

src/devices/bus/neogeo/slot.cpp

@@ -330,17 +330,6 @@ void neogeo_cart_slot_device::call_unload()
 {
 }
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool neogeo_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/neogeo/slot.h

@@ -195,7 +195,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/aladdin.cpp

@@ -136,12 +136,6 @@ bool nes_aladdin_slot_device::call_load()
 }
 
 
-bool nes_aladdin_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 std::string nes_aladdin_slot_device::get_default_card_software()
 {
 	if (open_image_file(mconfig().options()))

src/devices/bus/nes/aladdin.h

@@ -52,7 +52,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/datach.cpp

@@ -137,12 +137,6 @@ bool nes_datach_slot_device::call_load()
 }
 
 
-bool nes_datach_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 std::string nes_datach_slot_device::get_default_card_software()
 {
 	// any way to detect the game with X24C01?

src/devices/bus/nes/datach.h

@@ -54,7 +54,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/karastudio.cpp

@@ -126,12 +126,6 @@ bool nes_kstudio_slot_device::call_load()
 }
 
 
-bool nes_kstudio_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 std::string nes_kstudio_slot_device::get_default_card_software()
 {
 	return software_get_default_slot("ks_exp");

src/devices/bus/nes/karastudio.h

@@ -51,7 +51,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/nes_slot.cpp

@@ -898,16 +898,6 @@ void nes_cart_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool nes_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/nes/nes_slot.h

@@ -346,7 +346,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	void call_load_ines();
 	void call_load_unif();

src/devices/bus/nes/sunsoft_dcs.cpp

@@ -105,12 +105,6 @@ bool nes_ntb_slot_device::call_load()
 }
 
 
-bool nes_ntb_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 std::string nes_ntb_slot_device::get_default_card_software()
 {
 	return software_get_default_slot("ntbrom");

src/devices/bus/nes/sunsoft_dcs.h

@@ -48,7 +48,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/odyssey2/slot.cpp

@@ -194,17 +194,6 @@ bool o2_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool o2_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/odyssey2/slot.h

@@ -69,7 +69,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/pce/pce_slot.cpp

@@ -294,18 +294,6 @@ void pce_cart_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool pce_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get_cart_type - code to detect NVRAM type from
  fullpath

src/devices/bus/pce/pce_slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/plus4/exp.cpp

@@ -141,18 +141,6 @@ bool plus4_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool plus4_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/plus4/exp.h

@@ -121,7 +121,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/ql/rom.cpp

@@ -98,18 +98,6 @@ bool ql_rom_cartridge_slot_t::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool ql_rom_cartridge_slot_t::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/ql/rom.h

@@ -96,7 +96,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/saturn/sat_slot.cpp

@@ -204,17 +204,6 @@ void sat_cart_slot_device::call_unload()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool sat_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/saturn/sat_slot.h

@@ -74,7 +74,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_cart_type();
 

src/devices/bus/scv/slot.cpp

@@ -210,18 +210,6 @@ bool scv_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool scv_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get_cart_type - code to detect NVRAM type from
  fullpath

src/devices/bus/scv/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/sega8/sega8_slot.cpp

@@ -415,17 +415,6 @@ void sega8_cart_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool sega8_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 #ifdef UNUSED_FUNCTION
 // For the moment we switch to a different detection routine which allows to detect
 // in a single run Codemasters mapper, Korean mapper (including Jang Pung 3 which

src/devices/bus/sega8/sega8_slot.h

@@ -110,7 +110,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/snes/snes_slot.cpp

@@ -880,16 +880,6 @@ void base_sns_cart_slot_device::setup_nvram()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool base_sns_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 void base_sns_cart_slot_device::get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon)
 {
 	// First, look if the cart is HiROM or LoROM (and set snes_cart accordingly)

src/devices/bus/snes/snes_slot.h

@@ -159,7 +159,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	void get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon);
 	UINT32 snes_skip_header(UINT8 *ROM, UINT32 snes_rom_size);

src/devices/bus/ti99x/gromport.cpp

@@ -1417,13 +1417,11 @@ void ti99_cartridge_device::set_slot(int i)
 	m_slot = i;
 }
 
-bool ti99_cartridge_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
+void ti99_cartridge_device::loaded_through_softlist()
 {
-	if (TRACE_CONFIG) logerror("swlist = %s, swname = %s\n", swlist.list_name(), swname);
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
+	// TI99 cartridge seems to be the only reason we need loaded_through_softlist()... why?
 	m_softlist = true;
 	m_rpk = nullptr;
-	return true;
 }
 
 READ8Z_MEMBER(ti99_cartridge_device::readz)

src/devices/bus/ti99x/gromport.h

@@ -108,7 +108,8 @@ protected:
 	// Image handling: implementation of methods which are abstract in the parent
 	bool call_load() override;
 	void call_unload() override;
-	bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual void loaded_through_softlist() override;
 
 	void prepare_cartridge();
 

src/devices/bus/vboy/slot.cpp

@@ -217,18 +217,6 @@ void vboy_cart_slot_device::call_unload()
 		battery_save(m_cart->get_eeprom_base(), m_cart->get_eeprom_size() * 4);
 }
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool vboy_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/vboy/slot.h

@@ -66,7 +66,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/vc4000/slot.cpp

@@ -220,17 +220,6 @@ bool vc4000_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool vc4000_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/vc4000/slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 

src/devices/bus/vcs/vcs_slot.cpp

@@ -327,17 +327,6 @@ void vcs_cart_slot_device::call_unload()
 
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool vcs_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
   detection helper routines
  -------------------------------------------------*/

src/devices/bus/vcs/vcs_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_cart_type() { return m_type; };
 	int identify_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/vectrex/slot.cpp

@@ -202,17 +202,6 @@ bool vectrex_cart_slot_device::call_load()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool vectrex_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get default card software
  -------------------------------------------------*/

src/devices/bus/vectrex/slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_vec3d() { return m_vec3d; }

src/devices/bus/vic10/exp.cpp

@@ -166,18 +166,6 @@ bool vic10_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool vic10_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/vic10/exp.h

@@ -120,7 +120,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/vic20/exp.cpp

@@ -151,18 +151,6 @@ bool vic20_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool vic20_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/vic20/exp.h

@@ -111,7 +111,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/vidbrain/exp.cpp

@@ -138,18 +138,6 @@ bool videobrain_expansion_slot_device::call_load()
 }
 
 
-//-------------------------------------------------
-//  call_softlist_load -
-//-------------------------------------------------
-
-bool videobrain_expansion_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-
-	return true;
-}
-
-
 //-------------------------------------------------
 //  get_default_card_software -
 //-------------------------------------------------

src/devices/bus/vidbrain/exp.h

@@ -136,7 +136,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/wswan/slot.cpp

@@ -237,17 +237,6 @@ void ws_cart_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
- call softlist load
- -------------------------------------------------*/
-
-bool ws_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-	return TRUE;
-}
-
-
 /*-------------------------------------------------
  get cart type from cart file
  -------------------------------------------------*/

src/devices/bus/wswan/slot.h

@@ -76,7 +76,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	int get_type() { return m_type; }
 	int get_is_rotated() { return m_cart->get_is_rotated(); }

src/devices/bus/z88/z88.cpp

@@ -171,16 +171,6 @@ void z88cart_slot_device::call_unload()
 }
 
 
-/*-------------------------------------------------
-    call softlist load
--------------------------------------------------*/
-
-bool z88cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
-{
-	machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry );
-	return TRUE;
-}
-
 /*-------------------------------------------------
     get default card software
 -------------------------------------------------*/

src/devices/bus/z88/z88.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/imagedev/cassette.h

@@ -59,7 +59,7 @@ public:
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 	virtual std::string call_display() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
 
 	virtual iodevice_t image_type() const override { return IO_CASSETTE; }
 

src/devices/imagedev/chd_cd.h

@@ -33,7 +33,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_CDROM; }
 

src/devices/imagedev/diablo.h

@@ -33,7 +33,7 @@ public:
 	virtual bool call_load() override;
 	virtual bool call_create(int create_format, util::option_resolution *create_args) override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { device().machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_HARDDISK; }
 

src/devices/imagedev/flopdrv.h

@@ -100,7 +100,7 @@ public:
 	template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); }
 
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override {   return load_software(swlist, swname, start_entry); }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 

src/devices/imagedev/floppy.h

@@ -83,7 +83,7 @@ public:
 	virtual bool call_load() override;
 	virtual void call_unload() override;
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
 	virtual const char *image_interface() const override = 0;
 	virtual iodevice_t image_type() const override { return IO_FLOPPY; }
 

src/devices/imagedev/harddriv.h

@@ -35,7 +35,7 @@ public:
 	virtual bool call_load() override;
 	virtual bool call_create(int create_format, util::option_resolution *create_args) override;
 	virtual void call_unload() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
 
 	virtual iodevice_t image_type() const override { return IO_HARDDISK; }
 

src/devices/imagedev/snapquik.h

@@ -27,7 +27,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
+	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
 	virtual iodevice_t image_type() const override { return IO_SNAPSHOT; }
 
 	virtual bool is_readable()  const override { return 1; }