remove legacy forms of (required|optional)_(shared_ptr|ioport)_array

src/devices/bus/cgenie/parallel/joystick.cpp

@@ -95,8 +95,8 @@ ioport_constructor cgenie_joystick_device::device_input_ports() const
 cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 	device_t(mconfig, CGENIE_JOYSTICK, "Joystick Interface EG2013", tag, owner, clock, "cgenie_joystick", __FILE__),
 	device_parallel_interface(mconfig, *this),
-	m_joy(*this, "JOY"),
+	m_joy(*this, "JOY.%u", 0),
-	m_keypad(*this, "KEYPAD"),
+	m_keypad(*this, "KEYPAD.%u", 0),
 	m_select(0)
 {
 }

src/devices/bus/intv_ctrl/ecs_ctrl.cpp

@@ -279,10 +279,10 @@ ioport_constructor intvecs_keybd_device::device_input_ports() const
 	return INPUT_PORTS_NAME( intvecs_keybd );
 }
 
-intvecs_keybd_device::intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intvecs_keybd_device::intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	device_t(mconfig, ECS_KEYBD, "Mattel Intellivision ECS Keyboard", tag, owner, clock, "intvecs_keybd", __FILE__),
+	: device_t(mconfig, ECS_KEYBD, "Mattel Intellivision ECS Keyboard", tag, owner, clock, "intvecs_keybd", __FILE__)
-	device_intvecs_control_port_interface(mconfig, *this),
+	, device_intvecs_control_port_interface(mconfig, *this)
-	m_keybd(*this, "ROW")
+	, m_keybd(*this, "ROW.%u", 0)
 {
 }
 
@@ -415,7 +415,7 @@ ioport_constructor intvecs_synth_device::device_input_ports() const
 intvecs_synth_device::intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 	device_t(mconfig, ECS_SYNTH, "Mattel Intellivision ECS Synthetizer", tag, owner, clock, "intvecs_synth", __FILE__),
 	device_intvecs_control_port_interface(mconfig, *this),
-	m_synth(*this, "SYNTH")
+	m_synth(*this, "SYNTH.%u", 0)
 {
 }
 

src/devices/bus/msx_cart/msx_audio_kb.cpp

@@ -52,8 +52,9 @@ public:
 		: device_t(mconfig, MSX_AUDIO_KB_HXMU901, "Toshiba HXMU901", tag, owner, clock, "hxmu901", __FILE__)
 		, msx_audio_kb_port_interface(mconfig, *this)
 		, m_row(0)
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
-	{ };
+	{
+	}
 
 	virtual ioport_constructor device_input_ports() const override;
 
@@ -182,8 +183,8 @@ public:
 		: device_t(mconfig, MSX_AUDIO_KB_NMS1160, "Philips NMS-1160", tag, owner, clock, "nms1160", __FILE__)
 		, msx_audio_kb_port_interface(mconfig, *this)
 		, m_row(0)
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
-	{ };
+	{ }
 
 	virtual ioport_constructor device_input_ports() const override;
 

src/devices/bus/neogeo_ctrl/mahjong.cpp

@@ -93,17 +93,15 @@ ioport_constructor neogeo_mjctrl_device::device_input_ports() const
 //  neogeo_joystick_device - constructor
 //-------------------------------------------------
 
-neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source):
+neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
-						device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
-						device_neogeo_control_port_interface(mconfig, *this),
+	, device_neogeo_control_port_interface(mconfig, *this)
-						m_mjpanel(*this, "MJ")
+	, m_mjpanel(*this, "MJ.%u", 0)
 {
 }
 
-neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-						device_t(mconfig, NEOGEO_MJCTRL_AC, "SNK Neo Geo Arcade Mahjong panel", tag, owner, clock, "neogeo_mjac", __FILE__),
+	: neogeo_mjctrl_ac_device(mconfig, NEOGEO_MJCTRL_AC, "SNK Neo Geo Arcade Mahjong panel", tag, owner, clock, "neogeo_mjac", __FILE__)
-						device_neogeo_control_port_interface(mconfig, *this),
-						m_mjpanel(*this, "MJ")
 {
 }
 

src/devices/bus/nes_ctrl/fckeybrd.cpp

@@ -144,11 +144,13 @@ machine_config_constructor nes_fckeybrd_device::device_mconfig_additions() const
 //  nes_fckeybrd_device - constructor
 //-------------------------------------------------
 
-nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__),
+	: device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__)
-					device_nes_control_port_interface(mconfig, *this),
+	, device_nes_control_port_interface(mconfig, *this)
-					m_cassette(*this, "tape"),
+	, m_cassette(*this, "tape")
-					m_kbd(*this, "FCKEY"), m_fck_scan(0), m_fck_mode(0)
+	, m_kbd(*this, "FCKEY.%u", 0)
+	, m_fck_scan(0)
+	, m_fck_mode(0)
 {
 }
 

src/devices/bus/nes_ctrl/ftrainer.cpp

@@ -83,10 +83,11 @@ ioport_constructor nes_ftrainer_device::device_input_ports() const
 //  nes_ftrainer_device - constructor
 //-------------------------------------------------
 
-nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__),
+	: device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__)
-					device_nes_control_port_interface(mconfig, *this),
+	, device_nes_control_port_interface(mconfig, *this)
-					m_trainer(*this, "FT_COL"), m_row_scan(0)
+	, m_trainer(*this, "FT_COL.%u", 0)
+	, m_row_scan(0)
 {
 }
 

src/devices/bus/nes_ctrl/mjpanel.cpp

@@ -69,10 +69,11 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const
 //  nes_mjpanel_device - constructor
 //-------------------------------------------------
 
-nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__),
+	: device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__)
-					device_nes_control_port_interface(mconfig, *this),
+	, device_nes_control_port_interface(mconfig, *this)
-					m_panel(*this, "MJPANEL"), m_latch(0)
+	, m_panel(*this, "MJPANEL.%u", 0)
+	, m_latch(0)
 {
 }
 

src/devices/bus/nes_ctrl/suborkey.cpp

@@ -160,10 +160,12 @@ ioport_constructor nes_suborkey_device::device_input_ports() const
 //  nes_suborkey_device - constructor
 //-------------------------------------------------
 
-nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__),
+	: device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__)
-					device_nes_control_port_interface(mconfig, *this),
+	, device_nes_control_port_interface(mconfig, *this)
-					m_kbd(*this, "SUBOR"), m_fck_scan(0), m_fck_mode(0)
+	, m_kbd(*this, "SUBOR.%u", 0)
+	, m_fck_scan(0)
+	, m_fck_mode(0)
 {
 }
 

src/devices/bus/sat_ctrl/keybd.cpp

@@ -208,7 +208,7 @@ ioport_constructor saturn_keybd_device::device_input_ports() const
 saturn_keybd_device::saturn_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 					device_t(mconfig, SATURN_KEYBD, "Sega Saturn Keyboard", tag, owner, clock, "saturn_keybd", __FILE__),
 					device_saturn_control_port_interface(mconfig, *this),
