mamedev · mmicko · Aug 8, 2016 · Aug 2, 2016 · Aug 5, 2016
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
@@ -158,6 +158,8 @@ files {
 	MAME_DIR .. "src/emu/screen.h",
 	MAME_DIR .. "src/emu/softlist.cpp",
 	MAME_DIR .. "src/emu/softlist.h",
+	MAME_DIR .. "src/emu/softlist_dev.cpp",
+	MAME_DIR .. "src/emu/softlist_dev.h",
 	MAME_DIR .. "src/emu/sound.cpp",
 	MAME_DIR .. "src/emu/sound.h",
 	MAME_DIR .. "src/emu/speaker.cpp",

diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
@@ -48,8 +48,6 @@ project "utils"
 		MAME_DIR .. "src/lib/util/corestr.h",
 		MAME_DIR .. "src/lib/util/coreutil.cpp",
 		MAME_DIR .. "src/lib/util/coreutil.h",
-		MAME_DIR .. "src/lib/util/cstrpool.cpp",
-		MAME_DIR .. "src/lib/util/cstrpool.h",
 		MAME_DIR .. "src/lib/util/delegate.cpp",
 		MAME_DIR .. "src/lib/util/delegate.h",
 		MAME_DIR .. "src/lib/util/flac.cpp",

diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h
@@ -3,6 +3,8 @@
 #ifndef __A78_SLOT_H
 #define __A78_SLOT_H
 
+#include "softlist_dev.h"
+
 
 /***************************************************************************
  TYPE DEFINITIONS

diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
@@ -3,6 +3,8 @@
 #ifndef __A800_SLOT_H
 #define __A800_SLOT_H
 
+#include "softlist_dev.h"
+
 
 /***************************************************************************
  TYPE DEFINITIONS

diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h
@@ -12,7 +12,7 @@
 #define __ADAM_EXPANSION_SLOT__
 
 #include "emu.h"
-
+#include "softlist_dev.h"
 
 
 //**************************************************************************

diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h
@@ -3,6 +3,8 @@
 #ifndef __APF_SLOT_H
 #define __APF_SLOT_H
 
+#include "softlist_dev.h"
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h
@@ -3,6 +3,9 @@
 #ifndef __ARCADIA_SLOT_H
 #define __ARCADIA_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
@@ -3,6 +3,9 @@
 #ifndef __ASTROCADE_SLOT_H
 #define __ASTROCADE_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
@@ -37,6 +37,7 @@
 #define __C64_EXPANSION_SLOT__
 
 #include "emu.h"
+#include "softlist_dev.h"
 #include "formats/cbm_crt.h"
 
 

diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
@@ -30,6 +30,7 @@
 #define __CBM2_EXPANSION_SLOT__
 
 #include "emu.h"
+#include "softlist_dev.h"
 
 
 

diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h
@@ -3,6 +3,9 @@
 #ifndef __CHANF_SLOT_H
 #define __CHANF_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h
@@ -11,6 +11,8 @@
 #ifndef __COCOCART_H__
 #define __COCOCART_H__
 
+#include "softlist_dev.h"
+
 
 /***************************************************************************
     CONSTANTS

diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
@@ -31,7 +31,7 @@
 #define __COLECOVISION_CARTRIDGE_SLOT__
 
 #include "emu.h"
-
+#include "softlist_dev.h"
 
 
 //**************************************************************************

diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h
@@ -3,6 +3,9 @@
 #ifndef __CRVISION_SLOT_H
 #define __CRVISION_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h
@@ -3,6 +3,9 @@
 #ifndef __GB_SLOT_H
 #define __GB_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
@@ -3,6 +3,9 @@
 #ifndef __GBA_SLOT_H
 #define __GBA_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h
@@ -3,6 +3,9 @@
 #ifndef __GENERIC_SLOT_H
 #define __GENERIC_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/hp_optroms/hp_optrom.h b/src/devices/bus/hp_optroms/hp_optrom.h
@@ -14,6 +14,8 @@
 #define _HP_OPTROM_H_
 
 #include "emu.h"
+#include "softlist_dev.h"
+
 
 class hp_optrom_cart_device : public device_t,
 								public device_slot_card_interface

diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h
@@ -3,6 +3,9 @@
 #ifndef __INTV_SLOT_H
 #define __INTV_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h
@@ -45,6 +45,8 @@
 #ifndef __IQ151CART_H__
 #define __IQ151CART_H__
 
+#include "softlist_dev.h"
+
 /***************************************************************************
     TYPE DEFINITIONS
 ***************************************************************************/

diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h
@@ -15,6 +15,8 @@
 
 #include "emu.h"
 #include "bus/isa/isa.h"
+#include "softlist_dev.h"
+
 
 //**************************************************************************
 //  TYPE DEFINITIONS

diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h
@@ -11,6 +11,8 @@
 #ifndef __KCEXP_H__
 #define __KCEXP_H__
 
+#include "softlist_dev.h"
+
 /***************************************************************************
     TYPE DEFINITIONS
 ***************************************************************************/

diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h
@@ -3,6 +3,9 @@
 #ifndef __M5_SLOT_H
 #define __M5_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h
@@ -3,6 +3,8 @@
 #ifndef __MD_SLOT_H
 #define __MD_SLOT_H
 
+#include "softlist_dev.h"
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h
@@ -5,6 +5,7 @@
 
 #include "slot.h"
 #include "bus/msx_cart/cartridge.h"
+#include "softlist_dev.h"
 
 
 extern const device_type MSX_SLOT_CARTRIDGE;

diff --git a/src/devices/bus/neogeo/slot.h b/src/devices/bus/neogeo/slot.h
@@ -4,6 +4,8 @@
 #define __NEOGEO_SLOT_H
 
 #include "emu.h"
+#include "softlist_dev.h"
+
 
 /* PCB */
 enum

diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h
@@ -4,6 +4,7 @@
 #define __NES_ALADDIN_H
 
 #include "nxrom.h"
+#include "softlist_dev.h"
 
 
 //----------------------------------

diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h
@@ -4,6 +4,7 @@
 #define __NES_DATACH_H
 
 #include "bandai.h"
+#include "softlist_dev.h"
 #include "machine/i2cmem.h"
 #include "machine/bcreader.h"
 

diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h
@@ -4,6 +4,7 @@
 #define __NES_KARASTUDIO_H
 
 #include "nxrom.h"
+#include "softlist_dev.h"
 
 
 //-----------------------------------------

diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h
@@ -3,6 +3,9 @@
 #ifndef __NES_SLOT_H__
 #define __NES_SLOT_H__
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h
@@ -4,6 +4,7 @@
 #define __NES_SUNSOFT_DCS_H
 
 #include "sunsoft.h"
+#include "softlist_dev.h"
 
 
 //-----------------------------------------------

diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h
@@ -3,6 +3,9 @@
 #ifndef __O2_SLOT_H
 #define __O2_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h
@@ -3,6 +3,9 @@
 #ifndef __PCE_SLOT_H
 #define __PCE_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
@@ -40,7 +40,7 @@
 #define __PLUS4_EXPANSION_SLOT__
 
 #include "emu.h"
-
+#include "softlist_dev.h"
 
 
 //**************************************************************************

diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h
@@ -31,7 +31,7 @@
 #define __QL_ROM_CARTRIDGE_SLOT__
 
 #include "emu.h"
-
+#include "softlist_dev.h"
 
 
 //**************************************************************************

diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h
@@ -3,6 +3,9 @@
 #ifndef __SAT_SLOT_H
 #define __SAT_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h
@@ -3,6 +3,9 @@
 #ifndef __SCV_SLOT_H
 #define __SCV_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h
@@ -3,6 +3,9 @@
 #ifndef __SEGA8_SLOT_H
 #define __SEGA8_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h
@@ -3,6 +3,9 @@
 #ifndef __SNS_SLOT_H
 #define __SNS_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h
@@ -12,6 +12,8 @@
 #include "emu.h"
 #include "ti99defs.h"
 #include "machine/tmc0430.h"
+#include "softlist_dev.h"
+
 
 extern const device_type GROMPORT;
 

diff --git a/src/devices/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h
@@ -3,6 +3,9 @@
 #ifndef __VBOY_SLOT_H
 #define __VBOY_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h
@@ -3,6 +3,9 @@
 #ifndef __VC4000_SLOT_H
 #define __VC4000_SLOT_H
 
+#include "softlist_dev.h"
+
+
 /***************************************************************************
  TYPE DEFINITIONS
  ***************************************************************************/

diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h
@@ -3,6 +3,8 @@
 #ifndef __VCS_SLOT_H
 #define __VCS_SLOT_H
 
+#include "softlist_dev.h"
+
 
 /***************************************************************************
  TYPE DEFINITIONS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,7 @@
		#define __CBM2_EXPANSION_SLOT__

		#include "emu.h"
		#include "softlist_dev.h"



Expand Down