summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes_ctrl/ctrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nes_ctrl/ctrl.cpp')
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp89
1 files changed, 47 insertions, 42 deletions
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index ef491efc889..7618f89dbd7 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -165,45 +165,50 @@ void nes_control_port_device::write(uint8_t data)
// SLOT_INTERFACE( nes_control_port_devices )
//-------------------------------------------------
-SLOT_INTERFACE_START( nes_control_port1_devices )
- SLOT_INTERFACE("joypad", NES_JOYPAD)
- SLOT_INTERFACE("zapper", NES_ZAPPER)
- SLOT_INTERFACE("4score_p1p3", NES_4SCORE_P1P3)
- SLOT_INTERFACE("miracle_piano", NES_MIRACLE)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( nes_control_port2_devices )
- SLOT_INTERFACE("joypad", NES_JOYPAD)
- SLOT_INTERFACE("zapper", NES_ZAPPER)
- SLOT_INTERFACE("vaus", NES_ARKPADDLE)
- SLOT_INTERFACE("powerpad", NES_POWERPAD)
- SLOT_INTERFACE("4score_p2p4", NES_4SCORE_P2P4)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( fc_control_port1_devices )
- SLOT_INTERFACE("joypad", NES_JOYPAD)
- SLOT_INTERFACE("ccpad_left", NES_CCPAD_LEFT)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( fc_control_port2_devices )
- SLOT_INTERFACE("joypad", NES_JOYPAD)
- SLOT_INTERFACE("joypad_old", NES_FCPAD_P2)
- SLOT_INTERFACE("ccpad_right", NES_CCPAD_RIGHT)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( fc_expansion_devices )
- SLOT_INTERFACE("joypad", NES_JOYPAD)
- SLOT_INTERFACE("arcstick", NES_ARCSTICK)
- SLOT_INTERFACE("fc_keyboard", NES_FCKEYBOARD)
- SLOT_INTERFACE("zapper", NES_ZAPPER)
- SLOT_INTERFACE("vaus", NES_ARKPADDLE_FC)
- SLOT_INTERFACE("family_trainer", NES_FTRAINER)
- SLOT_INTERFACE("konamihs", NES_KONAMIHS)
- SLOT_INTERFACE("mj_panel", NES_MJPANEL)
- SLOT_INTERFACE("pachinko", NES_PACHINKO)
- SLOT_INTERFACE("partytap", NES_PARTYTAP)
- SLOT_INTERFACE("hori_twin", NES_HORITWIN)
- SLOT_INTERFACE("hori_4p", NES_HORI4P)
- SLOT_INTERFACE("barcode_battler", NES_BARCODE_BATTLER)
- SLOT_INTERFACE("subor_keyboard", NES_SUBORKEYBOARD)
-SLOT_INTERFACE_END
+void nes_control_port1_devices(device_slot_interface &device)
+{
+ device.option_add("joypad", NES_JOYPAD);
+ device.option_add("zapper", NES_ZAPPER);
+ device.option_add("4score_p1p3", NES_4SCORE_P1P3);
+ device.option_add("miracle_piano", NES_MIRACLE);
+}
+
+void nes_control_port2_devices(device_slot_interface &device)
+{
+ device.option_add("joypad", NES_JOYPAD);
+ device.option_add("zapper", NES_ZAPPER);
+ device.option_add("vaus", NES_ARKPADDLE);
+ device.option_add("powerpad", NES_POWERPAD);
+ device.option_add("4score_p2p4", NES_4SCORE_P2P4);
+}
+
+void fc_control_port1_devices(device_slot_interface &device)
+{
+ device.option_add("joypad", NES_JOYPAD);
+ device.option_add("ccpad_left", NES_CCPAD_LEFT);
+}
+
+void fc_control_port2_devices(device_slot_interface &device)
+{
+ device.option_add("joypad", NES_JOYPAD);
+ device.option_add("joypad_old", NES_FCPAD_P2);
+ device.option_add("ccpad_right", NES_CCPAD_RIGHT);
+}
+
+void fc_expansion_devices(device_slot_interface &device)
+{
+ device.option_add("joypad", NES_JOYPAD);
+ device.option_add("arcstick", NES_ARCSTICK);
+ device.option_add("fc_keyboard", NES_FCKEYBOARD);
+ device.option_add("zapper", NES_ZAPPER);
+ device.option_add("vaus", NES_ARKPADDLE_FC);
+ device.option_add("family_trainer", NES_FTRAINER);
+ device.option_add("konamihs", NES_KONAMIHS);
+ device.option_add("mj_panel", NES_MJPANEL);
+ device.option_add("pachinko", NES_PACHINKO);
+ device.option_add("partytap", NES_PARTYTAP);
+ device.option_add("hori_twin", NES_HORITWIN);
+ device.option_add("hori_4p", NES_HORI4P);
+ device.option_add("barcode_battler", NES_BARCODE_BATTLER);
+ device.option_add("subor_keyboard", NES_SUBORKEYBOARD);
+}