summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/irem.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/irem.h')
-rw-r--r--src/mame/audio/irem.h37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h
index 756f3355d22..657176ab1ea 100644
--- a/src/mame/audio/irem.h
+++ b/src/mame/audio/irem.h
@@ -14,21 +14,21 @@ class irem_audio_device : public device_t
{
public:
DECLARE_WRITE8_MEMBER( cmd_w );
- DECLARE_READ8_MEMBER( soundlatch_r );
DECLARE_WRITE8_MEMBER( m6803_port1_w );
DECLARE_WRITE8_MEMBER( m6803_port2_w );
DECLARE_READ8_MEMBER( m6803_port1_r );
DECLARE_READ8_MEMBER( m6803_port2_r );
- DECLARE_WRITE8_MEMBER( ay8910_45M_portb_w );
- DECLARE_WRITE8_MEMBER( ay8910_45L_porta_w );
DECLARE_WRITE8_MEMBER( sound_irq_ack_w );
DECLARE_WRITE8_MEMBER( m52_adpcm_w );
DECLARE_WRITE8_MEMBER( m62_adpcm_w );
- void adpcm_int(int st);
-
netlist_mame_logic_input_device * m_audio_SINH;
+ DECLARE_READ8_MEMBER( soundlatch_r );
+ DECLARE_WRITE8_MEMBER( ay8910_45M_portb_w );
+ DECLARE_WRITE8_MEMBER( ay8910_45L_porta_w );
+ void adpcm_int(int st);
+
protected:
irem_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -42,14 +42,12 @@ private:
uint8_t m_port2;
uint8_t m_soundlatch;
- /* FIXME: using required / optional device would be better */
- // required_device<ay8910_device> m_ay_45L;
- // required_device<ay8910_device> m_ay_45M;
- ay8910_device *m_ay_45L;
- ay8910_device *m_ay_45M;
- msm5205_device *m_adpcm1;
- msm5205_device *m_adpcm2;
+ required_device<cpu_device> m_cpu;
+ required_device<ay8910_device> m_ay_45L;
+ required_device<ay8910_device> m_ay_45M;
+ required_device<msm5205_device> m_adpcm1;
+ optional_device<msm5205_device> m_adpcm2;
optional_device<netlist_mame_logic_input_device> m_audio_BD;
optional_device<netlist_mame_logic_input_device> m_audio_SD;
optional_device<netlist_mame_logic_input_device> m_audio_OH;
@@ -60,26 +58,29 @@ class m62_audio_device : public irem_audio_device
{
public:
m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual machine_config_constructor device_mconfig_additions() const override;
+
+protected:
+ virtual void device_add_mconfig(machine_config &config) override;
};
class m52_soundc_audio_device : public irem_audio_device
{
public:
m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual machine_config_constructor device_mconfig_additions() const override;
+
+protected:
+ virtual void device_add_mconfig(machine_config &config) override;
};
class m52_large_audio_device : public irem_audio_device
{
public:
m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual machine_config_constructor device_mconfig_additions() const override;
+
+protected:
+ virtual void device_add_mconfig(machine_config &config) override;
};
-//MACHINE_CONFIG_EXTERN( m52_sound_c_audio );
-//MACHINE_CONFIG_EXTERN( m52_large_audio );
-//MACHINE_CONFIG_EXTERN( m62_audio );
DECLARE_DEVICE_TYPE(IREM_M62_AUDIO, m62_audio_device)
DECLARE_DEVICE_TYPE(IREM_M52_SOUNDC_AUDIO, m52_soundc_audio_device)