summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/taxidriv.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/taxidriv.h')
-rw-r--r--src/mame/includes/taxidriv.h36
1 files changed, 21 insertions, 15 deletions
diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h
index 63bd13d8bf4..b661783fb81 100644
--- a/src/mame/includes/taxidriv.h
+++ b/src/mame/includes/taxidriv.h
@@ -3,6 +3,9 @@ class taxidriv_state : public driver_device
public:
taxidriv_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_palette(*this, "palette"),
m_vram0(*this, "vram0"),
m_vram1(*this, "vram1"),
m_vram2(*this, "vram2"),
@@ -11,17 +14,12 @@ public:
m_vram5(*this, "vram5"),
m_vram6(*this, "vram6"),
m_vram7(*this, "vram7"),
- m_scroll(*this, "scroll"),
- m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
+ m_scroll(*this, "scroll") { }
+
+ required_device<cpu_device> m_maincpu;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
- int m_s1;
- int m_s2;
- int m_s3;
- int m_s4;
- int m_latchA;
- int m_latchB;
required_shared_ptr<UINT8> m_vram0;
required_shared_ptr<UINT8> m_vram1;
required_shared_ptr<UINT8> m_vram2;
@@ -31,8 +29,16 @@ public:
required_shared_ptr<UINT8> m_vram6;
required_shared_ptr<UINT8> m_vram7;
required_shared_ptr<UINT8> m_scroll;
+
+ int m_s1;
+ int m_s2;
+ int m_s3;
+ int m_s4;
+ int m_latchA;
+ int m_latchB;
int m_bghide;
int m_spritectrl[9];
+
DECLARE_WRITE8_MEMBER(p2a_w);
DECLARE_WRITE8_MEMBER(p2b_w);
DECLARE_WRITE8_MEMBER(p2c_w);
@@ -53,10 +59,10 @@ public:
DECLARE_READ8_MEMBER(p8910_0a_r);
DECLARE_READ8_MEMBER(p8910_1a_r);
DECLARE_WRITE8_MEMBER(p8910_0b_w);
- DECLARE_WRITE8_MEMBER(taxidriv_spritectrl_w);
+ DECLARE_WRITE8_MEMBER(spritectrl_w);
+
+ virtual void machine_start();
DECLARE_PALETTE_INIT(taxidriv);
- UINT32 screen_update_taxidriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- required_device<cpu_device> m_maincpu;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
+
+ UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};