diff options
Diffstat (limited to 'src/mame/includes/namcos1.h')
-rw-r--r-- | src/mame/includes/namcos1.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 1a3422fc15f..bde79e71ccd 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -1,32 +1,31 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "cpu/m6800/m6801.h" +#include "cpu/m6809/m6809.h" #include "machine/c117.h" #include "sound/dac.h" #include "sound/namco.h" #include "video/namco_c116.h" +#include "video/namco_c123tmap.h" #include "machine/74157.h" class namcos1_state : public driver_device { public: - namcos1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + namcos1_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_c116(*this, "c116"), m_c117(*this, "c117"), - m_dac0(*this, "dac0"), - m_dac1(*this, "dac1"), + m_c123tmap(*this, "c123tmap"), + m_dac(*this, "dac%u", 0U), m_gfxdecode(*this, "gfxdecode"), - m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_playfield_control(*this, "pfcontrol"), m_triram(*this, "triram"), m_rom(*this, "user1"), - m_tilemap_maskdata(*this, "tmap_mask"), m_soundbank(*this, "soundbank"), m_mcubank(*this, "mcubank"), m_io_dipsw(*this, "DIPSW"), @@ -60,22 +59,19 @@ public: void init_pistoldm(); private: - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_subcpu; - required_device<cpu_device> m_audiocpu; + required_device<mc6809e_device> m_maincpu; + required_device<mc6809e_device> m_subcpu; + required_device<mc6809e_device> m_audiocpu; required_device<hd63701_cpu_device> m_mcu; required_device<namco_c116_device> m_c116; required_device<namco_c117_device> m_c117; - required_device<dac_8bit_r2r_device> m_dac0; - required_device<dac_8bit_r2r_device> m_dac1; + required_device<namco_c123tmap_device> m_c123tmap; + required_device_array<dac_8bit_r2r_device, 2> m_dac; required_device<gfxdecode_device> m_gfxdecode; - required_shared_ptr<uint8_t> m_videoram; required_shared_ptr<uint8_t> m_spriteram; - required_shared_ptr<uint8_t> m_playfield_control; required_shared_ptr<uint8_t> m_triram; required_region_ptr<uint8_t> m_rom; - required_region_ptr<uint8_t> m_tilemap_maskdata; required_memory_bank m_soundbank; required_memory_bank m_mcubank; @@ -100,7 +96,6 @@ private: int m_strobe; int m_strobe_count; int m_stored_input[2]; - tilemap_t *m_bg_tilemap[6]; int m_copy_sprites; uint8_t m_drawmode_table[16]; @@ -116,7 +111,6 @@ private: DECLARE_READ8_MEMBER(quester_paddle_r); DECLARE_READ8_MEMBER(berabohm_buttons_r); DECLARE_READ8_MEMBER(faceoff_inputs_r); - DECLARE_WRITE8_MEMBER(videoram_w); DECLARE_WRITE8_MEMBER(spriteram_w); DECLARE_WRITE8_MEMBER(_3dcs_w); DECLARE_READ8_MEMBER(no_key_r); @@ -133,7 +127,7 @@ private: virtual void video_start() override; void driver_init() override; - template <int Offset> TILE_GET_INFO_MEMBER(get_tile_info); + void TilemapCB(uint16_t code, int *tile, int *mask); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); |