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/newbrain | |
parent | 9c66b2fe150dc7e0af5d4b145282a905aad2b99d (diff) |
device_add_mconfig up to devices/bus/o* (nw)
Diffstat (limited to 'src/devices/bus/newbrain')
-rw-r--r-- | src/devices/bus/newbrain/eim.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/newbrain/eim.h | 27 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.cpp | 15 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.h | 11 |
4 files changed, 24 insertions, 45 deletions
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index d7a982547fe..651fedc5407 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -64,10 +64,10 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_START( newbrain_eim ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( newbrain_eim ) +MACHINE_CONFIG_MEMBER( newbrain_eim_device::device_add_mconfig ) // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/8) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc)) @@ -100,18 +100,6 @@ static MACHINE_CONFIG_START( newbrain_eim ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor newbrain_eim_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( newbrain_eim ); -} - - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h index a2406303d9c..be300fc8dfd 100644 --- a/src/devices/bus/newbrain/eim.h +++ b/src/devices/bus/newbrain/eim.h @@ -32,29 +32,20 @@ public: // construction/destruction newbrain_eim_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - DECLARE_READ8_MEMBER( anout_r ); DECLARE_WRITE8_MEMBER( anout_w ); DECLARE_READ8_MEMBER( anin_r ); DECLARE_WRITE8_MEMBER( anio_w ); - DECLARE_WRITE_LINE_MEMBER( acia_interrupt ); - DECLARE_WRITE_LINE_MEMBER( ctc_z2_w ); - DECLARE_WRITE_LINE_MEMBER( adc_eoc_w ); - - ADC0808_ANALOG_READ_CB(adc_vref_pos_r); - ADC0808_ANALOG_READ_CB(adc_vref_neg_r); - ADC0808_ANALOG_READ_CB(adc_input_r); - - TIMER_DEVICE_CALLBACK_MEMBER(ctc_c2_tick); protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_newbrain_expansion_slot_interface overrides virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; @@ -62,6 +53,16 @@ protected: virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; private: + DECLARE_WRITE_LINE_MEMBER( acia_interrupt ); + DECLARE_WRITE_LINE_MEMBER( ctc_z2_w ); + DECLARE_WRITE_LINE_MEMBER( adc_eoc_w ); + + ADC0808_ANALOG_READ_CB(adc_vref_pos_r); + ADC0808_ANALOG_READ_CB(adc_vref_neg_r); + ADC0808_ANALOG_READ_CB(adc_input_r); + + TIMER_DEVICE_CALLBACK_MEMBER(ctc_c2_tick); + required_device<z80ctc_device> m_ctc; required_device<acia6850_device> m_acia; required_device<newbrain_expansion_slot_device> m_exp; diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index 592c17c8168..1d52b2842de 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -98,10 +98,10 @@ SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_START( newbrain_fdc ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( newbrain_fdc ) +MACHINE_CONFIG_MEMBER( newbrain_fdc_device::device_add_mconfig ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem) MCFG_CPU_IO_MAP(newbrain_fdc_io) @@ -118,17 +118,6 @@ static MACHINE_CONFIG_START( newbrain_fdc ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor newbrain_fdc_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( newbrain_fdc ); -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h index c429d8ea447..885ce5b9365 100644 --- a/src/devices/bus/newbrain/fdc.h +++ b/src/devices/bus/newbrain/fdc.h @@ -29,11 +29,6 @@ public: // construction/destruction newbrain_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - - DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); DECLARE_WRITE8_MEMBER( fdc_auxiliary_w ); DECLARE_READ8_MEMBER( fdc_control_r ); DECLARE_WRITE8_MEMBER( io_dec_w ); @@ -43,6 +38,10 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_newbrain_expansion_slot_interface overrides virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; @@ -50,6 +49,8 @@ protected: virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; private: + DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); + required_device<z80_device> m_maincpu; required_device<upd765a_device> m_fdc; required_device<floppy_connector> m_floppy0; |