diff options
Diffstat (limited to 'src/mame/includes/starwars.h')
-rw-r--r-- | src/mame/includes/starwars.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 006e232d6e2..a0b9ca294f8 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "machine/6532riot.h" +#include "machine/gen_latch.h" #include "includes/slapstic.h" @@ -15,6 +16,8 @@ class starwars_state : public driver_device public: starwars_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), + m_soundlatch(*this, "soundlatch"), + m_mainlatch(*this, "mainlatch"), m_riot(*this, "riot"), m_mathram(*this, "mathram"), m_maincpu(*this, "maincpu"), @@ -22,14 +25,18 @@ public: m_slapstic_device(*this, "slapstic") { } - uint8_t m_sound_data; - uint8_t m_main_data; + required_device<generic_latch_8_device> m_soundlatch; + required_device<generic_latch_8_device> m_mainlatch; required_device<riot6532_device> m_riot; + required_shared_ptr<uint8_t> m_mathram; + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + optional_device<atari_slapstic_device> m_slapstic_device; + uint8_t *m_slapstic_source; uint8_t *m_slapstic_base; uint8_t m_slapstic_current_bank; uint8_t m_is_esb; - required_shared_ptr<uint8_t> m_mathram; uint8_t m_control_num; int m_MPA; int m_BIC; @@ -58,11 +65,7 @@ public: DECLARE_READ8_MEMBER(starwars_div_rel_r); DECLARE_WRITE8_MEMBER(starwars_math_w); DECLARE_CUSTOM_INPUT_MEMBER(matrix_flag_r); - DECLARE_READ8_MEMBER(starwars_sin_r); - DECLARE_WRITE8_MEMBER(starwars_sout_w); - DECLARE_READ8_MEMBER(starwars_main_read_r); DECLARE_READ8_MEMBER(starwars_main_ready_flag_r); - DECLARE_WRITE8_MEMBER(starwars_main_wr_w); DECLARE_WRITE8_MEMBER(starwars_soundrst_w); DECLARE_WRITE8_MEMBER(quad_pokeyn_w); DECLARE_DRIVER_INIT(esb); @@ -78,7 +81,4 @@ public: void starwars_mproc_reset(); void run_mproc(); void esb_slapstic_tweak(address_space &space, offs_t offset); - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; - optional_device<atari_slapstic_device> m_slapstic_device; }; |