diff options
Diffstat (limited to 'src/devices/bus/intv')
-rw-r--r-- | src/devices/bus/intv/ecs.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/intv/ecs.h | 7 | ||||
-rw-r--r-- | src/devices/bus/intv/voice.cpp | 15 | ||||
-rw-r--r-- | src/devices/bus/intv/voice.h | 7 |
4 files changed, 10 insertions, 29 deletions
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index fe90b9313ff..be0de17131b 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -90,11 +90,11 @@ void intv_ecs_device::late_subslot_setup() } //------------------------------------------------- -// MACHINE_CONFIG_START( sub_slot ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( sub_slot ) +MACHINE_CONFIG_MEMBER( intv_ecs_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_MONO("mono_ecs") MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2) @@ -108,12 +108,6 @@ static MACHINE_CONFIG_START( sub_slot ) MACHINE_CONFIG_END -machine_config_constructor intv_ecs_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( sub_slot ); -} - - ROM_START( ecs ) ROM_REGION( 0x20000, "ecs", ROMREGION_ERASEFF ) ROM_LOAD16_WORD_SWAP( "ecs_rom.20", 0x04000, 0x2000, CRC(5f9d05e5) SHA1(083a3e7405b8f8b4b8a5003ca9c31b8d824b535c)) diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h index d577ba66250..943a768fe03 100644 --- a/src/devices/bus/intv/ecs.h +++ b/src/devices/bus/intv/ecs.h @@ -19,10 +19,6 @@ public: // construction/destruction intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - // reading and writing // actual ECS accesses @@ -66,8 +62,11 @@ public: virtual void late_subslot_setup() override; protected: + // device-level overrides virtual void device_start() override; virtual void device_reset() override; + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; private: diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index d13818234a5..96f8a05c451 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -66,10 +66,10 @@ void intv_voice_device::late_subslot_setup() //------------------------------------------------- -// MACHINE_CONFIG_START( intellivoice ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( intellivoice ) +MACHINE_CONFIG_MEMBER( intv_voice_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_MONO("mono_voice") MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000) @@ -80,17 +80,6 @@ static MACHINE_CONFIG_START( intellivoice ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor intv_voice_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( intellivoice ); -} - - ROM_START( intellivoice ) ROM_REGION( 0x10000, "sp0256_speech", 0 ) /* SP0256-012 Speech chip w/2KiB mask rom */ diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h index 0cf6a2d433b..d99b31573a3 100644 --- a/src/devices/bus/intv/voice.h +++ b/src/devices/bus/intv/voice.h @@ -16,10 +16,6 @@ public: // construction/destruction intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - // reading and writing // actual IntelliVoice access virtual DECLARE_READ16_MEMBER(read_speech) override; @@ -51,7 +47,10 @@ public: virtual void late_subslot_setup() override; protected: + // device-level overrides virtual void device_start() override; + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; private: required_device<sp0256_device> m_speech; |