-					m_key(*this, "KEY"),
+					m_key(*this, "KEY.%u", 0),
 					m_key_s1(*this, "KEYS_1")
 {
 	m_ctrl_id = 0x34;

src/emu/devfind.h

@@ -19,16 +19,6 @@
 
 #define FINDER_DUMMY_TAG "finder_dummy_tag"
 
-//**************************************************************************
-//  IOPORT ARRAY MACROS
-//**************************************************************************
-
-// these macros can be used to initialize an ioport_array with
-// individual port names, instead of a base name + numeric suffix
-
-#define IOPORT_ARRAY_MEMBER(name) const char * const name[] =
-#define DECLARE_IOPORT_ARRAY(name) static const char * const name[]
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -285,19 +275,6 @@ private:
 	{
 	}
 
-	template <unsigned... V>
-	array_finder_base(device_t &base, char const *tag, indices<V...>)
-		: m_tag{ util::string_format("%s.%u", tag, V)... }
-		, m_array{ { base, m_tag[V].c_str() }... }
-	{
-	}
-
-	template <unsigned... V>
-	array_finder_base(device_t &base, char const *const tags[], indices<V...>)
-		: m_array{ { base, tags[V] }... }
-	{
-	}
-
 	template <unsigned... V>
 	array_finder_base(device_t &base, std::array<char const *, Count> const &tags, indices<V...>)
 		: m_array{ { base, tags[V] }... }
@@ -306,8 +283,6 @@ private:
 
 protected:
 	template <typename F> array_finder_base(device_t &base, F const &fmt, unsigned start) : array_finder_base(base, fmt, start, index_range<Count>()) { }
-	array_finder_base(device_t &base, char const *tag) : array_finder_base(base, tag, index_range<Count>()) { }
-	array_finder_base(device_t &base, char const *const tags[]) : array_finder_base(base, tags, index_range<Count>()) { }
 	array_finder_base(device_t &base, std::array<char const *, Count> const &tags) : array_finder_base(base, tags, index_range<Count>()) { }
 
 	std::string m_tag[Count];
@@ -333,16 +308,6 @@ public:
 	{
 	}
 
-	ioport_array_finder(device_t &base, const char *basetag)
-		: array_finder_base<ioport_finder<Required>, Count>(base, basetag)
-	{
-	}
-
-	ioport_array_finder(device_t &base, char const *const tags[])
-		: array_finder_base<ioport_finder<Required>, Count>(base, tags)
-	{
-	}
-
 	ioport_array_finder(device_t &base, std::array<char const *, Count> const &tags)
 		: array_finder_base<ioport_finder<Required>, Count>(base, tags)
 	{
@@ -355,8 +320,6 @@ class optional_ioport_array: public ioport_array_finder<Count, false>
 {
 public:
 	template <typename F> optional_ioport_array(device_t &base, F const &fmt, unsigned start) : ioport_array_finder<Count, false>(base, fmt, start) { }
-	optional_ioport_array(device_t &base, char const *basetag) : ioport_array_finder<Count, false>(base, basetag) { }
-	optional_ioport_array(device_t &base, char const *const tags[]) : ioport_array_finder<Count, false>(base, tags) { }
 	optional_ioport_array(device_t &base, std::array<char const *, Count> const &tags) : ioport_array_finder<Count, false>(base, tags) { }
 };
 
@@ -366,8 +329,6 @@ class required_ioport_array: public ioport_array_finder<Count, true>
 {
 public:
 	template <typename F> required_ioport_array(device_t &base, F const &fmt, unsigned start) : ioport_array_finder<Count, true>(base, fmt, start) { }
-	required_ioport_array(device_t &base, char const *basetag) : ioport_array_finder<Count, true>(base, basetag) { }
-	required_ioport_array(device_t &base, char const *const tags[]) : ioport_array_finder<Count, true>(base, tags) { }
 	required_ioport_array(device_t &base, std::array<char const *, Count> const &tags) : ioport_array_finder<Count, true>(base, tags) { }
 };
 
@@ -513,16 +474,6 @@ public:
 	{
 	}
 
-	shared_ptr_array_finder(device_t &base, const char *basetag)
-		: array_finder_base<shared_ptr_finder<PointerType, Required>, Count>(base, basetag)
-	{
-	}
-
-	shared_ptr_array_finder(device_t &base, char const *const tags[])
-		: array_finder_base<shared_ptr_finder<PointerType, Required>, Count>(base, tags)
-	{
-	}
-
 	shared_ptr_array_finder(device_t &base, std::array<char const *, Count> const &tags)
 		: array_finder_base<shared_ptr_finder<PointerType, Required>, Count>(base, tags)
 	{
@@ -535,8 +486,6 @@ class optional_shared_ptr_array : public shared_ptr_array_finder<PointerType, Co
 {
 public:
 	template <typename F> optional_shared_ptr_array(device_t &base, F const &fmt, unsigned start) : shared_ptr_array_finder<PointerType, Count, false>(base, fmt, start) { }
-	optional_shared_ptr_array(device_t &base, char const *basetag) : shared_ptr_array_finder<PointerType, Count, false>(base, basetag) { }
-	optional_shared_ptr_array(device_t &base, char const *const tags[]) : shared_ptr_array_finder<PointerType, Count, false>(base, tags) { }
 	optional_shared_ptr_array(device_t &base, std::array<char const *, Count> const &tags) : shared_ptr_array_finder<PointerType, Count, false>(base, tags) { }
 };
 
@@ -546,8 +495,6 @@ class required_shared_ptr_array : public shared_ptr_array_finder<PointerType, Co
 {
 public:
 	template <typename F> required_shared_ptr_array(device_t &base, F const &fmt, unsigned start) : shared_ptr_array_finder<PointerType, Count, true>(base, fmt, start) { }
-	required_shared_ptr_array(device_t &base, char const *basetag) : shared_ptr_array_finder<PointerType, Count, true>(base, basetag) { }
-	required_shared_ptr_array(device_t &base, char const *const tags[]) : shared_ptr_array_finder<PointerType, Count, true>(base, tags) { }
 	required_shared_ptr_array(device_t &base, std::array<char const *, Count> const &tags) : shared_ptr_array_finder<PointerType, Count, true>(base, tags) { }
 };
 

src/emu/device.cpp

@@ -934,4 +934,4 @@ const std::vector<rom_entry> &device_t::rom_region_vector() const
 		m_rom_entries = rom_build_entries(device_rom_region());
 	}
 	return m_rom_entries;
-}
+}

src/mame/drivers/alphasma.cpp

