summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/intv/voice.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/intv/voice.h')
-rw-r--r--src/devices/bus/intv/voice.h26
1 files changed, 7 insertions, 19 deletions
diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h
index 133f16c62a6..0cf6a2d433b 100644
--- a/src/devices/bus/intv/voice.h
+++ b/src/devices/bus/intv/voice.h
@@ -17,7 +17,6 @@ public:
intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
- virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -34,24 +33,12 @@ public:
virtual DECLARE_READ16_MEMBER(read_rom50) override { return m_subslot->read_rom50(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_rom60) override { return m_subslot->read_rom60(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_rom70) override { return m_subslot->read_rom70(space, offset, mem_mask); }
- virtual DECLARE_READ16_MEMBER(read_rom80) override
- {
- if (m_ram88_enabled && offset >= 0x800)
- return m_subslot->read_ram(space, offset & 0x7ff, mem_mask);
- else
- return m_subslot->read_rom80(space, offset, mem_mask);
- }
+ virtual DECLARE_READ16_MEMBER(read_rom80) override;
virtual DECLARE_READ16_MEMBER(read_rom90) override { return m_subslot->read_rom90(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_roma0) override { return m_subslot->read_roma0(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_romb0) override { return m_subslot->read_romb0(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_romc0) override { return m_subslot->read_romc0(space, offset, mem_mask); }
- virtual DECLARE_READ16_MEMBER(read_romd0) override
- {
- if (m_ramd0_enabled && offset < 0x800)
- return m_subslot->read_ram(space, offset, mem_mask);
- else
- return m_subslot->read_romd0(space, offset, mem_mask);
- }
+ virtual DECLARE_READ16_MEMBER(read_romd0) override;
virtual DECLARE_READ16_MEMBER(read_rome0) override { return m_subslot->read_rome0(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(read_romf0) override { return m_subslot->read_romf0(space, offset, mem_mask); }
@@ -63,6 +50,9 @@ public:
virtual void late_subslot_setup() override;
+protected:
+ virtual void device_start() override;
+
private:
required_device<sp0256_device> m_speech;
required_device<intv_cart_slot_device> m_subslot;
@@ -70,9 +60,7 @@ private:
};
-
-
// device type definition
-extern const device_type INTV_ROM_VOICE;
+DECLARE_DEVICE_TYPE(INTV_ROM_VOICE, intv_voice_device)
-#endif
+#endif // MAME_BUS_INTV_SLOT_H