1 files changed, 17 insertions, 69 deletions

diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp
index 393fbc01b32..76fd4c3094a 100644
--- a/src/devices/bus/sat_ctrl/multitap.cpp
+++ b/src/devices/bus/sat_ctrl/multitap.cpp
@@ -26,15 +26,10 @@ DEFINE_DEVICE_TYPE(SATURN_MULTITAP, saturn_multitap_device, "saturn_multitap", "
 //  saturn_multitap_device - constructor
 //-------------------------------------------------
 
-saturn_multitap_device::saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	device_t(mconfig, SATURN_MULTITAP, tag, owner, clock),
-	device_saturn_control_port_interface(mconfig, *this),
-	m_subctrl1_port(*this, "ctrl1"),
-	m_subctrl2_port(*this, "ctrl2"),
-	m_subctrl3_port(*this, "ctrl3"),
-	m_subctrl4_port(*this, "ctrl4"),
-	m_subctrl5_port(*this, "ctrl5"),
-	m_subctrl6_port(*this, "ctrl6")
+saturn_multitap_device::saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SATURN_MULTITAP, tag, owner, clock)
+	, device_saturn_control_port_interface(mconfig, *this)
+	, m_subctrl_port(*this, "ctrl%u", 1U)
 {
 }
 
@@ -45,12 +40,8 @@ saturn_multitap_device::saturn_multitap_device(const machine_config &mconfig, co
 
 void saturn_multitap_device::device_start()
 {
-	m_subctrl1_port->device_start();
-	m_subctrl2_port->device_start();
-	m_subctrl3_port->device_start();
-	m_subctrl4_port->device_start();
-	m_subctrl5_port->device_start();
-	m_subctrl6_port->device_start();
+	for (int i = 0; i < 6; i++)
+		m_subctrl_port[i]->device_start();
 }
 
 //-------------------------------------------------
@@ -67,36 +58,7 @@ void saturn_multitap_device::device_reset()
 
 uint8_t saturn_multitap_device::read_ctrl(uint8_t offset)
 {
-	uint8_t res = 0;
-	switch (offset)
-	{
-		default:
-		case 0:
-		case 1:
-			res = m_subctrl1_port->read_ctrl(offset & 1);
-			break;
-		case 2:
-		case 3:
-			res = m_subctrl2_port->read_ctrl(offset & 1);
-			break;
-		case 4:
-		case 5:
-			res = m_subctrl3_port->read_ctrl(offset & 1);
-			break;
-		case 6:
-		case 7:
-			res = m_subctrl4_port->read_ctrl(offset & 1);
-			break;
-		case 8:
-		case 9:
-			res = m_subctrl5_port->read_ctrl(offset & 1);
-			break;
-		case 10:
-		case 11:
-			res = m_subctrl6_port->read_ctrl(offset & 1);
-			break;
-	}
-	return res;
+	return m_subctrl_port[offset < 12 ? (offset >> 1) : 0]->read_ctrl(offset & 1);
 }
 
 //-------------------------------------------------
@@ -105,30 +67,16 @@ uint8_t saturn_multitap_device::read_ctrl(uint8_t offset)
 
 uint8_t saturn_multitap_device::read_id(int idx)
 {
-	switch (idx)
-	{
-		case 0:
-		default:
-			return m_subctrl1_port->read_id(0);
-		case 1:
-			return m_subctrl2_port->read_id(0);
-		case 2:
-			return m_subctrl3_port->read_id(0);
-		case 3:
-			return m_subctrl4_port->read_id(0);
-		case 4:
-			return m_subctrl5_port->read_id(0);
-		case 5:
-			return m_subctrl6_port->read_id(0);
-	}
+	return m_subctrl_port[idx < 6 ? idx : 0]->read_id(0);
 }
 
 
-MACHINE_CONFIG_START(saturn_multitap_device::device_add_mconfig)
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad")
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad")
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad")
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl4", saturn_joys, "joypad")
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl5", saturn_joys, "joypad")
-	MCFG_SATURN_CONTROL_PORT_ADD("ctrl6", saturn_joys, "joypad")
-MACHINE_CONFIG_END
+void saturn_multitap_device::device_add_mconfig(machine_config &config)
+{
+	SATURN_CONTROL_PORT(config, m_subctrl_port[0], saturn_joys, "joypad");
+	SATURN_CONTROL_PORT(config, m_subctrl_port[1], saturn_joys, "joypad");
+	SATURN_CONTROL_PORT(config, m_subctrl_port[2], saturn_joys, "joypad");
+	SATURN_CONTROL_PORT(config, m_subctrl_port[3], saturn_joys, "joypad");
+	SATURN_CONTROL_PORT(config, m_subctrl_port[4], saturn_joys, "joypad");
+	SATURN_CONTROL_PORT(config, m_subctrl_port[5], saturn_joys, "joypad");
+}