diff options
Diffstat (limited to 'src/mame/includes/redalert.h')
-rw-r--r-- | src/mame/includes/redalert.h | 61 |
1 files changed, 2 insertions, 59 deletions
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 3d017355cde..04748852b3f 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -8,8 +8,7 @@ ask. - Mike Balfour (mab22@po.cwru.edu) To Do: - - Device-ify video and audio hardware to turn optional_devices into - required_devices. + - Device-ify video hardware. ****************************************************************************/ @@ -18,11 +17,6 @@ #pragma once -#include "cpu/i8085/i8085.h" -#include "machine/6821pia.h" -#include "machine/gen_latch.h" -#include "sound/ay8910.h" -#include "sound/hc55516.h" #include "screen.h" class redalert_state : public driver_device @@ -35,15 +29,7 @@ public: m_video_control(*this, "video_control"), m_bitmap_color(*this, "bitmap_color"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_voicecpu(*this, "voice"), - m_ay8910(*this, "aysnd"), - m_ay(*this, "ay%u", 1U), - m_cvsd(*this, "cvsd"), - m_sndpia(*this, "sndpia"), - m_screen(*this, "screen"), - m_soundlatch(*this, "soundlatch"), - m_soundlatch2(*this, "soundlatch2") + m_screen(*this, "screen") { } @@ -52,19 +38,12 @@ public: void ww3_video(machine_config &config); void panther_video(machine_config &config); void demoneye_video(machine_config &config); - void redalert_audio_m37b(machine_config &config); - void redalert_audio_voice(machine_config &config); - void redalert_audio(machine_config &config); - void ww3_audio(machine_config &config); - void panther_audio(machine_config &config); - void demoneye_audio(machine_config &config); void demoneye(machine_config &config); void ww3(machine_config &config); void panther(machine_config &config); void redalert(machine_config &config); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); - DECLARE_CUSTOM_INPUT_MEMBER(sound_status_r); private: required_shared_ptr<uint8_t> m_bitmap_videoram; @@ -73,15 +52,7 @@ private: required_shared_ptr<uint8_t> m_bitmap_color; required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; - optional_device<i8085a_cpu_device> m_voicecpu; - optional_device<ay8910_device> m_ay8910; - optional_device_array<ay8910_device, 2> m_ay; - optional_device<hc55516_device> m_cvsd; - optional_device<pia6821_device> m_sndpia; required_device<screen_device> m_screen; - required_device<generic_latch_8_device> m_soundlatch; - optional_device<generic_latch_8_device> m_soundlatch2; std::unique_ptr<uint8_t[]> m_bitmap_colorram; uint8_t m_control_xor; @@ -89,11 +60,6 @@ private: void redalert_interrupt_clear_w(uint8_t data); uint8_t panther_interrupt_clear_r(); void redalert_bitmap_videoram_w(offs_t offset, uint8_t data); - void redalert_audio_command_w(uint8_t data); - uint8_t redalert_ay8910_latch_1_r(); - void redalert_ay8910_latch_2_w(uint8_t data); - void redalert_voice_command_w(uint8_t data); - void demoneye_audio_command_w(uint8_t data); DECLARE_VIDEO_START(redalert); DECLARE_VIDEO_START(ww3); DECLARE_VIDEO_START(demoneye); @@ -101,42 +67,19 @@ private: uint32_t screen_update_demoneye(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_panther(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(redalert_vblank_interrupt); - TIMER_CALLBACK_MEMBER(audio_irq_on); - TIMER_CALLBACK_MEMBER(audio_irq_off); - void redalert_analog_w(uint8_t data); - void redalert_AY8910_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sod_callback); - DECLARE_READ_LINE_MEMBER(sid_callback); - void demoneye_ay8910_latch_1_w(uint8_t data); - uint8_t demoneye_ay8910_latch_2_r(); - void demoneye_ay8910_data_w(uint8_t data); void get_redalert_pens(pen_t *pens); void get_panther_pens(pen_t *pens); void get_demoneye_pens(pen_t *pens); void demoneye_bitmap_layer_w(offs_t offset, uint8_t data); void demoneye_bitmap_ypos_w(u8 data); - virtual void sound_start() override; - void redalert_main_map(address_map &map); void ww3_main_map(address_map &map); void panther_main_map(address_map &map); void demoneye_main_map(address_map &map); - void redalert_audio_map(address_map &map); - void panther_audio_map(address_map &map); - void demoneye_audio_map(address_map &map); - - void redalert_voice_map(address_map &map); - - emu_timer *m_audio_irq_on_timer; - emu_timer *m_audio_irq_off_timer; - - uint8_t m_ay8910_latch_1; - uint8_t m_ay8910_latch_2; u8 m_demoneye_bitmap_reg[4]; u8 m_demoneye_bitmap_yoffs; - u8 m_sound_hs; }; #endif // MAME_INCLUDES_REDALERT_H |