diff options
author | 2017-06-12 18:28:13 +0200 | |
---|---|---|
committer | 2017-06-12 18:28:13 +0200 | |
commit | 1e059434c3a5cdccb00b0fdaff73dcfbc1a5fc9c (patch) | |
tree | a49186f7db5a27ebea3fcbf8fd3b950bcc50b126 /src/devices/bus/nes_ctrl | |
parent | 9c66b2fe150dc7e0af5d4b145282a905aad2b99d (diff) |
device_add_mconfig up to devices/bus/o* (nw)
Diffstat (limited to 'src/devices/bus/nes_ctrl')
-rw-r--r-- | src/devices/bus/nes_ctrl/bcbattle.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/bcbattle.h | 4 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/fckeybrd.cpp | 17 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/fckeybrd.h | 6 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/hori.cpp | 25 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/hori.h | 10 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/joypad.cpp | 17 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/joypad.h | 4 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/miracle.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/nes_ctrl/miracle.h | 7 |
10 files changed, 35 insertions, 69 deletions
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 7e86e1d08df..263017e27a3 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -20,15 +20,10 @@ DEFINE_DEVICE_TYPE(NES_BARCODE_BATTLER, nes_bcbattle_device, "nes_bcbattle", "Epoch Barcode Battler (FC)") -MACHINE_CONFIG_START( nes_battler ) +MACHINE_CONFIG_MEMBER( nes_bcbattle_device::device_add_mconfig ) MCFG_BARCODE_READER_ADD("battler") MACHINE_CONFIG_END -machine_config_constructor nes_bcbattle_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( nes_battler ); -} - //------------------------------------------------- // device_timer - handler timer events diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h index f485d9c6b35..9fc75b0f9fc 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.h +++ b/src/devices/bus/nes_ctrl/bcbattle.h @@ -28,8 +28,6 @@ public: // construction/destruction nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; - protected: static constexpr device_timer_id TIMER_BATTLER = 1; @@ -38,6 +36,8 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_add_mconfig(machine_config &config) override; + virtual uint8_t read_exp(offs_t offset) override; int read_current_bit(); diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index d8d1fee6937..18ea47ecb66 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -119,24 +119,17 @@ ioport_constructor nes_fckeybrd_device::device_input_ports() const } -static MACHINE_CONFIG_START( fc_keyboard ) +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +MACHINE_CONFIG_MEMBER( nes_fckeybrd_device::device_add_mconfig ) MCFG_CASSETTE_ADD("tape") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fc_cass") MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor nes_fckeybrd_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( fc_keyboard ); -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h index 5859a792ae6..85bf0c2f83f 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.h +++ b/src/devices/bus/nes_ctrl/fckeybrd.h @@ -28,14 +28,14 @@ public: // construction/destruction nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual ioport_constructor device_input_ports() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual uint8_t read_exp(offs_t offset) override; virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp index 17f9340449c..14e6cb227c8 100644 --- a/src/devices/bus/nes_ctrl/hori.cpp +++ b/src/devices/bus/nes_ctrl/hori.cpp @@ -53,12 +53,17 @@ static SLOT_INTERFACE_START( hori_adapter ) SLOT_INTERFACE("joypad", NES_JOYPAD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( horitwin ) + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +MACHINE_CONFIG_MEMBER( nes_horitwin_device::device_add_mconfig ) MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hori4p ) +MACHINE_CONFIG_MEMBER( nes_hori4p_device::device_add_mconfig ) MCFG_FC_EXPANSION_PORT_ADD("port1", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port2", hori_adapter, "joypad") MCFG_FC_EXPANSION_PORT_ADD("port3", hori_adapter, "joypad") @@ -66,22 +71,6 @@ static MACHINE_CONFIG_START( hori4p ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor nes_horitwin_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( horitwin ); -} - -machine_config_constructor nes_hori4p_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( hori4p ); -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h index 6fb7d9c1eee..287384c6ca5 100644 --- a/src/devices/bus/nes_ctrl/hori.h +++ b/src/devices/bus/nes_ctrl/hori.h @@ -27,12 +27,12 @@ public: // construction/destruction nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override { } + virtual void device_add_mconfig(machine_config &config) override; + virtual uint8_t read_exp(offs_t offset) override; virtual void write(uint8_t data) override; @@ -50,13 +50,13 @@ public: // construction/destruction nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual ioport_constructor device_input_ports() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override { } + virtual ioport_constructor device_input_ports() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual uint8_t read_exp(offs_t offset) override; virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index d69aa600b66..33743f41936 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -148,22 +148,15 @@ static SLOT_INTERFACE_START( arcstick_daisy ) SLOT_INTERFACE("arcstick", NES_ARCSTICK) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( arcstick ) - // expansion port to allow daisy chaining - MCFG_FC_EXPANSION_PORT_ADD("subexp", arcstick_daisy, nullptr) -MACHINE_CONFIG_END - //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// device_add_mconfig - add device configuration //------------------------------------------------- -machine_config_constructor nes_arcstick_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( arcstick ); -} - +MACHINE_CONFIG_MEMBER( nes_arcstick_device::device_add_mconfig ) + // expansion port to allow daisy chaining + MCFG_FC_EXPANSION_PORT_ADD("subexp", arcstick_daisy, nullptr) +MACHINE_CONFIG_END //************************************************************************** diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h index bfee068f81d..b503f7d4ec8 100644 --- a/src/devices/bus/nes_ctrl/joypad.h +++ b/src/devices/bus/nes_ctrl/joypad.h @@ -88,10 +88,10 @@ public: // construction/destruction nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: virtual ioport_constructor device_input_ports() const override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; -protected: virtual uint8_t read_bit0() override { return 0; } virtual uint8_t read_exp(offs_t offset) override; virtual void write(uint8_t data) override; diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index addd8d45a5d..14ea0c2572f 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -22,18 +22,13 @@ DEFINE_DEVICE_TYPE(NES_MIRACLE, nes_miracle_device, "nes_miracle", "NES Miracle Piano Controller") -MACHINE_CONFIG_START( nes_miracle ) +MACHINE_CONFIG_MEMBER( nes_miracle_device::device_add_mconfig ) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") MCFG_MIDI_RX_HANDLER(WRITELINE(nes_miracle_device, rx_w)) MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") MACHINE_CONFIG_END -machine_config_constructor nes_miracle_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( nes_miracle ); -} - //------------------------------------------------- // device_timer - handler timer events diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h index 5e8944ae828..16c15ab65db 100644 --- a/src/devices/bus/nes_ctrl/miracle.h +++ b/src/devices/bus/nes_ctrl/miracle.h @@ -29,9 +29,6 @@ public: // construction/destruction nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual machine_config_constructor device_mconfig_additions() const override; - required_device<midi_port_device> m_midiin, m_midiout; protected: @@ -43,6 +40,10 @@ protected: virtual void device_start() override; virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_add_mconfig(machine_config &config) override; + +private: // serial overrides virtual void rcv_complete() override; // Rx completed receiving byte virtual void tra_complete() override; // Tx completed sending byte |