diff options
Diffstat (limited to 'src/mame/includes/taitosj.h')
-rw-r--r-- | src/mame/includes/taitosj.h | 66 |
1 files changed, 38 insertions, 28 deletions
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 2cda1bba793..f6ffb80fefa 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -3,6 +3,7 @@ #include "machine/taitosjsec.h" +#include "machine/input_merger.h" #include "machine/gen_latch.h" #include "sound/dac.h" @@ -34,6 +35,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "bmcu"), + m_soundnmi(*this, "soundnmi"), + m_soundnmi2(*this, "soundnmi2"), m_dac(*this, "dac"), m_dacvol(*this, "dacvol"), m_ay1(*this, "ay1"), @@ -42,13 +45,8 @@ public: m_ay4(*this, "ay4"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_palette(*this, "palette") { } - typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &, - const rectangle &, int, int *, rectangle *); - uint8_t m_input_port_4_f0; - uint8_t m_kikstart_gears[2]; required_shared_ptr<uint8_t> m_videoram_1; required_shared_ptr<uint8_t> m_videoram_2; required_shared_ptr<uint8_t> m_videoram_3; @@ -63,24 +61,49 @@ public: required_shared_ptr<uint8_t> m_video_priority; required_shared_ptr<uint8_t> m_collision_reg; optional_shared_ptr<uint8_t> m_kikstart_scrollram; + + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + optional_device<taito_sj_security_mcu_device> m_mcu; + required_device<input_merger_device> m_soundnmi; + required_device<input_merger_device> m_soundnmi2; + required_device<dac_8bit_r2r_device> m_dac; + required_device<discrete_device> m_dacvol; + required_device<ay8910_device> m_ay1; + required_device<ay8910_device> m_ay2; + required_device<ay8910_device> m_ay3; + required_device<ay8910_device> m_ay4; + required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + + typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &, + const rectangle &, int, int *, rectangle *); + uint8_t m_input_port_4_f0; + uint8_t m_kikstart_gears[2]; + uint8_t m_spacecr_prot_value; uint8_t m_protection_value; uint32_t m_address; - bool m_sndnmi_disable; // AKA "CIOB0" on schematic, bit 0 of AY-3-8910 @ IC50 Port B - bool m_sound_cmd_written; // 74ls74 1/2 @ GAME BOARD IC42 - bool m_sound_semaphore; // 74ls74 2/2 @ GAME BOARD IC42 + uint8_t m_soundlatch_data; + bool m_soundlatch_flag; // 74ls74 1/2 @ GAME BOARD IC42 + bool m_sound_semaphore2; // 74ls74 2/2 @ GAME BOARD IC42 bitmap_ind16 m_layer_bitmap[3]; bitmap_ind16 m_sprite_sprite_collbitmap1; bitmap_ind16 m_sprite_sprite_collbitmap2; bitmap_ind16 m_sprite_layer_collbitmap1; bitmap_ind16 m_sprite_layer_collbitmap2[3]; int m_draw_order[32][4]; - DECLARE_WRITE8_MEMBER(sound_command_ack_w); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_READ8_MEMBER(sound_command_r); - DECLARE_READ8_MEMBER(sound_status_r); - DECLARE_WRITE8_MEMBER(sound_semaphore_w); - DECLARE_WRITE8_MEMBER(sound_semaphore_clear_w); + DECLARE_WRITE8_MEMBER(soundlatch_w); + DECLARE_WRITE8_MEMBER(sound_semaphore2_w); + TIMER_CALLBACK_MEMBER(soundlatch_w_cb); + TIMER_CALLBACK_MEMBER(soundlatch_clear7_w_cb); + TIMER_CALLBACK_MEMBER(sound_semaphore2_w_cb); + TIMER_CALLBACK_MEMBER(sound_semaphore2_clear_w_cb); + DECLARE_READ8_MEMBER(soundlatch_r); + DECLARE_WRITE8_MEMBER(soundlatch_clear7_w); + DECLARE_READ8_MEMBER(soundlatch_flags_r); + DECLARE_WRITE8_MEMBER(sound_semaphore2_clear_w); DECLARE_WRITE8_MEMBER(taitosj_bankswitch_w); DECLARE_READ8_MEMBER(taitosj_fake_data_r); DECLARE_WRITE8_MEMBER(taitosj_fake_data_w); @@ -131,17 +154,4 @@ public: void copy_layer(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int which, int *sprites_on, rectangle *sprite_areas); void copy_layers(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int *sprites_on, rectangle *sprite_areas); int video_update_common(bitmap_ind16 &bitmap, const rectangle &cliprect, copy_layer_func_t copy_layer_func); - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; - optional_device<taito_sj_security_mcu_device> m_mcu; - required_device<dac_8bit_r2r_device> m_dac; - required_device<discrete_device> m_dacvol; - required_device<ay8910_device> m_ay1; - required_device<ay8910_device> m_ay2; - required_device<ay8910_device> m_ay3; - required_device<ay8910_device> m_ay4; - required_device<gfxdecode_device> m_gfxdecode; - required_device<screen_device> m_screen; - required_device<palette_device> m_palette; - required_device<generic_latch_8_device> m_soundlatch; }; |