diff options
Diffstat (limited to 'src/mame/includes/f1gp.h')
-rw-r--r-- | src/mame/includes/f1gp.h | 115 |
1 files changed, 64 insertions, 51 deletions
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index ec777834dc7..a9f9a7d17e0 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -18,69 +18,51 @@ public: f1gp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sharedram(*this, "sharedram"), - m_spr1vram(*this, "spr1vram"), - m_spr2vram(*this, "spr2vram"), - m_spr1cgram(*this, "spr1cgram"), - m_spr2cgram(*this, "spr2cgram"), + m_sprvram(*this, "spr%uvram", 1U), + m_sprcgram(*this, "spr%ucgram", 1U), m_fgvideoram(*this, "fgvideoram"), m_rozvideoram(*this, "rozvideoram"), - m_sprcgram(*this, "sprcgram"), - m_spritelist(*this, "spritelist"), m_spriteram(*this, "spriteram"), m_fgregs(*this, "fgregs"), m_rozregs(*this, "rozregs"), - m_z80bank(*this, "bank1"), + m_z80bank(*this, "z80bank"), m_maincpu(*this, "maincpu"), - m_spr_old(*this, "vsystem_spr_old"), - m_spr_old2(*this, "vsystem_spr_ol2"), - m_spr(*this, "vsystem_spr"), m_gfxdecode(*this, "gfxdecode"), m_audiocpu(*this, "audiocpu"), m_k053936(*this, "k053936"), m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), - m_acia(*this, "acia") + m_acia(*this, "acia"), + m_rozgfxram(*this, "rozgfxram"), + m_spr_old(*this, "vsystem_spr_old%u", 1U) { } - void f1gp2(machine_config &config); void f1gpb(machine_config &config); void f1gp(machine_config &config); -private: +protected: /* memory pointers */ required_shared_ptr<uint16_t> m_sharedram; - optional_shared_ptr<uint16_t> m_spr1vram; - optional_shared_ptr<uint16_t> m_spr2vram; - optional_shared_ptr<uint16_t> m_spr1cgram; - optional_shared_ptr<uint16_t> m_spr2cgram; + optional_shared_ptr_array<uint16_t, 2> m_sprvram; + optional_shared_ptr_array<uint16_t, 2> m_sprcgram; required_shared_ptr<uint16_t> m_fgvideoram; required_shared_ptr<uint16_t> m_rozvideoram; - optional_shared_ptr<uint16_t> m_sprcgram; - optional_shared_ptr<uint16_t> m_spritelist; optional_shared_ptr<uint16_t> m_spriteram; optional_shared_ptr<uint16_t> m_fgregs; optional_shared_ptr<uint16_t> m_rozregs; optional_memory_bank m_z80bank; - uint16_t * m_zoomdata; - /* video-related */ tilemap_t *m_fg_tilemap; tilemap_t *m_roz_tilemap; - int m_roz_bank; int m_flipscreen; int m_gfxctrl; int m_scroll[2]; - uint32_t f1gp2_tile_callback( uint32_t code ); - uint32_t f1gp_old_tile_callback( uint32_t code ); - uint32_t f1gp_ol2_tile_callback( uint32_t code ); + template<int Chip> uint32_t tile_callback( uint32_t code ); /* devices */ required_device<cpu_device> m_maincpu; - optional_device<vsystem_spr2_device> m_spr_old; // f1gp - optional_device<vsystem_spr2_device> m_spr_old2; // f1gp - optional_device<vsystem_spr_device> m_spr; // f1gp2 required_device<gfxdecode_device> m_gfxdecode; optional_device<cpu_device> m_audiocpu; optional_device<k053936_device> m_k053936; @@ -88,37 +70,68 @@ private: optional_device<generic_latch_8_device> m_soundlatch; // not f1gpb required_device<acia6850_device> m_acia; - DECLARE_WRITE8_MEMBER(f1gp_sh_bankswitch_w); + DECLARE_WRITE8_MEMBER(sh_bankswitch_w); DECLARE_READ8_MEMBER(command_pending_r); - DECLARE_WRITE16_MEMBER(f1gpb_misc_w); - DECLARE_READ16_MEMBER(f1gp_zoomdata_r); - DECLARE_WRITE16_MEMBER(f1gp_zoomdata_w); - DECLARE_READ16_MEMBER(f1gp_rozvideoram_r); - DECLARE_WRITE16_MEMBER(f1gp_rozvideoram_w); - DECLARE_WRITE16_MEMBER(f1gp_fgvideoram_w); - DECLARE_WRITE16_MEMBER(f1gp_fgscroll_w); - DECLARE_WRITE16_MEMBER(f1gp_gfxctrl_w); - DECLARE_WRITE16_MEMBER(f1gp2_gfxctrl_w); - TILE_GET_INFO_MEMBER(f1gp_get_roz_tile_info); - TILE_GET_INFO_MEMBER(f1gp2_get_roz_tile_info); + DECLARE_WRITE16_MEMBER(rozvideoram_w); + DECLARE_WRITE16_MEMBER(fgvideoram_w); + DECLARE_WRITE16_MEMBER(fgscroll_w); + DECLARE_WRITE8_MEMBER(gfxctrl_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_MACHINE_START(f1gp); - DECLARE_MACHINE_RESET(f1gp); - DECLARE_VIDEO_START(f1gp); - DECLARE_MACHINE_START(f1gpb); - DECLARE_VIDEO_START(f1gpb); - DECLARE_VIDEO_START(f1gp2); + + virtual void machine_start() override; + virtual void machine_reset() override; + + void f1gp_cpu2_map(address_map &map); + void sound_io_map(address_map &map); + void sound_map(address_map &map); + +private: + /* memory pointers */ + optional_shared_ptr<uint16_t> m_rozgfxram; + + /* devices */ + optional_device_array<vsystem_spr2_device, 2> m_spr_old; // f1gp + + DECLARE_WRITE16_MEMBER(f1gpb_misc_w); + DECLARE_WRITE16_MEMBER(rozgfxram_w); + TILE_GET_INFO_MEMBER(get_roz_tile_info); + + virtual void video_start() override; + uint32_t screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void f1gpb_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect ); - void f1gp2_cpu1_map(address_map &map); void f1gp_cpu1_map(address_map &map); - void f1gp_cpu2_map(address_map &map); void f1gpb_cpu1_map(address_map &map); void f1gpb_cpu2_map(address_map &map); - void sound_io_map(address_map &map); - void sound_map(address_map &map); +}; + +class f1gp2_state : public f1gp_state +{ +public: + f1gp2_state(const machine_config &mconfig, device_type type, const char *tag) : + f1gp_state(mconfig, type, tag), + m_spr(*this, "vsystem_spr") + { } + + void f1gp2(machine_config &config); + +private: + /* video-related */ + int m_roz_bank; + + /* devices */ + optional_device<vsystem_spr_device> m_spr; // f1gp2 + + DECLARE_WRITE8_MEMBER(rozbank_w); + + TILE_GET_INFO_MEMBER(get_roz_tile_info); + + virtual void machine_reset() override; + virtual void video_start() override; + + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void f1gp2_cpu1_map(address_map &map); }; #endif // MAME_INCLUDES_F1GP_H |