summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/kaneko16.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/kaneko16.h')
-rw-r--r--src/mame/includes/kaneko16.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index fa0f7a4fbb2..3302977f594 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -23,6 +23,7 @@
#include "sound/ay8910.h"
#include "sound/okim6295.h"
#include "sound/ym2151.h"
+#include "video/bufsprite.h"
#include "video/kaneko_spr.h"
#include "video/kaneko_tmap.h"
#include "emupal.h"
@@ -47,8 +48,8 @@ public:
m_eeprom(*this, "eeprom"),
m_soundlatch(*this, "soundlatch"),
m_watchdog(*this, "watchdog"),
- m_mainregion(*this, "maincpu"),
m_spriteram(*this, "spriteram"),
+ m_mainregion(*this, "maincpu"),
m_mainram(*this, "mainram"),
m_mcuram(*this, "mcuram"),
m_okiregion(*this, "oki%u", 1),
@@ -85,9 +86,9 @@ protected:
optional_device<eeprom_serial_93cxx_device> m_eeprom;
optional_device<generic_latch_8_device> m_soundlatch;
optional_device<watchdog_timer_device> m_watchdog;
+ optional_device<buffered_spriteram16_device> m_spriteram;
required_region_ptr<u16> m_mainregion;
- optional_shared_ptr<u16> m_spriteram;
optional_shared_ptr<u16> m_mainram;
optional_shared_ptr<u16> m_mcuram;
@@ -108,10 +109,10 @@ protected:
void coin_lockout_w(u8 data);
void bloodwar_coin_lockout_w(u8 data);
- void display_enable_w(offs_t offset, u16 data, u16 mem_mask); // (u16 data, u16 mem_mask);
+ void display_enable_w(offs_t offset, u16 data, u16 mem_mask = ~0); // (u16 data, u16 mem_mask = ~0);
- template<unsigned Chip> DECLARE_READ16_MEMBER(ym2149_r);
- template<unsigned Chip> DECLARE_WRITE16_MEMBER(ym2149_w);
+ template<unsigned Chip> u16 ym2149_r(offs_t offset);
+ template<unsigned Chip> void ym2149_w(offs_t offset, u16 data, u16 mem_mask = ~0);
template<unsigned Mask> void oki_bank0_w(u8 data);
template<unsigned Mask> void oki_bank1_w(u8 data);
@@ -207,12 +208,12 @@ private:
u8 bg15_bright_r();
void bg15_bright_w(u8 data);
- DECLARE_WRITE16_MEMBER(berlwall_oki_w);
+ void berlwall_oki_w(offs_t offset, u16 data, u16 mem_mask = ~0);
u16 berlwall_spriteram_r(offs_t offset);
- void berlwall_spriteram_w(offs_t offset, u16 data, u16 mem_mask);
- DECLARE_READ16_MEMBER(berlwall_spriteregs_r);
- DECLARE_WRITE16_MEMBER(berlwall_spriteregs_w);
+ void berlwall_spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 berlwall_spriteregs_r(offs_t offset);
+ void berlwall_spriteregs_w(offs_t offset, u16 data, u16 mem_mask = ~0);
u8 m_bg15_select;
u8 m_bg15_bright;