From 63f9a01f8c5d43b9cfe68c2d401a84647d19c10e Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 29 Jun 2016 08:34:30 +0200 Subject: Cleanup and version bump --- src/mame/includes/aerofgt.h | 2 +- src/mame/includes/atarigx2.h | 8 +-- src/mame/includes/divebomb.h | 140 +++++++++++++++++++++---------------------- src/mame/includes/gameplan.h | 2 +- src/mame/includes/megasys1.h | 2 +- src/mame/includes/namconb1.h | 2 +- src/mame/includes/nmk16.h | 2 +- src/mame/includes/plygonet.h | 2 +- src/mame/includes/sg1000.h | 2 +- src/mame/includes/tsamurai.h | 2 +- 10 files changed, 82 insertions(+), 82 deletions(-) (limited to 'src/mame/includes') diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 75e9d14053e..85661959bdf 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -52,7 +52,7 @@ public: optional_device m_spr_old; // every other (non-bootleg) uses this optional_device m_spr_old2; // or a pair of them.. optional_device m_soundlatch; - + /* video-related */ diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 1cf61d8ecac..678b9c19b22 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -17,7 +17,7 @@ public: atarigx2_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), - m_xga(*this, "xga"), + m_xga(*this, "xga"), m_mo_command(*this, "mo_command"), m_playfield_tilemap(*this, "playfield"), m_alpha_tilemap(*this, "alpha"), @@ -27,7 +27,7 @@ public: UINT16 m_playfield_base; required_device m_jsa; - required_device m_xga; + required_device m_xga; required_shared_ptr m_mo_command; @@ -41,10 +41,10 @@ public: UINT16 m_playfield_xscroll; UINT16 m_playfield_yscroll; - // LEGACY PROTECTION + // LEGACY PROTECTION UINT16 m_last_write; UINT16 m_last_write_offset; - UINT32 m_protection_ram[0x1000]; + UINT32 m_protection_ram[0x1000]; virtual void update_interrupts() override; virtual void scanline_update(screen_device &screen, int scanline) override; diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h index b254be2b5d0..c79a3774093 100644 --- a/src/mame/includes/divebomb.h +++ b/src/mame/includes/divebomb.h @@ -15,77 +15,77 @@ class divebomb_state : public driver_device { public: - divebomb_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_spritecpu(*this, "spritecpu"), - m_fgcpu(*this, "fgcpu"), - m_rozcpucpu(*this, "rozcpu"), - m_bank1(*this, "bank1"), - m_fgram(*this, "fgram"), - m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_k051316_1(*this, "k051316_1"), - m_k051316_2(*this, "k051316_2") - { } - - required_device m_spritecpu; - required_device m_fgcpu; - required_device m_rozcpucpu; - required_memory_bank m_bank1; - required_shared_ptr m_fgram; - required_shared_ptr m_spriteram; - required_device m_gfxdecode; - required_device m_palette; - required_device m_k051316_1; - required_device m_k051316_2; - - tilemap_t *m_fg_tilemap; - UINT8 to_spritecpu; - UINT8 to_rozcpu; - UINT8 from_sprite; - UINT8 from_roz; - bool has_fromsprite; - bool has_fromroz; + divebomb_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_spritecpu(*this, "spritecpu"), + m_fgcpu(*this, "fgcpu"), + m_rozcpucpu(*this, "rozcpu"), + m_bank1(*this, "bank1"), + m_fgram(*this, "fgram"), + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"), + m_k051316_1(*this, "k051316_1"), + m_k051316_2(*this, "k051316_2") + { } - UINT8 roz_pal; - bool roz1_enable; - bool roz2_enable; - bool roz1_wrap; - bool roz2_wrap; - - DECLARE_MACHINE_RESET(divebomb); - DECLARE_MACHINE_START(divebomb); - DECLARE_VIDEO_START(divebomb); - DECLARE_PALETTE_INIT(divebomb); + required_device m_spritecpu; + required_device m_fgcpu; + required_device m_rozcpucpu; + required_memory_bank m_bank1; + required_shared_ptr m_fgram; + required_shared_ptr m_spriteram; + required_device m_gfxdecode; + required_device m_palette; + required_device m_k051316_1; + required_device m_k051316_2; - void update_irqs(); - void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - void decode_proms(const UINT8* rgn, int size, int index, bool inv); - UINT32 screen_update_divebomb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - - K051316_CB_MEMBER(zoom_callback_1); - K051316_CB_MEMBER(zoom_callback_2); - - TILE_GET_INFO_MEMBER(get_fg_tile_info); + tilemap_t *m_fg_tilemap; + UINT8 to_spritecpu; + UINT8 to_rozcpu; + UINT8 from_sprite; + UINT8 from_roz; + bool has_fromsprite; + bool has_fromroz; - DECLARE_READ8_MEMBER(fgcpu_roz_comm_r); - DECLARE_WRITE8_MEMBER(fgcpu_roz_comm_w); - DECLARE_READ8_MEMBER(fgcpu_spr_comm_r); - DECLARE_WRITE8_MEMBER(fgcpu_spr_comm_w); - DECLARE_READ8_MEMBER(fgcpu_comm_flags_r); - DECLARE_WRITE8_MEMBER(fgram_w); - - DECLARE_WRITE8_MEMBER(spritecpu_port00_w); - DECLARE_READ8_MEMBER(spritecpu_comm_r); - DECLARE_WRITE8_MEMBER(spritecpu_comm_w); - - DECLARE_WRITE8_MEMBER(rozcpu_bank_w); - DECLARE_WRITE8_MEMBER(rozcpu_wrap1_enable_w); - DECLARE_WRITE8_MEMBER(rozcpu_enable1_w); - DECLARE_WRITE8_MEMBER(rozcpu_enable2_w); - DECLARE_WRITE8_MEMBER(rozcpu_wrap2_enable_w); - DECLARE_READ8_MEMBER(rozcpu_comm_r); - DECLARE_WRITE8_MEMBER(rozcpu_comm_w); - DECLARE_WRITE8_MEMBER(rozcpu_pal_w); + UINT8 roz_pal; + bool roz1_enable; + bool roz2_enable; + bool roz1_wrap; + bool roz2_wrap; + + DECLARE_MACHINE_RESET(divebomb); + DECLARE_MACHINE_START(divebomb); + DECLARE_VIDEO_START(divebomb); + DECLARE_PALETTE_INIT(divebomb); + + void update_irqs(); + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void decode_proms(const UINT8* rgn, int size, int index, bool inv); + UINT32 screen_update_divebomb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + + K051316_CB_MEMBER(zoom_callback_1); + K051316_CB_MEMBER(zoom_callback_2); + + TILE_GET_INFO_MEMBER(get_fg_tile_info); + + DECLARE_READ8_MEMBER(fgcpu_roz_comm_r); + DECLARE_WRITE8_MEMBER(fgcpu_roz_comm_w); + DECLARE_READ8_MEMBER(fgcpu_spr_comm_r); + DECLARE_WRITE8_MEMBER(fgcpu_spr_comm_w); + DECLARE_READ8_MEMBER(fgcpu_comm_flags_r); + DECLARE_WRITE8_MEMBER(fgram_w); + + DECLARE_WRITE8_MEMBER(spritecpu_port00_w); + DECLARE_READ8_MEMBER(spritecpu_comm_r); + DECLARE_WRITE8_MEMBER(spritecpu_comm_w); + + DECLARE_WRITE8_MEMBER(rozcpu_bank_w); + DECLARE_WRITE8_MEMBER(rozcpu_wrap1_enable_w); + DECLARE_WRITE8_MEMBER(rozcpu_enable1_w); + DECLARE_WRITE8_MEMBER(rozcpu_enable2_w); + DECLARE_WRITE8_MEMBER(rozcpu_wrap2_enable_w); + DECLARE_READ8_MEMBER(rozcpu_comm_r); + DECLARE_WRITE8_MEMBER(rozcpu_comm_w); + DECLARE_WRITE8_MEMBER(rozcpu_pal_w); }; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index f668b23d338..b3968301d1e 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -70,7 +70,7 @@ public: required_device m_screen; optional_device m_soundlatch; - + DECLARE_WRITE8_MEMBER(io_select_w); DECLARE_READ8_MEMBER(io_port_r); DECLARE_WRITE_LINE_MEMBER(coin_w); diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index dcd8a6f5269..1e52cfc056c 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -143,7 +143,7 @@ public: DECLARE_DRIVER_INIT(avspirit); DECLARE_DRIVER_INIT(monkelf); DECLARE_DRIVER_INIT(edf); - DECLARE_DRIVER_INIT(edfp); + DECLARE_DRIVER_INIT(edfp); DECLARE_DRIVER_INIT(bigstrik); DECLARE_DRIVER_INIT(rodland); DECLARE_DRIVER_INIT(edfbl); diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index e3f065361dc..9aeb6ddc251 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -95,7 +95,7 @@ public: UINT32 screen_update_namconb2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(scantimer); - + int NB1objcode2tile(int code); int NB2objcode2tile(int code); }; diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 5ec3b51de31..91fd9563305 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -56,7 +56,7 @@ public: optional_shared_ptr m_nmk_bgvideoram3; optional_shared_ptr m_afega_scroll_0; optional_shared_ptr m_afega_scroll_1; - + int m_sprdma_base; int mask[4*2]; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 5b71fa27476..020cbe7621b 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -43,7 +43,7 @@ public: required_device m_soundlatch; required_device m_soundlatch2; required_device m_soundlatch3; - + /* 68k-side shared ram */ required_shared_ptr m_shared_ram; diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h index 6e496fed31b..efa24e6c683 100644 --- a/src/mame/includes/sg1000.h +++ b/src/mame/includes/sg1000.h @@ -77,7 +77,7 @@ public: : sg1000_state(mconfig, type, tag) { } - virtual void machine_start() override; + virtual void machine_start() override; }; class sf7000_state : public sc3000_state diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index cd371126147..5d29d9e4d27 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -26,7 +26,7 @@ public: optional_device m_audio3; required_device m_gfxdecode; required_device m_palette; - optional_device m_soundlatch; // vsgongf only + optional_device m_soundlatch; // vsgongf only required_shared_ptr m_videoram; optional_shared_ptr m_colorram; -- cgit v1.2.3