summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2021-05-31 18:23:42 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2021-05-31 18:23:42 +0200
commitbded3b386111715a7f381d06c18ebe76104ee71c (patch)
treeceb9d44e0d4e1bc9b9ddcfef77393aca55934abc /src/mame/includes
parentbfe4aa26da84c7cc5261102a2a01016469f3deff (diff)
ddribble.cpp, finalizr.cpp, ironhors.cpp: minor cleanups
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/ddribble.h81
-rw-r--r--src/mame/includes/finalizr.h54
-rw-r--r--src/mame/includes/ironhors.h102
3 files changed, 126 insertions, 111 deletions
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index d40df1f9228..a1758df3011 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -21,75 +21,66 @@ public:
ddribble_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_fg_videoram(*this, "fg_videoram"),
- m_spriteram_1(*this, "spriteram_1"),
- m_sharedram(*this, "sharedram"),
+ m_spriteram(*this, "spriteram_%u", 1U),
m_bg_videoram(*this, "bg_videoram"),
- m_spriteram_2(*this, "spriteram_2"),
- m_snd_sharedram(*this, "snd_sharedram"),
+ m_mainbank(*this, "mainbank"),
+ m_vlmbank(*this, "vlmbank"),
m_maincpu(*this, "maincpu"),
- m_cpu1(*this, "cpu1"),
+ m_subcpu(*this, "subcpu"),
m_vlm(*this, "vlm"),
- m_filter1(*this, "filter1"),
- m_filter2(*this, "filter2"),
- m_filter3(*this, "filter3"),
+ m_filter(*this, "filter%u", 1U),
m_gfxdecode(*this, "gfxdecode")
{ }
void ddribble(machine_config &config);
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
private:
- /* memory pointers */
+ // memory pointers
required_shared_ptr<uint8_t> m_fg_videoram;
- required_shared_ptr<uint8_t> m_spriteram_1;
- required_shared_ptr<uint8_t> m_sharedram;
+ required_shared_ptr_array<uint8_t, 2> m_spriteram;
required_shared_ptr<uint8_t> m_bg_videoram;
- required_shared_ptr<uint8_t> m_spriteram_2;
- required_shared_ptr<uint8_t> m_snd_sharedram;
+ required_memory_bank m_mainbank;
+ required_memory_bank m_vlmbank;
- /* video-related */
- tilemap_t *m_fg_tilemap;
- tilemap_t *m_bg_tilemap;
- int m_vregs[2][5];
- int m_charbank[2];
+ // video-related
+ tilemap_t *m_fg_tilemap;
+ tilemap_t *m_bg_tilemap;
+ uint8_t m_vregs[2][5];
+ uint8_t m_charbank[2];
- /* misc */
- int m_int_enable_0;
- int m_int_enable_1;
+ // misc
+ uint8_t m_int_enable[2];
- /* devices */
+ // devices
required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_cpu1;
+ required_device<cpu_device> m_subcpu;
required_device<vlm5030_device> m_vlm;
- required_device<filter_rc_device> m_filter1;
- required_device<filter_rc_device> m_filter2;
- required_device<filter_rc_device> m_filter3;
+ required_device_array<filter_rc_device, 3> m_filter;
required_device<gfxdecode_device> m_gfxdecode;
- void ddribble_bankswitch_w(uint8_t data);
- uint8_t ddribble_sharedram_r(offs_t offset);
- void ddribble_sharedram_w(offs_t offset, uint8_t data);
- uint8_t ddribble_snd_sharedram_r(offs_t offset);
- void ddribble_snd_sharedram_w(offs_t offset, uint8_t data);
- void ddribble_coin_counter_w(uint8_t data);
+ void bankswitch_w(uint8_t data);
+ void coin_counter_w(uint8_t data);
void K005885_0_w(offs_t offset, uint8_t data);
void K005885_1_w(offs_t offset, uint8_t data);
- void ddribble_fg_videoram_w(offs_t offset, uint8_t data);
- void ddribble_bg_videoram_w(offs_t offset, uint8_t data);
- uint8_t ddribble_vlm5030_busy_r();
- void ddribble_vlm5030_ctrl_w(uint8_t data);
+ void fg_videoram_w(offs_t offset, uint8_t data);
+ void bg_videoram_w(offs_t offset, uint8_t data);
+ uint8_t vlm5030_busy_r();
+ void vlm5030_ctrl_w(uint8_t data);
TILEMAP_MAPPER_MEMBER(tilemap_scan);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
- void ddribble_palette(palette_device &palette) const;
- uint32_t screen_update_ddribble(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ void palette(palette_device &palette) const;
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
- void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* source, int lenght, int gfxset, int flipscreen );
- void cpu0_map(address_map &map);
- void cpu1_map(address_map &map);
- void cpu2_map(address_map &map);
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* source, int lenght, int gfxset, int flipscreen);
+ void maincpu_map(address_map &map);
+ void subcpu_map(address_map &map);
+ void audiocpu_map(address_map &map);
void vlm_map(address_map &map);
};
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index dee2693accc..ba79c7e1fe2 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -25,59 +25,55 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_scroll(*this, "scroll"),
- m_colorram(*this, "colorram"),
- m_videoram(*this, "videoram"),
- m_colorram2(*this, "colorram2"),
- m_videoram2(*this, "videoram2"),
- m_spriteram(*this, "spriteram"),
- m_spriteram_2(*this, "spriteram_2")
+ m_colorram(*this, "colorram%u", 1U),
+ m_videoram(*this, "videoram%u", 1U),
+ m_spriteram(*this, "spriteram%u", 1U)
{ }
void finalizr(machine_config &config);
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
private:
- /* devices */
+ // devices
required_device<cpu_device> m_maincpu;
required_device<i8039_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- /* memory pointers */
+ // memory pointers
required_shared_ptr<uint8_t> m_scroll;
- required_shared_ptr<uint8_t> m_colorram;
- required_shared_ptr<uint8_t> m_videoram;
- required_shared_ptr<uint8_t> m_colorram2;
- required_shared_ptr<uint8_t> m_videoram2;
- required_shared_ptr<uint8_t> m_spriteram;
- required_shared_ptr<uint8_t> m_spriteram_2;
+ required_shared_ptr_array<uint8_t,2 > m_colorram;
+ required_shared_ptr_array<uint8_t,2 > m_videoram;
+ required_shared_ptr_array<uint8_t,2 > m_spriteram;
- /* video-related */
+ // video-related
tilemap_t *m_fg_tilemap;
tilemap_t *m_bg_tilemap;
- int m_spriterambank;
- int m_charbank;
+ uint8_t m_spriterambank;
+ uint8_t m_charbank;
- /* misc */
- int m_T1_line;
+ // misc
+ uint8_t m_t1_line;
uint8_t m_nmi_enable;
uint8_t m_irq_enable;
- void finalizr_coin_w(uint8_t data);
- void finalizr_flipscreen_w(uint8_t data);
- void finalizr_i8039_irq_w(uint8_t data);
+ void coin_w(uint8_t data);
+ void flipscreen_w(uint8_t data);
+ void i8039_irq_w(uint8_t data);
void i8039_irqen_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(i8039_t1_r);
void i8039_t0_w(uint8_t data);
- void finalizr_videoctrl_w(uint8_t data);
+ void videoctrl_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
- void finalizr_palette(palette_device &palette) const;
+ void palette(palette_device &palette) const;
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_finalizr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- TIMER_DEVICE_CALLBACK_MEMBER(finalizr_scanline);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline);
void main_map(address_map &map);
void sound_io_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 1f172f21969..e2de2d2e41a 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -17,10 +17,10 @@
#include "screen.h"
#include "tilemap.h"
-class ironhors_state : public driver_device
+class ironhors_base_state : public driver_device
{
public:
- ironhors_state(const machine_config &mconfig, device_type type, const char *tag) :
+ ironhors_base_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
@@ -33,14 +33,15 @@ public:
m_scroll(*this, "scroll"),
m_colorram(*this, "colorram"),
m_videoram(*this, "videoram"),
- m_spriteram2(*this, "spriteram2"),
- m_spriteram(*this, "spriteram")
+ m_spriteram(*this, "spriteram%u", 1U)
{ }
- void farwest(machine_config &config);
- void ironhors(machine_config &config);
+ void base(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
-private:
void sh_irqtrigger_w(uint8_t data);
void videoram_w(offs_t offset, uint8_t data);
void colorram_w(offs_t offset, uint8_t data);
@@ -49,26 +50,9 @@ private:
void flipscreen_w(uint8_t data);
void filter_w(uint8_t data);
- uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_farwest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
- TIMER_DEVICE_CALLBACK_MEMBER(ironhors_scanline_tick);
- TIMER_DEVICE_CALLBACK_MEMBER(farwest_scanline_tick);
-
- void ironhors_palette(palette_device &palette) const;
- DECLARE_VIDEO_START(farwest);
-
- void farwest_master_map(address_map &map);
- void farwest_slave_map(address_map &map);
- void master_map(address_map &map);
- void slave_io_map(address_map &map);
- void slave_map(address_map &map);
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
+ void palette(palette_device &palette) const;
- /* devices */
+ // devices
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -77,25 +61,69 @@ private:
required_device<generic_latch_8_device> m_soundlatch;
required_device<discrete_device> m_disc_ih;
- /* memory pointers */
+ // memory pointers
required_shared_ptr<uint8_t> m_interrupt_enable;
required_shared_ptr<uint8_t> m_scroll;
required_shared_ptr<uint8_t> m_colorram;
required_shared_ptr<uint8_t> m_videoram;
- required_shared_ptr<uint8_t> m_spriteram2;
- required_shared_ptr<uint8_t> m_spriteram;
+ required_shared_ptr_array<uint8_t, 2> m_spriteram;
+
+ // video-related
+ tilemap_t *m_bg_tilemap;
+ uint8_t m_palettebank;
+ uint8_t m_charbank;
+ uint8_t m_spriterambank;
+};
+
+class ironhors_state : public ironhors_base_state
+{
+public:
+ ironhors_state(const machine_config &mconfig, device_type type, const char *tag) :
+ ironhors_base_state(mconfig, type, tag)
+ { }
- /* video-related */
- tilemap_t *m_bg_tilemap;
- int m_palettebank;
- int m_charbank;
- int m_spriterambank;
+ void ironhors(machine_config &config);
+
+protected:
+ virtual void video_start() override;
+
+private:
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline_tick);
+
+ void master_map(address_map &map);
+ void slave_map(address_map &map);
+ void slave_io_map(address_map &map);
+
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ TILE_GET_INFO_MEMBER(get_bg_tile_info);
+};
+
+class farwest_state : public ironhors_base_state
+{
+public:
+ farwest_state(const machine_config &mconfig, device_type type, const char *tag) :
+ ironhors_base_state(mconfig, type, tag)
+ { }
+
+ void farwest(machine_config &config);
+
+protected:
+ virtual void video_start() override;
+
+private:
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline_tick);
+
+ void master_map(address_map &map);
+ void slave_map(address_map &map);
- void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
- void farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- TILE_GET_INFO_MEMBER(farwest_get_bg_tile_info);
};
#endif // MAME_INCLUDES_IRONHORS_H