From 4afaaedddfcc8449d6e2a442fba17a77b1b23656 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Tue, 13 Jun 2017 16:47:41 +0200 Subject: device_add_mconfig up to devices/bus/q* (nw) --- src/devices/bus/plus4/c1551.cpp | 15 ++------------- src/devices/bus/plus4/c1551.h | 29 +++++++++++++++-------------- src/devices/bus/plus4/sid.cpp | 15 ++------------- src/devices/bus/plus4/sid.h | 8 ++++---- 4 files changed, 23 insertions(+), 44 deletions(-) (limited to 'src/devices/bus/plus4') diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index c15932c30b2..5bc0e6b3d2c 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -340,10 +340,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_DRIVER( c1551 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( c1551 ) +MACHINE_CONFIG_MEMBER( c1551_device::device_add_mconfig ) MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8) MCFG_CPU_PROGRAM_MAP(c1551_mem) MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w)) @@ -372,17 +372,6 @@ static MACHINE_CONFIG_START( c1551 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor c1551_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( c1551 ); -} - - //------------------------------------------------- // INPUT_PORTS( c1551 ) //------------------------------------------------- diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index ae749c0e056..ddd09efe8cb 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -31,18 +31,30 @@ public: // construction/destruction c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + DECLARE_READ8_MEMBER( tpi0_r ); + DECLARE_WRITE8_MEMBER( tpi0_w ); + +protected: + // device-level overrides + 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; + // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; + // device_plus4_expansion_card_interface overrides + virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + +private: DECLARE_READ8_MEMBER( port_r ); DECLARE_WRITE8_MEMBER( port_w ); DECLARE_READ8_MEMBER( tcbm_data_r ); DECLARE_WRITE8_MEMBER( tcbm_data_w ); - DECLARE_READ8_MEMBER( tpi0_r ); - DECLARE_WRITE8_MEMBER( tpi0_w ); DECLARE_READ8_MEMBER( tpi0_pc_r ); DECLARE_WRITE8_MEMBER( tpi0_pc_w ); @@ -52,17 +64,6 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); -protected: - // device-level overrides - 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; - - // device_plus4_expansion_card_interface overrides - virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; - virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; - -private: enum { LED_POWER = 0, diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 4372c6ca710..a75b889ffcf 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -61,10 +61,10 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_START( plus4_sid ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( plus4_sid ) +MACHINE_CONFIG_MEMBER( plus4_sid_cartridge_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) @@ -73,17 +73,6 @@ static MACHINE_CONFIG_START( plus4_sid ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( plus4_sid ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h index 9136e0abc5b..90a22fa15c8 100644 --- a/src/devices/bus/plus4/sid.h +++ b/src/devices/bus/plus4/sid.h @@ -30,15 +30,15 @@ public: // construction/destruction plus4_sid_cartridge_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; - 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_plus4_expansion_card_interface overrides virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; -- cgit v1.2.3-70-g09d2