diff options
Diffstat (limited to 'src/mame/includes/mario.h')
-rw-r--r-- | src/mame/includes/mario.h | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 999fc876bb8..4cc1f790c06 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -31,25 +31,33 @@ #define I8035_MASTER_CLOCK XTAL_11MHz /* verified on pcb: 730Khz */ #define I8035_CLOCK (I8035_MASTER_CLOCK) -#define MARIO_PALETTE_LENGTH (256) - class mario_state : public driver_device { public: mario_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_z80dma(*this, "z80dma") { } + m_z80dma(*this, "z80dma"), + m_discrete(*this, "discrete"), + m_spriteram(*this, "spriteram"), + m_videoram(*this, "videoram"), + m_monitor(0) { } - /* memory pointers */ + /* devices */ + required_device<cpu_device> m_maincpu; + optional_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; + optional_device<z80dma_device> m_z80dma; + optional_device<discrete_device> m_discrete; - /* machine states */ + /* memory pointers */ + required_shared_ptr<UINT8> m_spriteram; + required_shared_ptr<UINT8> m_videoram; /* sound state */ UINT8 m_last; @@ -61,12 +69,6 @@ public: UINT8 m_palette_bank; UINT16 m_gfx_scroll; UINT8 m_flip; - - /* driver general */ - - required_shared_ptr<UINT8> m_spriteram; - required_shared_ptr<UINT8> m_videoram; - optional_device<discrete_device> m_discrete; tilemap_t *m_bg_tilemap; int m_monitor; @@ -104,11 +106,6 @@ public: DECLARE_READ8_MEMBER(memory_read_byte); DECLARE_WRITE8_MEMBER(memory_write_byte); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int is_bootleg); - required_device<cpu_device> m_maincpu; - optional_device<cpu_device> m_audiocpu; - required_device<gfxdecode_device> m_gfxdecode; - required_device<palette_device> m_palette; - optional_device<z80dma_device> m_z80dma; }; /*----------- defined in audio/mario.c -----------*/ |