@@ -23,16 +23,17 @@ class alphasmart_state : public driver_device
 {
 public:
 	alphasmart_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_lcdc0(*this, "ks0066_0"),
+		, m_lcdc0(*this, "ks0066_0")
-			m_lcdc1(*this, "ks0066_1"),
+		, m_lcdc1(*this, "ks0066_1")
-			m_nvram(*this, "nvram"),
+		, m_nvram(*this, "nvram")
-			m_ram(*this, RAM_TAG),
+		, m_ram(*this, RAM_TAG)
-			m_rambank(*this, "rambank"),
+		, m_rambank(*this, "rambank")
-			m_keyboard(*this, "COL"),
+		, m_keyboard(*this, "COL.%u", 0)
-			m_battery_status(*this, "BATTERY")
+		, m_battery_status(*this, "BATTERY")
-		{ }
+	{
+	}
 
 	required_device<cpu_device> m_maincpu;
 	required_device<hd44780_device> m_lcdc0;
@@ -69,9 +70,10 @@ class asma2k_state : public alphasmart_state
 {
 public:
 	asma2k_state(const machine_config &mconfig, device_type type, const char *tag)
-		: alphasmart_state(mconfig, type, tag),
+		: alphasmart_state(mconfig, type, tag)
-			m_intram(*this, "internal_ram")
+		, m_intram(*this, "internal_ram")
-		{ }
+	{
+	}
 
 	required_shared_ptr<UINT8> m_intram;
 

src/mame/drivers/apf.cpp

@@ -101,8 +101,8 @@ public:
 		, m_fdc(*this, "fdc")
 		, m_floppy0(*this, "fdc:0")
 		, m_floppy1(*this, "fdc:1")
-		, m_joy(*this, "joy")
+		, m_joy(*this, "joy.%u", 0)
-		, m_key(*this, "key")
+		, m_key(*this, "key.%u", 0)
 		, m_p_videoram(*this, "videoram")
 	{ }
 

src/mame/drivers/astrocde.cpp

@@ -234,8 +234,6 @@ WRITE8_MEMBER(astrocde_state::seawolf2_sound_2_w)// Port 41
  *
  *************************************/
 
-IOPORT_ARRAY_MEMBER(astrocde_state::trackball_inputs) { "TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1" };
-
 CUSTOM_INPUT_MEMBER(astrocde_state::ebases_trackball_r)
 {
 	return m_trackball[m_input_select]->read();
@@ -441,8 +439,6 @@ READ8_MEMBER(astrocde_state::demndrgn_io_r)
 }
 
 
-IOPORT_ARRAY_MEMBER(astrocde_state::joystick_inputs) { "MOVEX", "MOVEY" };
-
 
 CUSTOM_INPUT_MEMBER(astrocde_state::demndragn_joystick_r)
 {

src/mame/drivers/atari_s1.cpp

@@ -65,7 +65,7 @@ public:
 		, m_maincpu(*this, "maincpu")
 		, m_p_ram(*this, "ram")
 		, m_dac(*this, "dac")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(m1080_r);

src/mame/drivers/bbcbc.cpp

@@ -44,7 +44,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_pio(*this, "z80pio"),
 		m_cart(*this, "cartslot"),
-		m_buttons(*this, "BUTTONS")
+		m_buttons(*this, "BUTTONS.%u", 0)
 	{ }
 
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/bcs3.cpp

@@ -65,7 +65,7 @@ public:
 		, m_p_chargen(*this, "chargen")
 		, m_p_videoram(*this, "videoram")
 		, m_cass(*this, "cassette")
-		, m_io_keyboard(*this, "KEY")
+		, m_io_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(keyboard_r);

src/mame/drivers/bnstars.cpp

@@ -108,14 +108,14 @@ public:
 			m_ms32_bg1_ram(*this, "bg1_ram"),
 			m_ms32_roz0_ram(*this, "roz0_ram"),
 			m_ms32_roz1_ram(*this, "roz1_ram"),
-			m_ms32_roz_ctrl(*this, "roz_ctrl"),
+			m_ms32_roz_ctrl(*this, "roz_ctrl.%u", 0),
 			m_ms32_spram(*this, "spram"),
 			m_ms32_tx0_scroll(*this, "tx0_scroll"),
 			m_ms32_bg0_scroll(*this, "bg0_scroll"),
 			m_ms32_tx1_scroll(*this, "tx1_scroll"),
 			m_ms32_bg1_scroll(*this, "bg1_scroll"),
-			m_p1_keys(*this, "P1KEY"),
+			m_p1_keys(*this, "P1KEY.%u", 0),
-			m_p2_keys(*this, "P2KEY") { }
+			m_p2_keys(*this, "P2KEY.%u", 0) { }
 
 	tilemap_t *m_ms32_tx_tilemap[2];
 	tilemap_t *m_ms32_bg_tilemap[2];

src/mame/drivers/br8641.cpp

@@ -39,7 +39,7 @@ public:
 		, m_pio2(*this, "pio2")
 		, m_pio3(*this, "pio3")
 		, m_ctc(*this, "ctc")
-		, m_io_keyboard(*this, "KEY")
+		, m_io_keyboard(*this, "KEY.%u", 0)
 		, m_beep(*this, "beeper")
 	{ }
 

src/mame/drivers/cc40.cpp

@@ -92,7 +92,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_dac(*this, "dac"),
 		m_cart(*this, "cartslot"),
-		m_key_matrix(*this, "IN"),
+		m_key_matrix(*this, "IN.%u", 0),
 		m_battery_inp(*this, "BATTERY")
 	{
 		m_sysram[0] = nullptr;

src/mame/drivers/cgenie.cpp

@@ -42,7 +42,7 @@ public:
 		m_char_rom(*this, "gfx1"),
 		m_color_ram(*this, "colorram"),
 		m_font_ram(*this, "fontram"),
-		m_keyboard(*this, "KEY"),
+		m_keyboard(*this, "KEY.%u", 0),
 		m_palette(nullptr),
 		m_control(0xff),
 		m_rs232_rx(1),

src/mame/drivers/csplayh5.cpp

@@ -46,7 +46,7 @@ public:
 		m_dac1(*this, "dac1"),
 		m_dac2(*this, "dac2"),
 		m_soundlatch(*this, "soundlatch"),
-		m_key(*this, "KEY"),
+		m_key(*this, "KEY.%u", 0),
 		m_region_maincpu(*this, "maincpu"),
 		m_region_audiocpu(*this, "audiocpu"),
 		m_bank1(*this, "bank1")

src/mame/drivers/excali64.cpp

@@ -56,7 +56,7 @@ public:
 		, m_maincpu(*this, "maincpu")
 		, m_cass(*this, "cassette")
 		, m_crtc(*this, "crtc")
-		, m_io_keyboard(*this, "KEY")
+		, m_io_keyboard(*this, "KEY.%u", 0)
 		, m_dma(*this, "dma")
 		, m_u12(*this, "u12")
 		, m_centronics(*this, "centronics")

src/mame/drivers/fc100.cpp

@@ -58,7 +58,7 @@ public:
 		, m_cart(*this, "cartslot")
 		, m_uart(*this, "uart")
 		, m_centronics(*this, "centronics")
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(mc6847_videoram_r);

src/mame/drivers/flicker.cpp

@@ -31,7 +31,7 @@ public:
 		, m_maincpu(*this, "maincpu")
 		, m_testport(*this, "TEST")
 		, m_coinport(*this, "COIN")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(port00_w);

src/mame/drivers/fp1100.cpp

@@ -73,7 +73,7 @@ public:
 		, m_subcpu(*this, "sub")
 		, m_crtc(*this, "crtc")
 		, m_p_videoram(*this, "videoram")
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
 		, m_beep(*this, "beeper")
 		, m_centronics(*this, "centronics")
 		, m_cass(*this, "cassette")

src/mame/drivers/funkball.cpp

@@ -85,12 +85,12 @@ class funkball_state : public pcat_base_state
 {
 public:
 	funkball_state(const machine_config &mconfig, device_type type, const char *tag)
-		: pcat_base_state(mconfig, type, tag),
+		: pcat_base_state(mconfig, type, tag)
-			m_voodoo(*this, "voodoo_0"),
+		, m_voodoo(*this, "voodoo_0")
-			m_unk_ram(*this, "unk_ram"),
+		, m_unk_ram(*this, "unk_ram")
-			m_flashbank(*this, "flashbank"),
+		, m_flashbank(*this, "flashbank")
-			m_terminal(*this, "terminal"),
+		, m_terminal(*this, "terminal")
-			m_inputs(*this, "IN")
+		, m_inputs(*this, "IN.%u", 0)
 	{ }
 
 	UINT8 m_funkball_config_reg_sel;

src/mame/drivers/g627.cpp

@@ -52,8 +52,8 @@ public:
 	g627_state(const machine_config &mconfig, device_type type, const char *tag)
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
-		, m_testipt(*this, "TEST")
+		, m_testipt(*this, "TEST.%u", 0)
 	{ }
 
 	DECLARE_DRIVER_INIT(v115);

src/mame/drivers/glasgow.cpp

@@ -54,7 +54,7 @@ public:
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_beep(*this, "beeper")
-		, m_keyboard(*this, "LINE")
+		, m_keyboard(*this, "LINE.%u", 0)
 		{ }
 
 	DECLARE_WRITE16_MEMBER(glasgow_lcd_w);

src/mame/drivers/gticlub.cpp

@@ -264,7 +264,10 @@ public:
 		m_analog1(*this, "AN1"),
 		m_analog2(*this, "AN2"),
 		m_analog3(*this, "AN3"),
-		m_ports(*this, ports) { }
+		m_ports(*this, { { "IN0", "IN1", "IN2", "IN3" } })
+	{
+	}
+
 
 	// TODO: Needs verification on real hardware
 	static const int m_sound_timer_usec = 2400;
@@ -291,8 +294,6 @@ public:
 
 	required_ioport_array<4> m_ports;
 
-	DECLARE_IOPORT_ARRAY(ports);
-
 	DECLARE_WRITE32_MEMBER(paletteram32_w);
 	DECLARE_READ32_MEMBER(gticlub_k001604_tile_r);
 	DECLARE_WRITE32_MEMBER(gticlub_k001604_tile_w);
@@ -394,8 +395,6 @@ WRITE32_MEMBER(gticlub_state::gticlub_k001604_reg_w)
 
 /******************************************************************/
 
-IOPORT_ARRAY_MEMBER(gticlub_state::ports) { "IN0", "IN1", "IN2", "IN3" };
-
 READ8_MEMBER(gticlub_state::sysreg_r)
 {
 	switch (offset)

src/mame/drivers/gts1.cpp

@@ -87,7 +87,7 @@ public:
 	gts1_state(const machine_config &mconfig, device_type type, const char *tag)
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_switches(*this, "X")
+		, m_switches(*this, "X.%u", 0)
 	{ }
 
 	DECLARE_DRIVER_INIT(gts1);

src/mame/drivers/gts3.cpp

@@ -43,7 +43,7 @@ public:
 		, m_maincpu(*this, "maincpu")
 		, m_u4(*this, "u4")
 		, m_u5(*this, "u5")
-		, m_switches(*this, "X")
+		, m_switches(*this, "X.%u", 0)
 	{ }
 
 	DECLARE_DRIVER_INIT(gts3);

src/mame/drivers/gts3a.cpp

@@ -33,7 +33,7 @@ public:
 		, m_dmdcpu(*this, "dmdcpu")
 		, m_u4(*this, "u4")
 		, m_u5(*this, "u5")
-		, m_switches(*this, "X")
+		, m_switches(*this, "X.%u", 0)
 	{ }
 
 	DECLARE_DRIVER_INIT(gts3a);

src/mame/drivers/harddriv.cpp

@@ -393,8 +393,8 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
 			m_in0(*this, "IN0"),
 			m_sw1(*this, "SW1"),
 			m_a80000(*this, "a80000"),
-			m_8badc(*this, "8BADC"),
+			m_8badc(*this, "8BADC.%u", 0),
-			m_12badc(*this, "12BADC"),
+			m_12badc(*this, "12BADC.%u", 0),
 			m_irq_state(0),
 			m_gsp_irq_state(0),
 			m_msp_irq_state(0),

src/mame/drivers/hh_cop400.cpp

@@ -35,7 +35,7 @@ public:
 	hh_cop400_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speaker(*this, "speaker"),
 		m_display_wait(33),
 		m_display_maxy(1),

src/mame/drivers/hh_hmcs40.cpp

@@ -106,7 +106,7 @@ public:
 		m_audiocpu(*this, "audiocpu"),
 		m_soundlatch(*this, "soundlatch"),
 		m_soundlatch2(*this, "soundlatch2"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speaker(*this, "speaker"),
 		m_display_wait(33),
 		m_display_maxy(1),

src/mame/drivers/hh_melps4.cpp

@@ -21,7 +21,7 @@ public:
 	hh_melps4_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speaker(*this, "speaker"),
 		m_display_wait(33),
 		m_display_maxy(1),

src/mame/drivers/hh_pic16.cpp

@@ -37,7 +37,7 @@ public:
 	hh_pic16_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speaker(*this, "speaker"),
 		m_display_wait(33),
 		m_display_maxy(1),

src/mame/drivers/hh_sm510.cpp

@@ -23,7 +23,7 @@ public:
 	hh_sm510_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speaker(*this, "speaker"),
 		m_inp_lines(0)
 	{ }

src/mame/drivers/inder.cpp

@@ -49,7 +49,7 @@ public:
 		, m_7a(*this, "7a")
 		, m_9a(*this, "9a")
 		, m_9b(*this, "9b")
-		, m_switches(*this, "SW")
+		, m_switches(*this, "SW.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(ppic_r);

src/mame/drivers/itech8.cpp

@@ -518,8 +518,6 @@
 
 
 
-IOPORT_ARRAY_MEMBER(itech8_state::analog_inputs) { "AN_C", "AN_D", "AN_E", "AN_F" };
-
 /*************************************
  *
  *  Interrupt handling

src/mame/drivers/itt3030.cpp

@@ -216,10 +216,10 @@ public:
 		, m_floppy0(*this, "fdc:0")
 		, m_floppy1(*this, "fdc:1")
 		, m_beep(*this, "beeper")
-		, m_keyrows(*this, "ROW")
+		, m_keyrows(*this, "ROW.%u", 0)
-		, m_vram(*this, "vram"),
+		, m_vram(*this, "vram")
-		m_gfxdecode(*this, "gfxdecode"),
+		, m_gfxdecode(*this, "gfxdecode")
-		m_palette(*this, "palette")
+		, m_palette(*this, "palette")
 	{ }
 
 	// devices

src/mame/drivers/k28.cpp

@@ -37,7 +37,7 @@ public:
 		m_tms6100(*this, "tms6100"),
 		m_speech(*this, "speech"),
 		m_onbutton_timer(*this, "on_button"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_display_wait(33),
 		m_display_maxy(1),
 		m_display_maxx(0)

src/mame/drivers/mk14.cpp

@@ -47,7 +47,7 @@ public:
 	mk14_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_keyboard(*this, "X")
+		, m_keyboard(*this, "X.%u", 0)
 		, m_cass(*this, "cassette")
 		, m_dac(*this, "dac")
 	{ }

src/mame/drivers/mstation.cpp

@@ -38,14 +38,15 @@ class mstation_state : public driver_device
 {
 public:
 	mstation_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_ram(*this, RAM_TAG),
+		, m_ram(*this, RAM_TAG)
-			m_bankdev1(*this, "bank0"),
+		, m_bankdev1(*this, "bank0")
-			m_bankdev2(*this, "bank1"),
+		, m_bankdev2(*this, "bank1")
-			m_keyboard(*this, "LINE"),
+		, m_keyboard(*this, "LINE.%u", 0)
-			m_nvram(*this, "nvram")
+		, m_nvram(*this, "nvram")
-		{ }
+	{
+	}
 
 	required_device<cpu_device> m_maincpu;
 	required_device<ram_device> m_ram;

src/mame/drivers/namcona1.cpp

@@ -662,8 +662,6 @@ WRITE8_MEMBER(namcona1_state::port6_w)
 	m_mcu_port6 = data;
 }
 
-IOPORT_ARRAY_MEMBER(namcona1_state::muxed_inputs) { "P4", "DSW", "P1", "P2" };
-
 READ8_MEMBER(namcona1_state::port7_r)
 {
 	if ((m_mcu_port6 & 0x80) == 0)

src/mame/drivers/namcos23.cpp

@@ -1427,7 +1427,7 @@ public:
 		m_screen(*this, "screen"),
 		m_palette(*this, "palette"),
 		m_generic_paletteram_32(*this, "paletteram"),
-		m_adc_ports(*this, "ADC")
+		m_adc_ports(*this, "ADC.%u", 0)
 	{ }
 
 	required_device<mips3_device> m_maincpu;

src/mame/drivers/nascom1.cpp

@@ -50,7 +50,7 @@ public:
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
 		m_videoram(*this, "videoram"),
-		m_keyboard(*this, "KEY")
+		m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/nokia_3310.cpp

@@ -30,7 +30,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_pcd8544(*this, "pcd8544"),
-		m_keypad(*this, "COL"),
+		m_keypad(*this, "COL.%u", 0),
 		m_pwr(*this, "PWR")
 	{ }
 

src/mame/drivers/novag6502.cpp

@@ -33,7 +33,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_beeper(*this, "beeper"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_display_wait(33),
 		m_display_maxy(1),
 		m_display_maxx(0)

src/mame/drivers/odyssey2.cpp

@@ -28,8 +28,8 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_i8244(*this, "i8244"),
 		m_cart(*this, "cartslot"),
-		m_keyboard(*this, "KEY"),
+		m_keyboard(*this, "KEY.%u", 0),
-		m_joysticks(*this, "JOY") { }
+		m_joysticks(*this, "JOY.%u", 0) { }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<i8244_device> m_i8244;

src/mame/drivers/pasopia.cpp

@@ -31,7 +31,7 @@ public:
 		, m_pio(*this, "z80pio")
 		, m_crtc(*this, "crtc")
 		, m_palette(*this, "palette")
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(pasopia_ctrl_w);

src/mame/drivers/pasopia7.cpp

@@ -49,7 +49,7 @@ public:
 		, m_sn1(*this, "sn1")
 		, m_sn2(*this, "sn2")
 		, m_palette(*this, "palette")
-		, m_keyboard(*this, "KEY")
+		, m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(vram_r);

src/mame/drivers/pc1500.cpp

@@ -23,12 +23,14 @@ class pc1500_state : public driver_device
 {
 public:
 	pc1500_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_rtc(*this, "upd1990a"),
+		, m_rtc(*this, "upd1990a")
-			m_lcd_data(*this, "lcd_data"),
+		, m_lcd_data(*this, "lcd_data")
-			m_keyboard(*this, "KEY"),
+		, m_keyboard(*this, "KEY,%u", 0)
-			m_io_on(*this, "ON") { }
+		, m_io_on(*this, "ON")
+	{
+	}
 
 	required_device<cpu_device> m_maincpu;
 	required_device<upd1990a_device> m_rtc;

src/mame/drivers/pegasus.cpp

@@ -62,7 +62,7 @@ public:
 		, m_exp_0c(*this, "exp0c")
 		, m_exp_0d(*this, "exp0d")
 		, m_p_videoram(*this, "videoram")
-		, m_io_keyboard(*this, "KEY")
+		, m_io_keyboard(*this, "KEY.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(pegasus_keyboard_r);

src/mame/drivers/peyper.cpp

@@ -44,7 +44,7 @@ public:
 	peyper_state(const machine_config &mconfig, device_type type, const char *tag)
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(sw_r);

src/mame/drivers/play_1.cpp

@@ -32,7 +32,7 @@ public:
 	play_1_state(const machine_config &mconfig, device_type type, const char *tag)
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_dips(*this, "X")
+		, m_dips(*this, "X.%u", 0)
 		, m_monotone(*this, "monotone")
 	{ }
 

src/mame/drivers/play_2.cpp

@@ -45,7 +45,7 @@ public:
 		, m_4013b(*this, "4013b")
 		, m_1863(*this, "1863")
 		, m_aysnd1(*this, "aysnd1")
-		, m_keyboard(*this, "X")
+		, m_keyboard(*this, "X.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(port01_w);

src/mame/drivers/play_3.cpp

@@ -65,7 +65,7 @@ public:
 		, m_4013b(*this, "4013b")
 		, m_aysnd1(*this, "aysnd1")
 		, m_aysnd2(*this, "aysnd2")
-		, m_keyboard(*this, "X")
+		, m_keyboard(*this, "X.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(port01_w);

src/mame/drivers/prestige.cpp

@@ -90,17 +90,17 @@ class prestige_state : public driver_device
 {
 public:
 	prestige_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_ram(*this, RAM_TAG),
+		, m_ram(*this, RAM_TAG)
-			m_cart(*this, "cartslot"),
+		, m_cart(*this, "cartslot")
-			m_keyboard(*this, "KEY"),
+		, m_keyboard(*this, "KEY.%u", 0)
-			m_cart_type(*this, "CART_TYPE"),
+		, m_cart_type(*this, "CART_TYPE")
-			m_bank1(*this, "bank1"),
+		, m_bank1(*this, "bank1")
-			m_bank2(*this, "bank2"),
+		, m_bank2(*this, "bank2")
-			m_bank3(*this, "bank3"),
+		, m_bank3(*this, "bank3")
-			m_bank4(*this, "bank4"),
+		, m_bank4(*this, "bank4")
-			m_bank5(*this, "bank5")
+		, m_bank5(*this, "bank5")
 		{ }
 
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/rabbit.cpp

@@ -106,7 +106,7 @@ public:
 		m_viewregs7(*this, "viewregs7"),
 		m_viewregs9(*this, "viewregs9"),
 		m_viewregs10(*this, "viewregs10"),
-		m_tilemap_regs(*this, "tilemap_regs"),
+		m_tilemap_regs(*this, "tilemap_regs.%u", 0),
 		m_spriteregs(*this, "spriteregs"),
 		m_blitterregs(*this, "blitterregs"),
 		m_spriteram(*this, "spriteram") { }

src/mame/drivers/rex6000.cpp

@@ -126,9 +126,10 @@ class oz750_state : public rex6000_state
 {
 public:
 	oz750_state(const machine_config &mconfig, device_type type, const char *tag)
-		: rex6000_state(mconfig, type, tag),
+		: rex6000_state(mconfig, type, tag)
-			m_keyboard(*this, "COL")
+		, m_keyboard(*this, "COL.%u", 0)
-		{ }
+	{
+	}
 
 	optional_ioport_array<10> m_keyboard;
 

src/mame/drivers/scv.cpp

@@ -23,7 +23,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_upd1771c(*this, "upd1771c"),
 		m_cart(*this, "cartslot"),
-		m_pa(*this, "PA"),
+		m_pa(*this, "PA.%u", 0),
 		m_pc0(*this, "PC0"),
 		m_charrom(*this, "charrom") { }
 

src/mame/drivers/segaorun.cpp

@@ -678,8 +678,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(segaorun_state::bankmotor_update)
 //  for Out Run
 //-------------------------------------------------
 
-IOPORT_ARRAY_MEMBER( segaorun_state::digital_ports ) { "SERVICE", "UNKNOWN", "COINAGE", "DSW" };
-
 READ16_MEMBER( segaorun_state::outrun_custom_io_r )
 {
 	offset &= 0x7f/2;

src/mame/drivers/segaybd.cpp

@@ -114,9 +114,6 @@ WRITE16_MEMBER( segaybd_state::analog_w )
 //  io_chip_r - handle reads from the I/O chip
 //-------------------------------------------------
 
-IOPORT_ARRAY_MEMBER( segaybd_state::digital_ports )
-{ "P1", "GENERAL", "LIMITSW", "PORTD", "PORTE", "DSW", "COINAGE", "PORTH" };
-
 READ16_MEMBER( segaybd_state::io_chip_r )
 {
 	offset &= 0x1f/2;

src/mame/drivers/sidearms.cpp

@@ -63,9 +63,7 @@ WRITE8_MEMBER(sidearms_state::bankswitch_w)
 }
 
 
-/* Turtle Ship input ports are rotated 90 degrees */
+// Turtle Ship input ports are rotated 90 degrees
-IOPORT_ARRAY_MEMBER(sidearms_state::ports) { "SYSTEM", "P1", "P2", "DSW0", "DSW1" };
-
 READ8_MEMBER(sidearms_state::turtship_ports_r)
 {
 	int res = 0;

src/mame/drivers/spc1000.cpp

@@ -154,7 +154,7 @@ public:
 		, m_cass(*this, "cassette")
 		, m_ram(*this, RAM_TAG)
 		, m_p_videoram(*this, "videoram")
-		, m_io_kb(*this, "LINE")
+		, m_io_kb(*this, "LINE.%u", 0)
 		, m_io_joy(*this, "JOY")
 		, m_centronics(*this, "centronics")
 	{}

src/mame/drivers/spc1500.cpp

@@ -245,7 +245,7 @@ public:
 		, m_ram(*this, RAM_TAG)
 		, m_p_videoram(*this, "videoram")
 		, m_pcgram(*this, "pcgram")
-		, m_io_kb(*this, "LINE")
+		, m_io_kb(*this, "LINE.%u", 0)
 		, m_io_joy(*this, "JOY")
 		, m_dipsw(*this, "DIP_SWITCH")
 		, m_centronics(*this, "centronics")

src/mame/drivers/spectra.cpp

@@ -47,7 +47,7 @@ public:
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_snsnd(*this, "snsnd")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
 		, m_p_ram(*this, "nvram")
 	{ }
 

src/mame/drivers/spinb.cpp

@@ -50,7 +50,7 @@ public:
 		, m_msm_m(*this, "msm_m")
 		, m_ic5a(*this, "ic5a")
 		, m_ic5m(*this, "ic5m")
-		, m_switches(*this, "SW")
+		, m_switches(*this, "SW.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(p1_w);

src/mame/drivers/spyhuntertec.cpp

@@ -31,7 +31,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_analog_timer(*this, "analog_timer"),
-		m_analog_input(*this, "AN"),
+		m_analog_input(*this, "AN.%u", 0),
 		m_videoram(*this, "videoram"),
 		m_spriteram(*this, "spriteram"),
 		m_spriteram2(*this, "spriteram2"),

src/mame/drivers/srmp5.cpp

@@ -67,15 +67,16 @@ class srmp5_state : public driver_device
 {
 public:
 	srmp5_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_gfxdecode(*this, "gfxdecode"),
+		, m_gfxdecode(*this, "gfxdecode")
-			m_palette(*this, "palette"),
+		, m_palette(*this, "palette")
-			m_maincpu(*this,"maincpu"),
+		, m_maincpu(*this,"maincpu")
-			m_subcpu(*this, "sub"),
+		, m_subcpu(*this, "sub")
-			m_chrrom(*this, "chr"),
+		, m_chrrom(*this, "chr")
-			m_keys(*this, "KEY"),
+		, m_keys(*this, "KEY.%u", 0)
-			m_chrbank(0)
+		, m_chrbank(0)
-	{ }
+	{
+	}
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 	required_device<st0016_cpu_device> m_maincpu;

src/mame/drivers/svi318.cpp

@@ -56,7 +56,7 @@ public:
 		m_cassette(*this, "cassette"),
 		m_cart_rom(*this, "cartslot"),
 		m_expander(*this, "exp"),
-		m_keyboard(*this, "KEY"),
+		m_keyboard(*this, "KEY.%u", 0),
 		m_buttons(*this, "BUTTONS"),
 		m_intvdp(0), m_intexp(0),
 		m_romdis(1), m_ramdis(1),

src/mame/drivers/techno.cpp

@@ -25,7 +25,7 @@ public:
 	techno_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_switch(*this, "SWITCH")
+		, m_switch(*this, "SWITCH.%u", 0)
 	{ }
 
 	DECLARE_READ16_MEMBER(key_r);

src/mame/drivers/thayers.cpp

@@ -43,11 +43,13 @@ public:
 	};
 
 	thayers_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-		m_pr7820(*this, "laserdisc"),
+		, m_pr7820(*this, "laserdisc")
-		m_ldv1000(*this, "ldv1000"),
+		, m_ldv1000(*this, "ldv1000")
-		m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-		m_row(*this, "ROW") { }
+		, m_row(*this, "ROW.%u", 0)
+	{
+	}
 
 	optional_device<pioneer_pr7820_device> m_pr7820;
 	optional_device<pioneer_ldv1000_device> m_ldv1000;

src/mame/drivers/ti74.cpp

@@ -88,7 +88,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_cart(*this, "cartslot"),
-		m_key_matrix(*this, "IN"),
+		m_key_matrix(*this, "IN.%u", 0),
 		m_battery_inp(*this, "BATTERY")
 	{ }
 

src/mame/drivers/tmmjprd.cpp

@@ -45,7 +45,7 @@ public:
 		m_eeprom(*this, "eeprom"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
-		m_tilemap_regs(*this, "tilemap_regs"),
+		m_tilemap_regs(*this, "tilemap_regs.%u", 0),
 		m_spriteregs(*this, "spriteregs"),
 		m_spriteram(*this, "spriteram") { }
 

src/mame/drivers/tvc.cpp

@@ -39,15 +39,15 @@ class tvc_state : public driver_device
 {
 public:
 	tvc_state(const machine_config &mconfig, device_type type, const char *tag)
-	: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-	m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-	m_ram(*this, RAM_TAG),
+		, m_ram(*this, RAM_TAG)
-	m_sound(*this, "custom"),
+		, m_sound(*this, "custom")
-	m_cassette(*this, "cassette"),
+		, m_cassette(*this, "cassette")
-	m_cart(*this, "cartslot"),
+		, m_cart(*this, "cartslot")
-	m_centronics(*this, CENTRONICS_TAG),
+		, m_centronics(*this, CENTRONICS_TAG)
-	m_palette(*this, "palette"),
+		, m_palette(*this, "palette")
-	m_keyboard(*this, "LINE")
+		, m_keyboard(*this, "LINE.%u", 0)
 	{ }
 
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/unkhorse.cpp

@@ -31,7 +31,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_speaker(*this, "speaker"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_vram(*this, "vram")
 	{ }
 

src/mame/drivers/vegas.cpp

@@ -465,7 +465,7 @@ public:
 		m_rombase(*this, "rombase"),
 		m_dcs(*this, "dcs"),
 		m_ioasic(*this, "ioasic"),
-		m_io_analog(*this, "AN")
+		m_io_analog(*this, "AN.%u", 0)
 	{ }
 
 	required_device<mips3_device> m_maincpu;

src/mame/drivers/warpwarp.cpp

@@ -150,8 +150,6 @@ INTERRUPT_GEN_MEMBER(warpwarp_state::vblank_irq)
 		device.execute().set_input_line(0, ASSERT_LINE);
 }
 
-IOPORT_ARRAY_MEMBER(warpwarp_state::portnames) { "SW0", "SW1", "DSW2", "PLACEHOLDER" }; // "IN1" & "IN2" are read separately when offset==3
-
 /* B&W Games I/O */
 READ8_MEMBER(warpwarp_state::geebee_in_r)
 {

src/mame/drivers/wpc_dcs.cpp

@@ -17,15 +17,15 @@ class wpc_dcs_state : public driver_device
 {
 public:
 	wpc_dcs_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			maincpu(*this, "maincpu"),
+		, maincpu(*this, "maincpu")
-			dcs(*this, "dcs"),
+		, dcs(*this, "dcs")
-			rombank(*this, "rombank"),
+		, rombank(*this, "rombank")
-			mainram(*this, "mainram"),
+		, mainram(*this, "mainram")
-			nvram(*this, "nvram"),
+		, nvram(*this, "nvram")
-			lamp(*this, "lamp"),
+		, lamp(*this, "lamp")
-			out(*this, "out"),
+		, out(*this, "out")
-			swarray(*this, "SW")
+		, swarray(*this, "SW.%u", 0)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(bank_w);

src/mame/drivers/zac_2.cpp

@@ -16,10 +16,10 @@ class zac_2_state : public driver_device
 {
 public:
 	zac_2_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-	m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-	m_p_ram(*this, "ram"),
+		, m_p_ram(*this, "ram")
-	m_row(*this, "ROW")
+		, m_row(*this, "ROW.%u", 0)
 	{ }
 
 	DECLARE_READ8_MEMBER(ctrl_r);

src/mame/includes/ac1.h

@@ -16,12 +16,12 @@ class ac1_state : public driver_device
 {
 public:
 	ac1_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-		m_cassette(*this, "cassette"),
+		, m_cassette(*this, "cassette")
-		m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-		m_gfxdecode(*this, "gfxdecode"),
+		, m_gfxdecode(*this, "gfxdecode")
-		m_palette(*this, "palette"),
+		, m_palette(*this, "palette")
-		m_io_line(*this, "LINE")
+		, m_io_line(*this, "LINE.%u", 0)
 	{ }
 
 	DECLARE_DRIVER_INIT(ac1);

src/mame/includes/amstrad.h

@@ -156,8 +156,8 @@ public:
 		m_bank14(*this, "bank14"),
 		m_bank15(*this, "bank15"),
 		m_bank16(*this, "bank16"),
-		m_io_kbrow(*this, "kbrow"),
+		m_io_kbrow(*this, "kbrow.%u", 0),
-		m_io_analog(*this, "analog"),
+		m_io_analog(*this, "analog.%u", 0),
 		m_io_mouse1(*this,"mouse_input1"),
 		m_io_mouse2(*this,"mouse_input2"),
 		m_io_mouse3(*this,"mouse_input3"),

src/mame/includes/astrocde.h

@@ -56,8 +56,8 @@ public:
 		m_p2_knob(*this, "P2_KNOB"),
 		m_p3_knob(*this, "P3_KNOB"),
 		m_p4_knob(*this, "P4_KNOB"),
-		m_trackball(*this, trackball_inputs),
+		m_trackball(*this, { { "TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1" } }),
-		m_joystick(*this, joystick_inputs),
+		m_joystick(*this, { { "MOVEX", "MOVEY" } }),
 		m_interrupt_scanline(0xff)
 	{ }
 
@@ -84,9 +84,7 @@ public:
 	optional_ioport m_p2_knob;
 	optional_ioport m_p3_knob;
 	optional_ioport m_p4_knob;
-	DECLARE_IOPORT_ARRAY(trackball_inputs);
 	optional_ioport_array<4> m_trackball;
-	DECLARE_IOPORT_ARRAY(joystick_inputs);
 	optional_ioport_array<2> m_joystick;
 
 	UINT8 m_video_config;

src/mame/includes/atari400.h

@@ -24,14 +24,14 @@ class atari_common_state : public driver_device
 {
 public:
 	atari_common_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-		m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-		m_gtia(*this, "gtia"),
+		, m_gtia(*this, "gtia")
-		m_antic(*this, "antic"),
+		, m_antic(*this, "antic")
-		m_keyboard(*this, "keyboard"),
+		, m_keyboard(*this, "keyboard.%u", 0)
-		m_keypad(*this, "keypad"),
+		, m_keypad(*this, "keypad.%u", 0)
-		m_djoy_b(*this, "djoy_b"),
+		, m_djoy_b(*this, "djoy_b")
-		m_fake(*this, "fake")
+		, m_fake(*this, "fake")
 		{ }
 
 	virtual void video_start() override;

src/mame/includes/bfm_sc4.h

@@ -123,17 +123,17 @@ class sc4_state : public bfm_sc45_state
 {
 public:
 	sc4_state(const machine_config &mconfig, device_type type, const char *tag)
-		: bfm_sc45_state(mconfig, type, tag),
+		: bfm_sc45_state(mconfig, type, tag)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_cpuregion(*this, "maincpu"),
+		, m_cpuregion(*this, "maincpu")
-			m_nvram(*this, "nvram"),
+		, m_nvram(*this, "nvram")
-			m_reel1(*this, "reel1"),
+		, m_reel1(*this, "reel1")
-			m_reel2(*this, "reel2"),
+		, m_reel2(*this, "reel2")
-			m_reel3(*this, "reel3"),
+		, m_reel3(*this, "reel3")
-			m_reel4(*this, "reel4"),
+		, m_reel4(*this, "reel4")
-			m_reel5(*this, "reel5"),
+		, m_reel5(*this, "reel5")
-			m_reel6(*this, "reel6"),
+		, m_reel6(*this, "reel6")
-			m_io_ports(*this, {"IN-0", "IN-1", "IN-2", "IN-3", "IN-4", "IN-5", "IN-6", "IN-7", "IN-8", "IN-9", "IN-10", "IN-11"})
+		, m_io_ports(*this, "IN-%u", 0)
 	{
 		m_chk41addr = -1;
 		m_dochk41 = false;

src/mame/includes/bladestl.h

@@ -29,7 +29,7 @@ public:
 		m_filter3(*this, "filter3"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_soundlatch(*this, "soundlatch"),
-		m_trackball(*this, "TRACKBALL"),
+		m_trackball(*this, "TRACKBALL.%u", 0),
 		m_rombank(*this, "rombank") { }
 
 	required_device<cpu_device> m_maincpu;

src/mame/includes/cave.h

@@ -33,24 +33,24 @@ class cave_state : public driver_device
 {
 public:
 	cave_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-			m_videoregs(*this, "videoregs"),
+		, m_videoregs(*this, "videoregs.%u", 0)
-			m_vram(*this, "vram"),
+		, m_vram(*this, "vram.%u", 0)
-			m_vctrl(*this, "vctrl"),
+		, m_vctrl(*this, "vctrl.%u", 0)
-			m_spriteram(*this, "spriteram"),
+		, m_spriteram(*this, "spriteram.%u", 0)
-			m_spriteram_2(*this, "spriteram_2"),
+		, m_spriteram_2(*this, "spriteram_2.%u", 0)
-			m_paletteram(*this, "paletteram"),
+		, m_paletteram(*this, "paletteram.%u", 0)
-			m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-			m_audiocpu(*this, "audiocpu"),
+		, m_audiocpu(*this, "audiocpu")
-			m_oki(*this, "oki"),
+		, m_oki(*this, "oki")
-			m_int_timer(*this, "int_timer"),
+		, m_int_timer(*this, "int_timer")
-			m_int_timer_left(*this, "int_timer_left"),
+		, m_int_timer_left(*this, "int_timer_left")
-			m_int_timer_right(*this, "int_timer_right"),
+		, m_int_timer_right(*this, "int_timer_right")
-			m_eeprom(*this, "eeprom"),
+		, m_eeprom(*this, "eeprom")
-			m_gfxdecode(*this, "gfxdecode"),
+		, m_gfxdecode(*this, "gfxdecode")
-			m_screen(*this, "screen"),
+		, m_screen(*this, "screen")
-			m_palette(*this, "palette"),
+		, m_palette(*this, "palette")
-			m_soundlatch(*this, "soundlatch") { }
+		, m_soundlatch(*this, "soundlatch") { }
 
 	/* memory pointers */
 	optional_shared_ptr_array<UINT16, 4> m_videoregs;

src/mame/includes/cischeat.h

@@ -14,9 +14,9 @@ public:
 	cischeat_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_vregs(*this, "vregs"),
-		m_scrollram(*this, "scrollram"),
+		m_scrollram(*this, "scrollram.%u", 0),
 		m_ram(*this, "ram"),
-		m_roadram(*this, "roadram"),
+		m_roadram(*this, "roadram.%u", 0),
 		m_f1gpstr2_ioready(*this, "ioready"),
 		m_maincpu(*this, "maincpu"),
 		m_cpu1(*this, "cpu1"),

src/mame/includes/crvision.h

@@ -40,10 +40,10 @@ public:
 		m_cart(*this, "cartslot"),
 		m_cent_data_out(*this, "cent_data_out"),
 		m_ram(*this, RAM_TAG),
-		m_inp_pa0(*this, "PA0"),
+		m_inp_pa0(*this, "PA0.%u", 0),
-		m_inp_pa1(*this, "PA1"),
+		m_inp_pa1(*this, "PA1.%u", 0),
-		m_inp_pa2(*this, "PA2"),
+		m_inp_pa2(*this, "PA2.%u", 0),
-		m_inp_pa3(*this, "PA3")
+		m_inp_pa3(*this, "PA3.%u", 0)
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -82,10 +82,10 @@ class laser2001_state : public crvision_state
 {
 public:
 	laser2001_state(const machine_config &mconfig, device_type type, const char *tag)
-		: crvision_state(mconfig, type, tag),
+		: crvision_state(mconfig, type, tag)
-		m_centronics(*this, CENTRONICS_TAG),
+		, m_centronics(*this, CENTRONICS_TAG)
-		m_inp_y(*this, "Y"),
+		, m_inp_y(*this, "Y.%u", 0)
-		m_inp_joy(*this, "JOY")
+		, m_inp_joy(*this, "JOY.%u", 0)
 	{ }
 
 	required_device<centronics_device> m_centronics;

src/mame/includes/cybiko.h

@@ -36,15 +36,15 @@ class cybiko_state : public driver_device
 {
 public:
 	cybiko_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+		: driver_device(mconfig, type, tag)
-		m_maincpu(*this, "maincpu"),
+		, m_maincpu(*this, "maincpu")
-		m_crtc(*this, "hd66421"),
+		, m_crtc(*this, "hd66421")
-		m_speaker(*this, "speaker"),
+		, m_speaker(*this, "speaker")
-		m_rtc(*this, "rtc"),
+		, m_rtc(*this, "rtc")
-		m_ram(*this, RAM_TAG),
+		, m_ram(*this, RAM_TAG)
-		m_flash1(*this, "flash1"),
+		, m_flash1(*this, "flash1")
-		m_nvram(*this, "nvram"),
+		, m_nvram(*this, "nvram")
-		m_input(*this, "A")
+		, m_input(*this, "A.%u", 0)
 	{ }
 
 	DECLARE_WRITE16_MEMBER(serflash_w);

src/mame/includes/electron.h

@@ -75,7 +75,7 @@ public:
 		m_cassette(*this, "cassette"),
 		m_beeper(*this, "beeper"),
 		m_cart(*this, "cartslot"),
-		m_keybd(*this, "LINE"),
+		m_keybd(*this, "LINE.%u", 0),
 		m_exp(*this, "exp")
 	{ }
 

src/mame/includes/eti660.h

@@ -35,7 +35,7 @@ public:
 		, m_cti(*this, CDP1864_TAG)
 		, m_pia(*this, MC6821_TAG)
 		, m_cassette(*this, "cassette")
-		, m_io_keyboard(*this, "KEY")
+		, m_io_keyboard(*this, "KEY.%u", 0)
 		, m_special(*this, "SPECIAL")
 	{ }
 

src/mame/includes/fidelz80.h

@@ -20,7 +20,7 @@ public:
 	fidelz80base_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_inp_matrix(*this, "IN"),
+		m_inp_matrix(*this, "IN.%u", 0),
 		m_speech(*this, "speech"),
 		m_speech_rom(*this, "speech"),
 		m_speaker(*this, "speaker"),

src/mame/includes/fuukifg2.h

@@ -25,7 +25,7 @@ public:
 		m_palette(*this, "palette"),
 		m_fuukivid(*this, "fuukivid"),
 		m_soundlatch(*this, "soundlatch"),
-		m_vram(*this, "vram"),
+		m_vram(*this, "vram.%u", 0),
 		m_vregs(*this, "vregs"),
 		m_unknown(*this, "unknown"),
 		m_priority(*this, "priority")

src/mame/includes/fuukifg3.h

@@ -28,7 +28,7 @@ public:
 		m_screen(*this, "screen"),
 		m_palette(*this, "palette"),
 		m_fuukivid(*this, "fuukivid"),
-		m_vram(*this, "vram"),
+		m_vram(*this, "vram.%u", 0),
 		m_vregs(*this, "vregs"),
 		m_priority(*this, "priority"),
 		m_tilebank(*this, "tilebank")

src/mame/includes/galpani2.h

@@ -17,10 +17,10 @@ public:
 		m_palette(*this, "palette"),
 		m_bg15palette(*this, "bgpalette"),
 		m_bg8palette(*this, "bg8palette"),
-		m_bg8(*this, "bg8"),
+		m_bg8(*this, "bg8.%u", 0),
-		m_palette_val(*this, "palette"),
+		m_palette_val(*this, "palette.%u", 0),
-		m_bg8_scrollx(*this, "bg8_scrollx"),
+		m_bg8_scrollx(*this, "bg8_scrollx.%u", 0),
-		m_bg8_scrolly(*this, "bg8_scrolly"),
+		m_bg8_scrolly(*this, "bg8_scrolly.%u", 0),
 		m_bg15(*this, "bg15"),
 		m_ram(*this, "ram"),
 		m_ram2(*this, "ram2"),

src/mame/includes/gamecom.h

@@ -231,8 +231,9 @@ public:
 		, m_io_in0(*this, "IN0")
 		, m_io_in1(*this, "IN1")
 		, m_io_in2(*this, "IN2")
-		, m_io_grid(*this, "GRID")
+		, m_io_grid(*this, "GRID.%u", 0)
-		{ }
+	{
+	}
 
 	DECLARE_READ8_MEMBER( gamecom_internal_r );
 	DECLARE_READ8_MEMBER( gamecom_pio_r );