diff options
722 files changed, 2280 insertions, 736 deletions
diff --git a/src/emu/driver.c b/src/emu/driver.c index e9a498a1bbd..65ad6e23d0f 100644 --- a/src/emu/driver.c +++ b/src/emu/driver.c @@ -35,7 +35,6 @@ driver_device::driver_device(const machine_config &mconfig, device_type type, co : device_t(mconfig, type, "Driver Device", tag, NULL, 0, "", __FILE__), device_memory_interface(mconfig, *this), m_screen(*this, "screen"), - m_gfxdecode(*this, "gfxdecode"), m_generic_paletteram_8(*this, "paletteram"), m_generic_paletteram2_8(*this, "paletteram2"), m_generic_paletteram_16(*this, "paletteram"), diff --git a/src/emu/driver.h b/src/emu/driver.h index 94981859fb1..ebca6358f73 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -378,7 +378,6 @@ protected: public: // generic devices optional_device<screen_device> m_screen; - optional_device<gfxdecode_device> m_gfxdecode; // generic pointers optional_shared_ptr<UINT8> m_generic_paletteram_8; diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index a7625de1b34..29f76197eab 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -57,7 +57,8 @@ public: m_spriteram_1(*this, "spritera1"), m_spriteram_2(*this, "spritera2"), m_bgram(*this, "bgram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<okim6295_device> m_oki1; @@ -81,6 +82,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_k3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index f640b88ece5..fabcf9d2a1c 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -53,7 +53,8 @@ public: m_videoram2(*this, "videoram2"), m_videoram3(*this, "videoram3"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -68,6 +69,7 @@ public: // devices required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; // screen updates UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 19282253484..f036034f43d 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -460,7 +460,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_ay8910(*this, "ay8910") + m_ay8910(*this, "ay8910"), + m_gfxdecode(*this, "gfxdecode") { } @@ -494,6 +495,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<ay8910_device> m_ay8910; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index a23c58dd071..d21e8ffe7c0 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -51,7 +51,8 @@ public: m_maincpu(*this, "maincpu"), m_scoreram(*this, "scoreram"), m_ram2(*this, "ram2"), - m_characterram(*this, "characterram") + m_characterram(*this, "characterram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -73,6 +74,7 @@ public: virtual void palette_init(); UINT32 screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ace_postload(); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 30a4daf53a8..bc631beb6b2 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -23,12 +23,14 @@ public: m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; emu_timer *m_refresh_timer; DECLARE_WRITE8_MEMBER(acefruit_colorram_w); DECLARE_WRITE8_MEMBER(acefruit_coin_w); diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 98d7323574b..7f651baa333 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -73,7 +73,8 @@ public: m_ac_devram(*this, "ac_devram"), m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), - m_oki2(*this, "oki2") { } + m_oki2(*this, "oki2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_ac_bgvram; required_shared_ptr<UINT16> m_ac_txvram; @@ -104,6 +105,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki1; required_device<okim6295_device> m_oki2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index c10543c9e3c..db066a0dd0d 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -22,7 +22,8 @@ public: m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), m_spriteram3(*this, "spriteram3"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ required_shared_ptr<UINT8> m_spriteram1; @@ -38,6 +39,7 @@ public: UINT32 screen_update_hanaroku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 789c3650d84..9677bc67258 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -51,7 +51,8 @@ public: m_cus_ram(*this, "cus_ram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_cus_ram; @@ -81,6 +82,7 @@ public: virtual void video_start(); UINT32 screen_update_yumefuda(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 4fa9a02b80e..79a32257c99 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -431,7 +431,8 @@ public: : driver_device(mconfig, type, tag), m_attr(*this, "attr"), m_vram(*this, "vram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -458,6 +459,7 @@ public: void encf(UINT8 ciphertext, int address, UINT8 &plaintext, int &newaddress); void decrypt(int key1, int key2); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index edae608a163..7ce58fe8f69 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -286,7 +286,8 @@ public: m_ay1(*this, "ay1"), m_ay2(*this, "ay2"), m_samples(*this, "samples"), - m_mkiv_vram(*this, "mkiv_vram") { } + m_mkiv_vram(*this, "mkiv_vram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<mc146818_device> m_rtc; @@ -295,6 +296,7 @@ public: required_device<samples_device> m_samples; required_shared_ptr<UINT8> m_mkiv_vram; + required_device<gfxdecode_device> m_gfxdecode; int m_rtc_address_strobe; int m_rtc_data_strobe; diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c index a4b5b5e8336..379b218c040 100644 --- a/src/mame/drivers/astrcorp.c +++ b/src/mame/drivers/astrcorp.c @@ -48,7 +48,8 @@ public: m_spriteram(*this, "spriteram"), m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -75,6 +76,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; /*************************************************************************** diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index e23c4cfbaa2..8a264d71822 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -424,12 +424,14 @@ public: m_maincpu(*this,"maincpu"), m_crtc(*this, "crtc"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(avt_6845_address_w); DECLARE_WRITE8_MEMBER(avt_6845_data_w); diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 219a3a1aac3..4bba2ecff10 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -36,7 +36,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_bgram; required_shared_ptr<UINT16> m_fgram; @@ -60,6 +61,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 3e0631efdba..8e58ea0c035 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -102,7 +102,8 @@ public: m_spriteram5(*this, "spriteram5"), m_spriteram6(*this, "spriteram6"), m_spriteram7(*this, "spriteram7"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_tilemapram; required_shared_ptr<UINT16> m_spriteram0; @@ -153,6 +154,7 @@ public: void draw_strip(bitmap_ind16 &bitmap, const rectangle &cliprect, int page, int column); void draw_page(bitmap_ind16 &bitmap, const rectangle &cliprect, int page); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; #define GET_INFO( ram ) \ diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index f5756d70c16..54619ec124c 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -299,7 +299,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -316,6 +317,7 @@ public: virtual void palette_init(); UINT32 screen_update_megadpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index 3c76086d30f..a72db91a5d3 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -49,7 +49,8 @@ public: bmcpokr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } DECLARE_READ16_MEMBER( bmcpokr_unk_r ) @@ -59,6 +60,7 @@ public: required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; virtual void video_start(); UINT32 screen_update_bmcpokr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index edd0be71046..cff1dd2af31 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -112,7 +112,8 @@ public: m_ms32_bg0_scroll(*this, "bg0_scroll"), m_ms32_tx1_scroll(*this, "tx1_scroll"), m_ms32_bg1_scroll(*this, "bg1_scroll") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_ms32_tx_tilemap[2]; tilemap_t *m_ms32_bg_tilemap[2]; @@ -166,6 +167,7 @@ public: void irq_raise(int level); IRQ_CALLBACK_MEMBER(irq_callback); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 5bfbcff69a0..f190627e970 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -33,7 +33,8 @@ public: : driver_device(mconfig, type, tag), m_tile_ram(*this, "tile_ram"), m_sprite_ram(*this, "sprite_ram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_tile_ram; @@ -45,6 +46,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(boxer_input_r); DECLARE_READ8_MEMBER(boxer_misc_r); DECLARE_WRITE8_MEMBER(boxer_bell_w); diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index 47a692164aa..fd632c18d8a 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -18,7 +18,8 @@ public: buster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vram; DECLARE_READ8_MEMBER(test_r); @@ -26,6 +27,7 @@ public: virtual void palette_init(); UINT32 screen_update_buster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 8566aad520a..3caf3eebb51 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -35,7 +35,8 @@ public: m_fg_color_ram(*this, "fg_color_ram"), m_bg_scroll(*this, "bg_scroll"), m_bg_tile_ram(*this, "bg_tile_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; @@ -59,6 +60,7 @@ public: UINT32 screen_update_cabaret(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cabaret_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 641d1bfd4d7..cfbd8850679 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -90,7 +90,8 @@ public: : driver_device(mconfig, type, tag), m_fg_ram(*this, "fg_ram"), m_sprites(*this, "sprites"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_fg_ram; @@ -115,6 +116,7 @@ public: virtual void video_start(); UINT32 screen_update_calorie(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index d065770ef60..315112c197d 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -30,7 +30,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_video; required_shared_ptr<UINT8> m_videoram; @@ -44,6 +45,7 @@ public: virtual void palette_init(); UINT32 screen_update_cardline(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 51ff2944b0a..f1ca6cc894c 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -58,13 +58,15 @@ public: carrera_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tileram(*this, "tileram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_tileram; DECLARE_READ8_MEMBER(unknown_r); virtual void palette_init(); UINT32 screen_update_carrera(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index 69778ac7d73..d9784e18472 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -78,7 +78,8 @@ public: : driver_device(mconfig, type, tag), m_sc0_vram(*this, "sc0_vram"), m_sc0_attr(*this, "sc0_attr"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_sc0_vram; required_shared_ptr<UINT8> m_sc0_attr; @@ -95,6 +96,7 @@ public: virtual void palette_init(); UINT32 screen_update_vvillage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index 1d50f22fcf1..50abb87d283 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -53,7 +53,8 @@ public: : driver_device(mconfig, type, tag), m_vram_fg(*this, "vrafg"), m_vram_bg(*this, "vrabg"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_vram_fg; required_shared_ptr<UINT16> m_vram_bg; @@ -75,6 +76,7 @@ public: UINT32 screen_update_cb2001(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 08a7c61ccad..a7febea9076 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -19,7 +19,8 @@ public: cball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -30,6 +31,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(cball_vram_w); DECLARE_READ8_MEMBER(cball_wram_r); DECLARE_WRITE8_MEMBER(cball_wram_w); diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index ba037107ab6..7899f67ca2a 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -63,7 +63,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -80,6 +81,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(chanbara_videoram_w); DECLARE_WRITE8_MEMBER(chanbara_colorram_w); DECLARE_WRITE8_MEMBER(chanbara_videoram2_w); diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index 425ffc29a71..83d54363974 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -31,7 +31,8 @@ public: : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), m_bgram(*this, "bgram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } DECLARE_WRITE8_MEMBER(chance32_fgram_w) { @@ -63,6 +64,7 @@ public: virtual void video_start(); UINT32 screen_update_chance32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 42ef25ea64a..95d30b2663a 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -54,7 +54,8 @@ public: : driver_device(mconfig, type, tag), m_video(*this, "video"), m_maincpu(*this, "maincpu"), - m_adpcm(*this, "adpcm") { } + m_adpcm(*this, "adpcm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_video; @@ -81,6 +82,7 @@ public: DECLARE_WRITE_LINE_MEMBER(chin_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_adpcm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c index 0162423dd4d..0d742af5441 100644 --- a/src/mame/drivers/chsuper.c +++ b/src/mame/drivers/chsuper.c @@ -26,7 +26,8 @@ class chsuper_state : public driver_device public: chsuper_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } DECLARE_WRITE8_MEMBER(chsuper_vram_w); DECLARE_READ8_MEMBER(ff_r); @@ -35,6 +36,7 @@ public: UINT8 *m_vram; required_device<z180_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 478d42d0e97..d91bd6ca01a 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -56,11 +56,13 @@ public: cmmb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_mask; diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 07f49a76059..cf8bdc50f2a 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -40,7 +40,8 @@ public: m_videoram2(*this, "videoram2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "subcpu"){ } + m_subcpu(*this, "subcpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -69,6 +70,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(zerotrgt_vregs_w); DECLARE_WRITE8_MEMBER(cntsteer_vregs_w); DECLARE_WRITE8_MEMBER(cntsteer_foreground_vram_w); diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 6cfb88c42d8..6bec5b4b2e5 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -38,7 +38,8 @@ public: m_attr_ram1(*this, "attr_ram1"), m_attr_ram2(*this, "attr_ram2"), m_attr_ram3(*this, "attr_ram3"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_attr_ram1; @@ -58,6 +59,7 @@ public: virtual void video_start(); UINT32 screen_update_coinmstr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index 8b5711b4632..0f1846502bd 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -225,7 +225,8 @@ public: coinmvga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_vram; struct { int r,g,b,offs,offs_internal; } m_bgpal, m_fgpal; @@ -240,6 +241,7 @@ public: UINT32 screen_update_coinmvga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 6b1a4d5a822..182ac3b8ad3 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -319,7 +319,8 @@ public: m_io_an5(*this, "AN5"), m_io_an6(*this, "AN6"), m_io_an7(*this, "AN7"), - m_io_config(*this, "CONFIG") + m_io_config(*this, "CONFIG"), + m_gfxdecode(*this, "gfxdecode") { } @@ -362,6 +363,7 @@ public: required_ioport m_io_an6; required_ioport m_io_an7; required_ioport m_io_config; + required_device<gfxdecode_device> m_gfxdecode; bitmap_ind16 m_temp_bitmap_sprites; bitmap_ind16 m_temp_bitmap_sprites2; diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index b089699d1e1..6e425c7a81a 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2587,7 +2587,8 @@ static MACHINE_CONFIG_START( cps3, cps3_state ) MCFG_NVRAM_ADD_0FILL("eeprom") MCFG_PALETTE_LENGTH(0x10000) // actually 0x20000 ... - + MCFG_GFXDECODE_ADD("gfxdecode", empty) + /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 19b6769f6db..4e9f35d1592 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -99,7 +99,8 @@ public: m_seibu_sound(*this, "seibu_sound"), m_txram(*this, "txram"), m_mainram(*this, "mainram"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -107,6 +108,7 @@ public: required_shared_ptr<UINT8> m_txram; optional_shared_ptr<UINT8> m_mainram; optional_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_txtilemap; int m_coin_stat; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 1ed4c296645..0e77be8025c 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -26,7 +26,8 @@ public: m_bg1_regs_y(*this, "bg1_regs_y"), m_bg2_regs_x(*this, "bg2_regs_x"), m_bg2_regs_y(*this, "bg2_regs_y"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_paletteram[0x4000]; /* memory pointers */ @@ -60,6 +61,7 @@ public: UINT32 screen_update_cultures(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cultures_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index f8c2e07d1ab..a6bcd433a70 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -190,7 +190,8 @@ public: m_tilemap2scroll(*this, "tilemap2_scroll"), m_roadram(*this, "roadram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tilemap0_tilemap; tilemap_t *m_tilemap1_tilemap; @@ -226,6 +227,7 @@ public: UINT32 screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; /* tile format diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 032eb3e6dee..10a86b54d84 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -88,7 +88,8 @@ public: m_cram(*this, "cram"), m_obj1_ram(*this, "obj1_ram"), m_obj2_ram(*this, "obj2_ram"), - m_obj3_ram(*this, "obj3_ram") + m_obj3_ram(*this, "obj3_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -98,6 +99,7 @@ public: required_shared_ptr<UINT8> m_obj1_ram; required_shared_ptr<UINT8> m_obj2_ram; required_shared_ptr<UINT8> m_obj3_ram; + required_device<gfxdecode_device> m_gfxdecode; struct { diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index ee508dce7a4..f411f192d6b 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -34,7 +34,8 @@ public: m_lo_vram(*this, "lo_vram"), m_hi_vram(*this, "hi_vram"), m_cram(*this, "cram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_lo_vram; required_shared_ptr<UINT8> m_hi_vram; @@ -50,6 +51,7 @@ public: virtual void video_start(); UINT32 screen_update_d9final(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 78ba3e57b96..25b92f05f76 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -47,7 +47,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), - m_msm(*this, "msm"){ } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -58,6 +59,7 @@ public: required_shared_ptr<UINT8> m_spriteram; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/drivers/dblcrown.c b/src/mame/drivers/dblcrown.c index 980744f50e1..fe0a428f028 100644 --- a/src/mame/drivers/dblcrown.c +++ b/src/mame/drivers/dblcrown.c @@ -52,11 +52,13 @@ class dblcrown_state : public driver_device public: dblcrown_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } // devices required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; // screen updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 0acc08d7cc9..4bf801b6339 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -66,7 +66,8 @@ public: m_videoram(*this, "videoram"), m_bgram(*this, "bgram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -111,6 +112,7 @@ public: INTERRUPT_GEN_MEMBER(ddayjlc_interrupt); INTERRUPT_GEN_MEMBER(ddayjlc_snd_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 204b2aa7f43..cfd0f9689d5 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -130,7 +130,8 @@ public: m_back_vram(*this, "back_vram"), m_work_ram(*this, "work_ram"), m_mcu_shared_ram(*this, "mcu_shared_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_vregs; @@ -165,6 +166,7 @@ public: INTERRUPT_GEN_MEMBER(ddealer_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(ddealer_mcu_sim); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; void ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UINT16* bottom, bitmap_ind16 &bitmap, const rectangle &cliprect, int flipy); }; diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 541254b9ec4..afd01ba70c1 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -125,7 +125,8 @@ public: m_vram0(*this, "vram0"), m_attr0(*this, "attr0"), m_vram1(*this, "vram1"), - m_attr1(*this, "attr1") + m_attr1(*this, "attr1"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -135,6 +136,7 @@ public: required_shared_ptr<UINT8> m_attr0; required_shared_ptr<UINT8> m_vram1; required_shared_ptr<UINT8> m_attr1; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_laserdisc_data; int m_nmimask; diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 2493849d7a6..801cde32832 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -30,7 +30,8 @@ public: m_alpha_num_ram(*this, "alpha_nuram"), m_major_obj_ram(*this, "major_obj_ram"), m_minor_obj_ram(*this, "minor_obj_ram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_alpha_num_ram; @@ -50,6 +51,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(destroyr_misc_w); DECLARE_WRITE8_MEMBER(destroyr_cursor_load_w); DECLARE_WRITE8_MEMBER(destroyr_interrupt_ack_w); diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 0a201264051..b088f742e5d 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -53,7 +53,8 @@ public: : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ UINT8 m_ram_bank; @@ -95,6 +96,7 @@ public: DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 057ef6b0f9a..b51ee05ca1c 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -61,7 +61,8 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -77,6 +78,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 07d6b4b2d43..77112ded61d 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -57,7 +57,8 @@ public: m_22vp932(*this, "ld_22vp932") , m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_beeper(*this, "beeper") { } + m_beeper(*this, "beeper"), + m_gfxdecode(*this, "gfxdecode") { } void laserdisc_data_w(UINT8 data) { @@ -124,6 +125,7 @@ public: DECLARE_READ16_MEMBER(serial_receive); required_device<cpu_device> m_maincpu; optional_device<beep_device> m_beeper; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 7e58088b3e5..a177056c51a 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -68,7 +68,8 @@ public: m_dderby_vidchars(*this, "vidchars"), m_dderby_vidattribs(*this, "vidattribs"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_scroll_ram; required_shared_ptr<UINT8> m_sprite_ram; @@ -89,6 +90,7 @@ public: INTERRUPT_GEN_MEMBER(dderby_timer_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 9cf3a99e523..f979927dc08 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -72,7 +72,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_bgram(*this, "bgram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -89,6 +90,7 @@ public: UINT32 screen_update_dominob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; void dominob_state::video_start() diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 87da95781a7..9817120930e 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -132,7 +132,8 @@ public: m_bg2_videoram(*this, "bg2_videoram"), m_vregs(*this, "vregs"), m_workram(*this, "workram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -168,6 +169,7 @@ public: void screen_eof_dreamwld(screen_device &screen, bool state); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index ea5f5c911ce..b7fc0fd3f09 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -20,7 +20,8 @@ public: m_videoram_bg(*this, "videorabg"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram_fg; @@ -46,6 +47,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 6947d1c5cce..0b35eb159b7 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -36,7 +36,8 @@ class drw80pkr_state : public driver_device public: drw80pkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; UINT8 m_t0; @@ -73,6 +74,7 @@ public: virtual void palette_init(); UINT32 screen_update_drw80pkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 561493b37fb..27b2e0b73a4 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -63,7 +63,8 @@ class dunhuang_state : public driver_device public: dunhuang_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ tilemap_t *m_tmap; @@ -125,6 +126,7 @@ public: virtual void video_start(); UINT32 screen_update_dunhuang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index ca17e71bf55..26ad5af22ed 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -305,7 +305,8 @@ class dwarfd_state : public driver_device public: dwarfd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this,"maincpu") + m_maincpu(*this,"maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ @@ -333,6 +334,8 @@ public: UINT8 m_videobuf[0x8000]; required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(i8275_preg_w); DECLARE_READ8_MEMBER(i8275_preg_r); DECLARE_WRITE8_MEMBER(i8275_creg_w); diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 2dcae48700f..7f1c6efceef 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -44,7 +44,8 @@ public: dynadice_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -68,6 +69,7 @@ public: virtual void palette_init(); UINT32 screen_update_dynadice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 80a39759cf8..fbb22c082b1 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -53,7 +53,8 @@ public: m_audiocpu(*this, "audiocpu"), m_atram(*this, "atram"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ tilemap_t *m_bg_tilemap; @@ -86,6 +87,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 7965f502be0..af9d1bf37bc 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -41,7 +41,8 @@ public: m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), m_tile_control_ram(*this, "tile_ctrl_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -58,6 +59,7 @@ public: UINT32 screen_update_esh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_esh); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 62e66c7a506..12d4ca71804 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -38,7 +38,8 @@ public: : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_palreg; int m_gfx_bank; @@ -65,6 +66,7 @@ public: INTERRUPT_GEN_MEMBER(ettrivia_interrupt); inline void get_tile_info(tile_data &tileinfo, int tile_index, UINT8 *vidram, int gfx_code); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 48e934fd0a1..ed4fff539f3 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -73,7 +73,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 m_x; required_shared_ptr<UINT32> m_spriteram; @@ -86,6 +87,7 @@ public: INTERRUPT_GEN_MEMBER(feversoc_irq); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 9991a0bc247..8a8510b1df9 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -46,7 +46,8 @@ public: m_sprite_palette(*this, "sprite_palette"), m_tile_palette(*this, "tile_palette"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<phillips_22vp931_device> m_laserdisc; required_shared_ptr<unsigned char> m_tileram; @@ -106,6 +107,7 @@ public: void firq_gen(phillips_22vp931_device &laserdisc, int state); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c index 809bd73f92c..cf9ad949fee 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -96,7 +96,8 @@ public: m_crtc(*this, "crtc"), m_fbram(*this, "fb_ram"), m_vram(*this, "vram"), - m_cram(*this, "cram") + m_cram(*this, "cram"), + m_gfxdecode(*this, "gfxdecode") { m_soundlatch = 0; m_bank = 0; @@ -110,6 +111,8 @@ public: required_shared_ptr<UINT8> m_fbram; required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; + + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_soundlatch; UINT8 m_bank; diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 80db8d8c70d..d00a084fcb1 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -31,7 +31,8 @@ public: : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_rombase(*this, "rombase"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -51,6 +52,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(flyball_input_r); DECLARE_READ8_MEMBER(flyball_scanline_r); DECLARE_READ8_MEMBER(flyball_potsense_r); diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 9721fa61e52..ed27a13f3c3 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -334,7 +334,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_vram(*this, "vram"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_vram; @@ -348,6 +349,7 @@ public: virtual void palette_init(); UINT32 screen_update_fortecar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/fresh.c b/src/mame/drivers/fresh.c index 119c79b5ec1..4f1a8c87a58 100644 --- a/src/mame/drivers/fresh.c +++ b/src/mame/drivers/fresh.c @@ -37,7 +37,8 @@ public: m_attr_2_videoram(*this, "attr_videoram_2"), m_paletteram_1(*this, "paletteram_1"), m_paletteram_2(*this, "paletteram_2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; tilemap_t *m_bg_2_tilemap; @@ -100,6 +101,7 @@ public: virtual void video_start(); UINT32 screen_update_fresh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 06a255b5476..92c21ec0a9b 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -55,7 +55,8 @@ public: m_bg3_ram(*this, "bg3_ram"), m_bg4_ram(*this, "bg4_ram"), m_fg_ram(*this, "fg_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1_ram; @@ -98,6 +99,7 @@ public: UINT32 screen_update_galaxi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void show_out( ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 4b87378828f..bc4ec99201f 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -75,9 +75,11 @@ class gamecstl_state : public pcat_base_state public: gamecstl_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), - m_cga_ram(*this, "cga_ram") { } + m_cga_ram(*this, "cga_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_cga_ram; + required_device<gfxdecode_device> m_gfxdecode; UINT32 *m_bios_ram; UINT8 m_mxtc_config_reg[256]; UINT8 m_piix4_config_reg[4][256]; diff --git a/src/mame/drivers/gluck2.c b/src/mame/drivers/gluck2.c index ea8cd32b976..ff0478d811e 100644 --- a/src/mame/drivers/gluck2.c +++ b/src/mame/drivers/gluck2.c @@ -206,7 +206,8 @@ public: : driver_device(mconfig, type, tag) , m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode"){ } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -219,6 +220,7 @@ public: DECLARE_PALETTE_INIT(gluck2); UINT32 screen_update_gluck2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index a7b50e94874..ea216336d2f 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -42,7 +42,8 @@ public: m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), m_soundcpu(*this, "soundcpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -57,6 +58,7 @@ public: virtual void video_start(); UINT32 screen_update_go2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index c8e49946bdd..b64dac70135 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -1021,7 +1021,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -1076,6 +1077,7 @@ public: UINT32 screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; optional_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index b7834265e2e..98b0f8c0cd0 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -42,7 +42,8 @@ public: : driver_device(mconfig, type, tag), m_fg_tilemapram(*this, "fg_tilemapram"), m_bg_tilemapram(*this, "bg_tilemapram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_fg_tilemapram; @@ -60,6 +61,7 @@ public: virtual void video_start(); UINT32 screen_update_good(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 1ee078e743c..0a83e922c45 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -67,7 +67,8 @@ public: m_sc2_vram(*this, "sc2_vram"), m_sc3_vram(*this, "sc3_vram"), m_spriteram16(*this, "sprite_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -75,6 +76,7 @@ public: required_shared_ptr<UINT16> m_sc3_vram; required_shared_ptr<UINT16> m_spriteram16; required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_sc0_tilemap; tilemap_t *m_sc1_tilemap; tilemap_t *m_sc2_tilemap; diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index ac226a9bf28..b0036aad603 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -58,7 +58,8 @@ public: m_sprite_ram(*this, "sprite_ram"), m_palette_ram(*this, "palette_ram"), m_tile_ram(*this, "tile_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_nmi_enable; UINT8 m_start_lamp; @@ -83,6 +84,7 @@ public: inline void draw_pixel(bitmap_rgb32 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip); void gpworld_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index a9caea4e793..b1bc207a60f 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -135,7 +135,8 @@ public: m_oki_2(*this, "oki2") , m_workram(*this, "workram"), m_vram(*this, "vram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<e132xt_device> m_maincpu; @@ -146,6 +147,8 @@ public: required_shared_ptr<UINT32> m_workram; required_shared_ptr<UINT32> m_vram; required_shared_ptr<UINT32> m_paletteram; + + required_device<gfxdecode_device> m_gfxdecode; // UINT32 * m_nvram; // currently this uses generic nvram handling /* video-related */ diff --git a/src/mame/drivers/headonb.c b/src/mame/drivers/headonb.c index 2fffb25437d..3032a70ca1c 100644 --- a/src/mame/drivers/headonb.c +++ b/src/mame/drivers/headonb.c @@ -38,7 +38,8 @@ public: headonb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_video_ram; @@ -51,6 +52,7 @@ public: UINT32 screen_update_headonb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_headonb_tile_info); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 4635023337d..99b60be8487 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -57,7 +57,8 @@ public: hitpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sys_regs(*this, "sys_regs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_sys_regs; @@ -86,6 +87,7 @@ public: UINT32 screen_update_hitpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(hitpoker_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 9dbb2fe43f8..b24703a353d 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -82,7 +82,8 @@ public: m_slavecpu(*this, "slave"), m_mermaid(*this, "mermaid"), m_soundcpu(*this, "soundcpu"), - m_pandora(*this, "pandora") + m_pandora(*this, "pandora"), + m_gfxdecode(*this, "gfxdecode") { } /* Video */ @@ -107,6 +108,8 @@ public: required_device<cpu_device> m_mermaid; required_device<cpu_device> m_soundcpu; required_device<kaneko_pandora_device> m_pandora; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(trigger_nmi_on_slave_cpu); DECLARE_WRITE8_MEMBER(master_bankswitch_w); DECLARE_WRITE8_MEMBER(mermaid_data_w); diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 66dcd968359..5cdd058581b 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -43,7 +43,8 @@ public: m_bg_scroll2(*this, "bg_scroll2"), m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_bg_scroll; required_shared_ptr<UINT8> m_gp98_reel1_ram; @@ -93,6 +94,7 @@ public: UINT32 screen_update_jingbell(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jingbell_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 2c6ffc72b90..bc2e80615d6 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -63,7 +63,8 @@ public: m_bg_videoram(*this, "bg_videoram", 0), m_oki(*this, "oki"), m_igs025(*this,"igs025"), - m_igs022(*this,"igs022") + m_igs022(*this,"igs022"), + m_gfxdecode(*this, "gfxdecode") { } int m_input_addr; @@ -74,8 +75,8 @@ public: required_device<okim6295_device> m_oki; optional_device<igs025_device> m_igs025; // Mj Shuang Long Qiang Zhu 2 optional_device<igs022_device> m_igs022; // Mj Shuang Long Qiang Zhu 2 - - void igs025_to_igs022_callback( void ); + required_device<gfxdecode_device> m_gfxdecode; + void igs025_to_igs022_callback( void ); int m_toggle; int m_debug_addr; diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index b5fd3b200b4..b4a644e634b 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -37,7 +37,8 @@ public: m_igs_palette32(*this, "igs_palette32"), m_igs_tx_videoram(*this, "igs_tx_videoram"), m_igs_bg_videoram(*this, "igs_bg_videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_igs_mainram; required_shared_ptr<UINT32> m_igs_cg_videoram; @@ -72,6 +73,7 @@ public: void sdwx_gfx_decrypt(); void pgm_create_dummy_internal_arm_region(); required_device<cpu_device> m_maincpu; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 9cdb29494f6..28341b31518 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -79,12 +79,14 @@ public: m_maincpu(*this, "maincpu"), m_bg_tile_ram(*this, "bg_tile_ram"), m_fg_tile_ram(*this, "fg_tile_ram"), - m_fg_color_ram(*this, "fg_color_ram"){ } + m_fg_color_ram(*this, "fg_color_ram"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_bg_tile_ram; required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; + required_device<gfxdecode_device> m_gfxdecode; int m_nmi_enable; int m_bg_enable; int m_hopper; diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index b5ac5318ca3..6c51b199e9d 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -22,12 +22,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"subcpu"), - m_vram(*this, "vram") + m_vram(*this, "vram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_shared_ptr<UINT8> m_vram; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_DRIVER_INIT(intrscti); virtual void video_start(); diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index e4ecda82a05..b4aa34354c3 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -35,7 +35,8 @@ public: m_tile_control_ram(*this, "tile_ctrl_ram"), m_sprite_ram(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -59,6 +60,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_callback_istellar); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 0e520f25a1b..bf9d6c60bd1 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -60,7 +60,8 @@ public: m_reel2_ram(*this, "reel2_ram"), m_reel3_ram(*this, "reel3_ram"), m_fg_tile_ram(*this, "fg_tile_ram"), - m_fg_color_ram(*this, "fg_color_ram"){ } + m_fg_color_ram(*this, "fg_color_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_bg_scroll2; @@ -70,6 +71,7 @@ public: required_shared_ptr<UINT8> m_reel3_ram; required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; + required_device<gfxdecode_device> m_gfxdecode; int m_exp_bank; tilemap_t *m_fg_tilemap; tilemap_t *m_reel1_tilemap; diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 9e0f73b18d3..8df34358a8f 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -31,7 +31,8 @@ public: m_vram(*this, "vram"), m_io(*this, "io"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_vram; UINT8 m_map_vreg; @@ -45,6 +46,7 @@ public: INTERRUPT_GEN_MEMBER(jackpool_interrupt); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index ec1659c2aa7..5cb42ec9425 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -127,7 +127,8 @@ public: m_sc3_vram(*this, "sc3_vram"), m_jm_shared_ram(*this, "jshared_ram"), m_jm_mcu_code(*this, "jmcu_code"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_sc0_tilemap_0; tilemap_t *m_sc0_tilemap_1; @@ -221,6 +222,7 @@ public: void urashima_mcu_run(); void second_mcu_run(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index 1b391532463..94c7031d37b 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -104,7 +104,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -120,6 +121,7 @@ public: virtual void palette_init(); UINT32 screen_update_jokrwild(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index c347a42cdf5..754b3326023 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -112,7 +112,8 @@ public: m_spriteram(*this, "spriteram"), m_bitmap(*this, "bitmap"), m_bulletram(*this, "bulletram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -145,6 +146,7 @@ public: INTERRUPT_GEN_MEMBER(jollyjgr_interrupt); void draw_bitmap( bitmap_ind16 &bitmap ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index 6336beba021..0131913b843 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -141,7 +141,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 mux_sel; @@ -159,6 +160,7 @@ public: UINT32 screen_update_jubileep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jubileep_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 0660e9659af..9c31adadb07 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -84,7 +84,8 @@ public: m_vram(*this, "vram"), m_attr(*this, "attr"), m_spriteram(*this, "spriteram"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_sound_cmd; required_shared_ptr<UINT8> m_vram; @@ -116,6 +117,7 @@ public: UINT32 screen_update_kingdrby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 7ab2ac050ec..1230ae19e68 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -43,13 +43,15 @@ public: m_main_ram(*this, "main_ram"), m_bmc_1_videoram(*this, "bmc_1_videoram"), m_bmc_2_videoram(*this, "bmc_2_videoram"), - m_colorram(*this, "colorram", 16) { } + m_colorram(*this, "colorram", 16), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_main_ram; required_shared_ptr<UINT16> m_bmc_1_videoram; required_shared_ptr<UINT16> m_bmc_2_videoram; required_shared_ptr<UINT8> m_colorram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_tilemap_1; tilemap_t *m_tilemap_2; int m_clr_offset; diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index c8ab24a4dec..ae75303886e 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -51,7 +51,8 @@ public: koikoi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -76,6 +77,7 @@ public: virtual void palette_init(); UINT32 screen_update_koikoi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/lbeach.c b/src/mame/drivers/lbeach.c index 977fe69ac87..8abfef63ef2 100644 --- a/src/mame/drivers/lbeach.c +++ b/src/mame/drivers/lbeach.c @@ -42,7 +42,8 @@ public: m_sprite_x(*this, "sprite_x"), m_sprite_code(*this, "sprite_code"), m_collision_bg_car(0), - m_collision_fg_car(0) + m_collision_fg_car(0), + m_gfxdecode(*this, "gfxdecode") { } /* devices / memory pointers */ @@ -55,6 +56,7 @@ public: int m_collision_bg_car; int m_collision_fg_car; + required_device<gfxdecode_device> m_gfxdecode; bitmap_ind16 m_colmap_car; tilemap_t* m_bg_tilemap; tilemap_t* m_fg_tilemap; diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 3fa3d598d57..4879896f949 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -77,7 +77,8 @@ public: m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), m_tile_control_ram(*this, "tile_ctrl_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -91,6 +92,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_callback_lgp); TIMER_CALLBACK_MEMBER(irq_stop); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 938b4e12d94..2cac7db301a 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -42,7 +42,8 @@ public: m_spriteram2(*this, "spriteram2"), m_videoreg(*this, "videoreg"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_fg_videoram; @@ -94,6 +95,7 @@ public: void copy_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &sprites_bitmap, bitmap_ind8 &priority_bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; /***************************************************************************************************** diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 8bc57b81a2e..957dbe392d5 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -105,7 +105,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -154,6 +155,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 346de4d5b69..84db2f4950e 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -25,7 +25,8 @@ public: : driver_device(mconfig, type, tag), m_tile_num_ram(*this, "tile_nuram"), m_tile_atr_ram(*this, "tile_atr_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_tile_num_ram; required_shared_ptr<UINT8> m_tile_atr_ram; @@ -37,6 +38,7 @@ public: virtual void video_start(); UINT32 screen_update_ltcasino(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 7cf264fe0f4..7a5da863735 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -103,7 +103,8 @@ public: m_luck_vram1(*this, "luck_vram1"), m_luck_vram2(*this, "luck_vram2"), m_luck_vram3(*this, "luck_vram3"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_nmi_enable; tilemap_t *m_reel1_tilemap; @@ -154,6 +155,7 @@ public: UINT32 screen_update_luckgrln(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(luckgrln_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 535f920607d..d82a1b73d55 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -63,7 +63,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_color_ram(*this, "color_ram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ tilemap_t *m_m14_tilemap; @@ -75,6 +76,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(m14_vram_w); DECLARE_WRITE8_MEMBER(m14_cram_w); DECLARE_READ8_MEMBER(m14_rng_r); diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index ab3a198cd01..7caabbd4c86 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -135,7 +135,8 @@ public: m_samples(*this, "samples"), m_maincpu(*this, "maincpu"), m_ay1(*this, "ay1"), - m_ay2(*this, "ay2") + m_ay2(*this, "ay2"), + m_gfxdecode(*this, "gfxdecode") { } @@ -195,6 +196,7 @@ public: required_device<cpu_device> m_maincpu; required_device<ay8910_device> m_ay1; optional_device<ay8910_device> m_ay2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index a5df73122aa..0ef55236961 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -95,7 +95,8 @@ public: m_layer1_videoram(*this, "layer1_videoram"), m_layer2_videoram(*this, "layer2_videoram"), m_vregs(*this, "vregs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_layer0_tilemap; tilemap_t *m_layer1_tilemap; @@ -125,6 +126,7 @@ public: virtual void video_start(); UINT32 screen_update_magic10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 107ed3a8bf0..21ce0e29081 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -450,7 +450,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -469,6 +470,7 @@ public: UINT32 screen_update_magicfly(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index c9ab87d1274..978f51608ba 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -463,7 +463,8 @@ public: majorpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), oki(*this, "oki") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_mux_data; int m_palette_bank; @@ -496,6 +497,7 @@ public: virtual void video_start(); UINT32 screen_update_majorpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 9779a7afc0c..1333090a945 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -103,7 +103,8 @@ public: marinedt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tx_tileram(*this, "tx_tileram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_tx_tileram; @@ -155,6 +156,7 @@ public: virtual void palette_init(); UINT32 screen_update_marinedt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 26790fe2479..c24c2725e42 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -450,7 +450,8 @@ public: m_tileram(*this, "tileram"), m_colram(*this, "colram"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_workram; @@ -485,6 +486,7 @@ public: DECLARE_WRITE_LINE_MEMBER(mastboy_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 03eb4f130da..ac64f09fff1 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -22,7 +22,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_i8255(*this, "i8255"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -48,6 +49,7 @@ public: UINT32 screen_update_mayumi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mayumi_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 38e28ce6856..3d8ca77e448 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -90,13 +90,15 @@ public: m_main_ram(*this, "main_ram"), m_cga_ram(*this, "cga_ram"), m_bios_ram(*this, "bios_ram"), - m_vram(*this, "vram") { } + m_vram(*this, "vram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<ide_controller_32_device> m_ide; required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT32> m_cga_ram; required_shared_ptr<UINT32> m_bios_ram; required_shared_ptr<UINT32> m_vram; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_pal[768]; diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 005bb7660b3..42aecff94a3 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -18,7 +18,8 @@ public: mgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_video_ram; @@ -34,6 +35,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(mgolf_vram_w); DECLARE_READ8_MEMBER(mgolf_wram_r); DECLARE_READ8_MEMBER(mgolf_dial_r); diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 67b716790a0..34bfd0b68d8 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -64,7 +64,8 @@ public: : driver_device(mconfig, type, tag), m_gfxregs(*this, "gfxregs"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 *m_gfxram; required_shared_ptr<UINT16> m_gfxregs; @@ -85,6 +86,7 @@ public: DECLARE_WRITE_LINE_MEMBER(livequiz_irqhandler); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 8f405ce6cb7..e5492d25884 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -118,7 +118,8 @@ public: m_sc1_vram(*this, "sc1_vram"), m_sc2_vram(*this, "sc2_vram"), m_sc3_vram(*this, "sc3_vram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -143,6 +144,7 @@ public: virtual void video_start(); UINT32 screen_update_mil4000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index e98f836b848..4b4b3aeeabe 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -159,7 +159,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -171,6 +172,7 @@ public: virtual void palette_init(); UINT32 screen_update_miniboy7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index 5e77184d58a..85da151b037 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -114,7 +114,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -140,6 +141,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index e5690eca487..a0cbae8aa95 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -14,7 +14,8 @@ public: m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), m_gfxram(*this, "gfxram"), - m_tileram(*this, "tileram") + m_tileram(*this, "tileram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -22,6 +23,7 @@ public: required_device<dac_device> m_dac2; required_shared_ptr<UINT8> m_gfxram; required_shared_ptr<UINT8> m_tileram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_tilemap; DECLARE_WRITE8_MEMBER(mogura_tileram_w); diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index adaefefb077..ed2a4ed823b 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -58,7 +58,8 @@ class mole_state : public driver_device public: mole_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ tilemap_t *m_bg_tilemap; @@ -77,6 +78,7 @@ public: virtual void palette_init(); UINT32 screen_update_mole(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c index 88826f6a5c6..50f09162e23 100644 --- a/src/mame/drivers/monzagp.c +++ b/src/mame/drivers/monzagp.c @@ -36,7 +36,8 @@ class monzagp_state : public driver_device public: monzagp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_coordx; int m_coordy; @@ -54,6 +55,7 @@ public: virtual void palette_init(); UINT32 screen_update_monzagp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index 9257a3cf6fb..4f020564952 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -182,7 +182,8 @@ public: mpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video(*this, "video"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_output[8]; required_shared_ptr<UINT8> m_video; @@ -202,6 +203,7 @@ public: virtual void palette_init(); UINT32 screen_update_mpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c index 3809bf7285e..5155a23ea26 100644 --- a/src/mame/drivers/mpu12wbk.c +++ b/src/mame/drivers/mpu12wbk.c @@ -220,7 +220,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -233,6 +234,7 @@ public: virtual void palette_init(); UINT32 screen_update_mpu12wbk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mpu4dealem.c b/src/mame/drivers/mpu4dealem.c index 85a3d6da06e..b0b75f2f556 100644 --- a/src/mame/drivers/mpu4dealem.c +++ b/src/mame/drivers/mpu4dealem.c @@ -22,7 +22,8 @@ class mpu4dealem_state : public mpu4_state public: mpu4dealem_state(const machine_config &mconfig, device_type type, const char *tag) : mpu4_state(mconfig, type, tag), - m_dealem_videoram(*this, "dealem_videoram") + m_dealem_videoram(*this, "dealem_videoram"), + m_gfxdecode(*this, "gfxdecode") { } @@ -31,6 +32,7 @@ public: DECLARE_PALETTE_INIT(dealem); UINT32 screen_update_dealem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(dealem_vsync_changed); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c index 89dd0d7717e..52eb05546c4 100644 --- a/src/mame/drivers/mpu4vid.c +++ b/src/mame/drivers/mpu4vid.c @@ -227,7 +227,8 @@ public: m_acia_1(*this, "acia6850_1"), m_ptm(*this, "6840ptm_68k"), m_trackx_port(*this, "TRACKX"), - m_tracky_port(*this, "TRACKY") + m_tracky_port(*this, "TRACKY"), + m_gfxdecode(*this, "gfxdecode") { } @@ -240,6 +241,7 @@ public: required_device<ptm6840_device> m_ptm; optional_ioport m_trackx_port; optional_ioport m_tracky_port; + required_device<gfxdecode_device> m_gfxdecode; struct ef9369_t m_pal; struct bt471_t m_bt471; diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index b66cec048ac..41dc1dc73b3 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -186,7 +186,8 @@ public: multfish_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_m48t35(*this, "m48t35" ) + m_m48t35(*this, "m48t35" ), + m_gfxdecode(*this, "gfxdecode") { } @@ -254,6 +255,7 @@ public: UINT32 screen_update_multfish(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<timekeeper_device> m_m48t35; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(multfish_state::get_multfish_tile_info) diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index fc51d826081..a14c56b1bdf 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -117,7 +117,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; DECLARE_WRITE8_MEMBER(outport_w); @@ -125,6 +126,7 @@ public: UINT32 screen_update_murogem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index 4641bcf0a2e..2e2b3f46deb 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -46,13 +46,15 @@ public: murogmbl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video(*this, "video"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_video; virtual void video_start(); virtual void palette_init(); UINT32 screen_update_murogmbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 11eb84f517b..7df1b9874fc 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -62,7 +62,8 @@ public: m_spriteram(*this, "spriteram"), m_mwarr_ram(*this, "mwarr_ram"), m_maincpu(*this, "maincpu"), - m_oki2(*this, "oki2") { } + m_oki2(*this, "oki2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -105,6 +106,7 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 78bd9cd956a..02b562bb1d6 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -954,6 +954,7 @@ static MACHINE_CONFIG_START( namcona1, namcona1_state ) MCFG_SCREEN_UPDATE_DRIVER(namcona1_state, screen_update_namcona1) MCFG_PALETTE_LENGTH(0x2000) + MCFG_GFXDECODE_ADD("gfxdecode", empty) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index c4b9d1850ad..1a7e0f7cb4a 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1641,6 +1641,7 @@ static MACHINE_CONFIG_START( winrun, namcos21_state ) MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update_namcos21) MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS) + MCFG_GFXDECODE_ADD("gfxdecode", empty) MCFG_VIDEO_START_OVERRIDE(namcos21_state,namcos21) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index e8c2735ea68..cf816cba283 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1356,7 +1356,8 @@ public: m_textram(*this, "textram"), m_czattr(*this, "czattr"), m_gmen_sh2(*this, "gmen_sh2"), - m_gmen_sh2_shared(*this, "gmen_sh2_shared") + m_gmen_sh2_shared(*this, "gmen_sh2_shared"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -1371,6 +1372,7 @@ public: optional_shared_ptr<UINT32> m_czattr; optional_device<cpu_device> m_gmen_sh2; optional_shared_ptr<UINT32> m_gmen_sh2_shared; + required_device<gfxdecode_device> m_gfxdecode; c404_t m_c404; c361_t m_c361; diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 54a40247d04..b2d7d8d25ed 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -37,13 +37,15 @@ public: m_npvidregs(*this, "npvidregs"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_upd4990a(*this, "upd4990a") { } + m_upd4990a(*this, "upd4990a"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_npvidram; required_shared_ptr<UINT16> m_npvidregs; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<upd4990a_old_device> m_upd4990a; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_audio_result; UINT8 m_bank_val; diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 5020b9f89a9..4f3dba0eb19 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -239,7 +239,8 @@ public: m_sprgen(*this, "spritegen"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_oki(*this, "oki") + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -265,6 +266,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(fg_videoram_w); DECLARE_WRITE16_MEMBER(bg_videoram_w); DECLARE_WRITE16_MEMBER(nmg5_soundlatch_w); diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index b96da5f73d7..d0f9e086c92 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -71,7 +71,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -87,6 +88,7 @@ public: UINT32 screen_update_nsmpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(nsmpoker_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index daee27c6c6c..b501a02693d 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -64,7 +64,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -91,6 +92,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(olibochu_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 88644d21370..9ca528c9eac 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -55,7 +55,8 @@ public: m_paletteram2(*this, "paletteram2"), m_fgram(*this, "fgram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -68,6 +69,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(onetwo_fgram_w); DECLARE_WRITE8_MEMBER(onetwo_cpubank_w); DECLARE_WRITE8_MEMBER(onetwo_coin_counters_w); diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index c3f6092648f..6f05b441c89 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -74,7 +74,8 @@ public: m_textram(*this, "textram"), m_spritebank(*this, "spritebank"), m_maincpu(*this, "maincpu"), - m_t5182(*this, "t5182") { } + m_t5182(*this, "t5182"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_spriteram; @@ -83,6 +84,7 @@ public: required_device<cpu_device> m_maincpu; required_device<t5182_device> m_t5182; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bgtilemap; tilemap_t *m_infotilemap_2; diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index fedff3b46ec..2ce5a44b61c 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -199,7 +199,8 @@ public: m_sf000_ram(*this, "sf000_ram"), m_io_port(*this, "io_port"), m_maincpu(*this, "maincpu"), - m_i2cmem(*this, "i2cmem") + m_i2cmem(*this, "i2cmem"), + m_gfxdecode(*this, "gfxdecode") { } @@ -282,6 +283,7 @@ public: void peplus_init(); required_device<cpu_device> m_maincpu; required_device<i2cmem_device> m_i2cmem; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/pinball2k.c b/src/mame/drivers/pinball2k.c index 1de2c879c45..dcc5733343b 100644 --- a/src/mame/drivers/pinball2k.c +++ b/src/mame/drivers/pinball2k.c @@ -33,12 +33,14 @@ public: m_main_ram(*this, "main_ram"), m_cga_ram(*this, "cga_ram"), m_bios_ram(*this, "bios_ram"), - m_vram(*this, "vram") { } + m_vram(*this, "vram"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT32> m_cga_ram; required_shared_ptr<UINT32> m_bios_ram; required_shared_ptr<UINT32> m_vram; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_pal[768]; diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index db47633daa7..7b23922f6fc 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -55,7 +55,8 @@ public: m_janshi_paletteram(*this, "paletteram"), m_janshi_paletteram2(*this, "paletteram2"), m_janshi_crtc_regs(*this, "crtc_regs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_janshi_back_vram; required_shared_ptr<UINT8> m_janshi_vram1; @@ -85,6 +86,7 @@ public: virtual void video_start(); UINT32 screen_update_pinkiri8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 691cae6837a..1da07e0b234 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -79,7 +79,8 @@ public: : driver_device(mconfig, type, tag), m_vram1(*this, "vram1"), m_vram2(*this, "vram2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tilemap1; tilemap_t *m_tilemap2; @@ -105,6 +106,7 @@ public: UINT32 screen_update_pipeline(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(protection_deferred_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index dde0e03adaf..b93e3c8c2e9 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -25,7 +25,8 @@ public: m_pkscramble_fgtilemap_ram(*this, "fgtilemap_ram"), m_pkscramble_mdtilemap_ram(*this, "mdtilemap_ram"), m_pkscramble_bgtilemap_ram(*this, "bgtilemap_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 m_out; UINT8 m_interrupt_line_active; @@ -49,6 +50,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index 8f03906e634..4847521765e 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -22,7 +22,8 @@ public: : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_pal(*this, "pal"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_pal; @@ -36,6 +37,7 @@ public: virtual void palette_init(); UINT32 screen_update_poker72(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c index 7be220d7bd3..8c57efe2de8 100644 --- a/src/mame/drivers/popobear.c +++ b/src/mame/drivers/popobear.c @@ -89,7 +89,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_spr(*this, "spr"), - m_vregs(*this, "vregs") + m_vregs(*this, "vregs"), + m_gfxdecode(*this, "gfxdecode") { tilemap_base[0] = 0xf0000; @@ -106,6 +107,7 @@ public: required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_spr; required_shared_ptr<UINT16> m_vregs; + optional_device<gfxdecode_device> m_gfxdecode; UINT16* m_vram; UINT16* m_vram_rearranged; @@ -653,6 +655,8 @@ static MACHINE_CONFIG_START( popobear, popobear_state ) MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GFXDECODE_ADD("gfxdecode", empty) + MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz/16) // XTAL CORRECT, DIVISOR GUESSED MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 21a368e7a56..50d379f787e 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -144,7 +144,8 @@ public: m_bgram(*this, "bgram"), m_fgram(*this, "fgram"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; @@ -160,6 +161,7 @@ public: UINT32 screen_update_ppmast93(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index ed15dba3afa..71a20605cbe 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -66,7 +66,8 @@ public: : driver_device(mconfig, type, tag), m_fbram(*this, "fbram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_videoram; UINT8 m_char_pen; @@ -92,6 +93,7 @@ public: UINT32 screen_update_progolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 8ab76ff7f2f..b7d5f8a479c 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -86,7 +86,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_fgmap; @@ -122,6 +123,7 @@ public: INTERRUPT_GEN_MEMBER(pturn_sub_intgen); INTERRUPT_GEN_MEMBER(pturn_main_intgen); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index f036569a819..1b956fee089 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -34,7 +34,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_video_regs; @@ -68,6 +69,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 3c538bcba62..1d2d6232999 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -96,7 +96,8 @@ public: m_fg_ram(*this, "fg_ram"), m_bg_ram(*this, "bg_ram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } struct prot_t m_prot; required_shared_ptr<UINT8> m_fg_ram; @@ -117,6 +118,7 @@ public: UINT32 screen_update_quizpun2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/quizshow.c b/src/mame/drivers/quizshow.c index af5643fa36a..8855d8b72f5 100644 --- a/src/mame/drivers/quizshow.c +++ b/src/mame/drivers/quizshow.c @@ -41,12 +41,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_main_ram(*this, "main_ram") + m_main_ram(*this, "main_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; required_shared_ptr<UINT8> m_main_ram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_tilemap; UINT32 m_clocks; diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 8fb3f9d92fe..7be751b2747 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -33,7 +33,8 @@ public: m_tx_vram(*this, "tx_vram"), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_bg_vram; @@ -44,6 +45,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<seibu_sound_device> m_seibu_sound; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE16_MEMBER(rdx_bg_vram_w); DECLARE_WRITE16_MEMBER(rdx_md_vram_w); diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 24d8cc6fd25..2d90b926748 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -106,7 +106,8 @@ public: m_blitterregs(*this, "blitterregs"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_viewregs0; required_shared_ptr<UINT32> m_viewregs6; @@ -153,6 +154,7 @@ public: void rabbit_do_blit(); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 9f4d9d4de5e..3f551422f07 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -66,7 +66,8 @@ public: m_gms_vidram(*this, "gms_vidram"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_gms_vidram2; required_shared_ptr<UINT16> m_gms_vidram; @@ -86,6 +87,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index 14370640506..9e0928b44a6 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -26,7 +26,8 @@ public: : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_cram(*this, "cram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; @@ -35,6 +36,7 @@ public: virtual void video_start(); UINT32 screen_update_royalgum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 060910ccd01..2554d6e3dbf 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -42,7 +42,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } int m_gfxbank; required_shared_ptr<UINT8> m_colorram; @@ -64,6 +65,7 @@ public: UINT32 screen_update_rmhaihai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index acf63beaa05..821e1d96060 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -59,13 +59,15 @@ public: m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), m_ram(*this, "ram"), - m_bg_scroll(*this, "bg_scroll") + m_bg_scroll(*this, "bg_scroll"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_shared_ptr<UINT8> m_ram; required_shared_ptr<UINT8> m_bg_scroll; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_ram_1; UINT8 *m_ram_2; diff --git a/src/mame/drivers/sanremo.c b/src/mame/drivers/sanremo.c index 24a1255ad63..856fcc45582 100644 --- a/src/mame/drivers/sanremo.c +++ b/src/mame/drivers/sanremo.c @@ -109,7 +109,8 @@ public: sanremo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; @@ -124,6 +125,7 @@ public: virtual void palette_init(); UINT32 screen_update_sanremo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index e3b6e2242cd..302efdc013d 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -50,11 +50,13 @@ public: sbowling_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } int m_bgmap; required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; int m_sbw_system; tilemap_t *m_sb_tilemap; diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 73c69009fee..fcc4212bedb 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -44,7 +44,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; emu_timer *m_scanline_timer; @@ -74,6 +75,7 @@ public: void update_nmi_state(); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index bbe37cd931c..1a3a174f3ff 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -53,7 +53,8 @@ public: m_digit5(*this, "tm_unity"), m_s2636(*this, "s2636"), m_waveenable(false), - m_collision(0) + m_collision(0), + m_gfxdecode(*this, "gfxdecode") { } @@ -94,6 +95,7 @@ public: UINT32 screen_update_seabattl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); bool m_waveenable; UINT8 m_collision; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index f31f7c07b2d..acfd4122dde 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -34,7 +34,8 @@ public: m_out_ram(*this, "out_ram"), m_color_ram(*this, "color_ram"), m_fix_ram(*this, "fix_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_nmi_enable; @@ -63,6 +64,7 @@ public: void astron_draw_characters(bitmap_rgb32 &bitmap,const rectangle &cliprect); void astron_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /* VIDEO GOODS */ diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 759d765d8b2..7a172fba155 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -71,7 +71,8 @@ public: m_sc2_vram(*this, "sc2_vram"), m_sc3_vram(*this, "sc3_vram"), m_spriteram16(*this, "sprite_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -79,6 +80,7 @@ public: required_shared_ptr<UINT16> m_sc3_vram; required_shared_ptr<UINT16> m_spriteram16; required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_sc0_tilemap; tilemap_t *m_sc1_tilemap; tilemap_t *m_sc2_tilemap; diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index e60171671d9..b0c6a1b388c 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -290,7 +290,8 @@ public: m_2c01_regs(*this, "2c01_regs"), m_3000_regs(*this, "3000_regs"), m_3800_regs(*this, "3800_regs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } bitmap_ind16 *m_temp_reel_bitmap; tilemap_t *m_tilemap; @@ -456,6 +457,7 @@ public: virtual void video_start(); UINT32 screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index ea6a54a0bec..3c5fe9185d7 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -104,12 +104,14 @@ public: m_maincpu(*this,"maincpu"), m_spriteram(*this, "spriteram"), m_nvram(*this, "nvram"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_nvram; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_reg; UINT8 m_rombank; diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c index fbfaf99601c..615937be952 100644 --- a/src/mame/drivers/silvmil.c +++ b/src/mame/drivers/silvmil.c @@ -32,7 +32,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram"), m_sprgen(*this, "spritegen"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -114,6 +115,7 @@ public: UINT32 screen_update_silvmil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index a6185d9d91c..9ed0bf48a78 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -38,7 +38,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -57,6 +58,7 @@ public: UINT32 screen_update_skyarmy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(skyarmy_nmi_source); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; WRITE8_MEMBER(skyarmy_state::skyarmy_flip_screen_x_w) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 251947f9fc1..c09abb4e9da 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -58,7 +58,8 @@ public: m_reelscroll2(*this, "reelscroll2"), m_reelscroll3(*this, "reelscroll3"), m_reelscroll4(*this, "reelscroll4"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tmap; required_shared_ptr<UINT8> m_videoram; @@ -112,6 +113,7 @@ public: UINT32 screen_update_skylncr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(skylncr_vblank_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index b48060a93e4..f7269a38bba 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -30,7 +30,8 @@ public: m_bg_tile_ram(*this, "bg_tile_ram"), m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_bg_tile_ram; tilemap_t *m_bg_tilemap; @@ -62,6 +63,7 @@ public: UINT32 screen_update_spoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(spoker_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; WRITE8_MEMBER(spoker_state::bg_tile_w) diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 3b100c52624..8b58f56e5db 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -106,7 +106,8 @@ public: m_cram(*this, "cram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_main; required_shared_ptr<UINT8> m_vram; @@ -126,6 +127,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(spool99_state::get_spool99_tile_info) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 0a039c258d8..9991caacb40 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -79,7 +79,8 @@ public: m_chrram(*this, "chrram"), m_dmaram(*this, "dmaram"), m_video_regs(*this, "video_regs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT16* m_tileram; required_shared_ptr<UINT16> m_sprram; @@ -110,6 +111,7 @@ public: void update_palette(); UINT32 process(UINT8 b,UINT32 dst_offset); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; #define VERBOSE 0 @@ -677,6 +679,7 @@ static MACHINE_CONFIG_START( srmp6, srmp6_state ) MCFG_PALETTE_LENGTH(0x800) + MCFG_GFXDECODE_ADD("gfxdecode", empty) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c index 2a95143b43d..37e0a1b9420 100644 --- a/src/mame/drivers/sshot.c +++ b/src/mame/drivers/sshot.c @@ -172,7 +172,8 @@ public: supershot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_tilemap; @@ -184,6 +185,7 @@ public: virtual void palette_init(); UINT32 screen_update_supershot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index e3d65de4ae5..9a9d3d04314 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -86,7 +86,8 @@ public: m_maincpu(*this, "maincpu"), m_tms(*this, "tms"), m_videoram(*this, "videoram"), - m_question_offset(*this, "question_offset") + m_question_offset(*this, "question_offset"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -94,6 +95,7 @@ public: required_shared_ptr<UINT8> m_videoram; tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_question_offset; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_question_offset_low; UINT8 m_question_offset_mid; UINT8 m_question_offset_high; diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c index 651a5722f6c..2e04f3f9844 100644 --- a/src/mame/drivers/stuntair.c +++ b/src/mame/drivers/stuntair.c @@ -91,7 +91,8 @@ public: m_fgram(*this, "fgram"), m_bgram(*this, "bgram"), m_bgattrram(*this, "bgattrram"), - m_sprram(*this, "sprram") + m_sprram(*this, "sprram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -100,6 +101,7 @@ public: required_shared_ptr<UINT8> m_bgram; required_shared_ptr<UINT8> m_bgattrram; required_shared_ptr<UINT8> m_sprram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index e338d86f2ff..c53db20669f 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -125,7 +125,8 @@ public: m_spriteram2(*this, "spriteram2"), m_scrolly(*this, "scrolly"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu") { } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vid; @@ -141,6 +142,7 @@ public: INTERRUPT_GEN_MEMBER(subm_sound_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; }; void sub_state::video_start() diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 6905873e4db..3f52db08df2 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -248,7 +248,8 @@ public: m_reel2_ram(*this, "reel2_ram"), m_reel3_ram(*this, "reel3_ram"), m_stisub_out_c(*this, "stisub_out_c"), - m_maincpu(*this, "maincpu") { + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_colorram; @@ -324,6 +325,7 @@ public: UINT32 screen_update_stisub_reels(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void machine_start(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; void subsino_state::machine_start() diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index 2d4dc4a69f3..5c36c3a93c1 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -81,7 +81,8 @@ public: m_outputs16(*this, "outputs16"), m_outputs(*this, "outputs"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_hm86171_colorram; layer_t m_layers[2]; @@ -166,6 +167,7 @@ public: INTERRUPT_GEN_MEMBER(am188em_int0_irq); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; private: inline void ss9601_get_tile_info(layer_t *l, tile_data &tileinfo, tilemap_memory_index tile_index); diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c index b3431168ff2..5b8ad4e4bc7 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -26,7 +26,8 @@ public: : driver_device(mconfig, type, tag), m_attr(*this, "attr"), m_vram(*this, "vram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -35,6 +36,7 @@ public: virtual void palette_init(); UINT32 screen_update_summit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 8a159fa17cc..451a5926f3f 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -75,7 +75,8 @@ public: m_col_line(*this, "col_line"), m_videoram(*this, "videoram"), m_char_bank(*this, "char_bank"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_col_line; required_shared_ptr<UINT8> m_videoram; @@ -95,6 +96,7 @@ public: virtual void palette_init(); UINT32 screen_update_supdrapo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c index 7796e26e857..8cc9c178b63 100644 --- a/src/mame/drivers/supercrd.c +++ b/src/mame/drivers/supercrd.c @@ -176,7 +176,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -188,6 +189,7 @@ public: DECLARE_VIDEO_START(supercrd); UINT32 screen_update_supercrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index d102106e3c2..98b62f29db4 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -34,7 +34,8 @@ public: : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<pioneer_ldv1000_device> m_laserdisc; UINT8 m_ld_in_latch; @@ -55,6 +56,7 @@ public: UINT32 screen_update_superdq(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(superdq_vblank); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index 04e2bd3ae6a..55d237aa551 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -37,7 +37,8 @@ public: m_videoram_bg(*this, "videorabg"), m_videoram_fg(*this, "videorafg"), m_colorram_bg(*this, "colorrabg"), - m_colorram_fg(*this, "colorrafg") + m_colorram_fg(*this, "colorrafg"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -46,6 +47,7 @@ public: required_shared_ptr<UINT8> m_videoram_fg; required_shared_ptr<UINT8> m_colorram_bg; required_shared_ptr<UINT8> m_colorram_fg; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_tile_bank; UINT8 m_sound_byte; diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 287d2aa6509..b91fb5e781b 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -35,7 +35,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_videoram; @@ -77,6 +78,7 @@ public: DECLARE_WRITE_LINE_MEMBER(adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 675d9689154..15f74eefd27 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1271,6 +1271,8 @@ static MACHINE_CONFIG_START( taitojc, taitojc_state ) MCFG_TC0640FIO_ADD("tc0640fio", taitojc_io_intf) + MCFG_GFXDECODE_ADD("gfxdecode", empty) + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index d7af23b9da9..c09392eb781 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -29,7 +29,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -40,6 +41,7 @@ public: virtual void palette_init(); UINT32 screen_update_tattack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index 975e85a9354..1e64993f9c4 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -43,7 +43,8 @@ public: m_spriteregs(*this, "spriteregs"), m_spriteram(*this, "spriteram") , m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr_array<UINT32, 4> m_tilemap_regs; required_shared_ptr<UINT32> m_spriteregs; @@ -79,6 +80,7 @@ public: void tmmjprd_do_blit(); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/tmspoker.c b/src/mame/drivers/tmspoker.c index 663f16a49e6..26e7c719d74 100644 --- a/src/mame/drivers/tmspoker.c +++ b/src/mame/drivers/tmspoker.c @@ -220,7 +220,8 @@ public: tmspoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -236,6 +237,7 @@ public: UINT32 screen_update_tmspoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(tmspoker_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 59e12eac646..47002e1d6b0 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -97,7 +97,8 @@ public: : driver_device(mconfig, type, tag), m_gfxram(*this, "gfxram"), m_tileram(*this, "tileram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; required_shared_ptr<UINT8> m_gfxram; @@ -114,6 +115,7 @@ public: virtual void video_start(); UINT32 screen_update_trvmadns(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 78868e857c3..908df098a53 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -39,10 +39,13 @@ public: tugboat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_ram(*this, "ram") { } + m_ram(*this, "ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_ram; + required_device<gfxdecode_device> m_gfxdecode; + UINT8 m_hd46505_0_reg[18]; UINT8 m_hd46505_1_reg[18]; int m_reg0; diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index 6cf26389a45..e45cb8bf2f5 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -34,7 +34,8 @@ public: m_vram_2(*this, "vra2"), m_vram_3(*this, "vra3"), m_z80_wram(*this, "z80_wram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_vram_0; required_shared_ptr<UINT16> m_vram_1; @@ -72,6 +73,7 @@ public: virtual void video_start(); UINT32 screen_update_umipoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_0) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index ef9dbfc0775..28c75910925 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -82,7 +82,8 @@ public: m_qs1000(*this, "qs1000"), m_oki(*this, "oki"), m_oki2(*this, "oki_2"), - m_eeprom(*this, "eeprom") { + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { m_has_extra_gfx = 0; } @@ -96,6 +97,7 @@ public: optional_device<okim6295_device> m_oki; optional_device<okim6295_device> m_oki2; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; int m_flip_bit; int m_flipscreen; diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index a110fbed2ab..c1a46d09f72 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -104,12 +104,14 @@ public: m_maincpu(*this, "maincpu"), m_i8255(*this, "ppi8255"), m_ins8154(*this, "ins8154"), - m_ay8910(*this, "ay8910") {} + m_ay8910(*this, "ay8910"), + m_gfxdecode(*this, "gfxdecode") {} required_device<cpu_device> m_maincpu; required_device<i8255_device> m_i8255; required_device<ins8154_device> m_ins8154; required_device<ay8910_device> m_ay8910; + required_device<gfxdecode_device> m_gfxdecode; int m_p2_data; int m_ext_offset_w; diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index 462dc23b2ec..8cdc9bd53ac 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -303,7 +303,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_data_ram[0x100]; UINT8 m_video_ram[0x0400]; @@ -371,6 +372,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 81ad48dfe31..1a5aae848f9 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -119,7 +119,8 @@ class vpoker_state : public driver_device public: vpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_videoram; UINT8 m_blit_ram[8]; @@ -130,6 +131,7 @@ public: virtual void palette_init(); UINT32 screen_update_vpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 297255fceb7..8d7e444c6a4 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -49,7 +49,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_ball(*this, "ball"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -65,6 +66,7 @@ public: virtual void video_start(); UINT32 screen_update_vroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 83187e8ec73..c7c5f0d1f8b 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -59,7 +59,8 @@ public: wallc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -73,6 +74,7 @@ public: virtual void palette_init(); UINT32 screen_update_wallc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index 5932a895876..79395dc7b6e 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -93,7 +93,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_workram(*this, "workram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_text_tilemap; @@ -109,6 +110,7 @@ public: virtual void palette_init(); UINT32 screen_update_warpspeed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; WRITE8_MEMBER(warpspeed_state::warpspeed_hardware_w) diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index d1a7b1d0987..a5fe0084bb4 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -24,7 +24,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -48,6 +49,7 @@ public: INTERRUPT_GEN_MEMBER(wink_sound); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 5d8e9ca2bac..adc4c859709 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -236,7 +236,8 @@ public: m_gfx1_cram(*this, "gfx1_cram"), m_sprite_ram(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_gfx0a_tilemap; tilemap_t *m_gfx0b_tilemap; @@ -275,6 +276,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index e334edd7a1f..b461c2c47a6 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -14,7 +14,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_protopal(*this, "protopal"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -54,4 +55,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites_p( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 077d75fa9ce..6c7b59778ac 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -15,7 +15,8 @@ public: m_scrollx(*this, "scrollx"), m_scrolly(*this, "scrolly"), m_bgscrollx(*this, "bgscrollx"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices / memory pointers */ @@ -26,6 +27,7 @@ public: required_shared_ptr<UINT8> m_scrolly; required_shared_ptr<UINT8> m_bgscrollx; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index aef45fc2ce5..8b5ae9184fa 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_bmcu(*this, "bmcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -69,6 +70,7 @@ public: optional_device<cpu_device> m_mcu; optional_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(nmi_disable_w); diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index de6fc883bdf..652414c1665 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_ay(*this, "aysnd"), m_snd_latch_bit(4), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<ay8910_device> m_ay; @@ -47,4 +48,5 @@ public: virtual void palette_init(); UINT32 screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index d9a31488f89..8dbe81e0578 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -18,7 +18,8 @@ public: m_starx(*this, "starx"), m_stary(*this, "stary"), m_bgcolor(*this, "bgcolor"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -63,4 +64,5 @@ public: INTERRUPT_GEN_MEMBER(aeroboto_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index c07c7ccde72..cadf2ee6198 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -20,7 +20,8 @@ public: m_spr_old2(*this, "vsystem_spr_ol2"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1videoram; @@ -124,4 +125,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index ed35fa0184f..5b44df80e5f 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -20,7 +20,8 @@ public: m_master(*this, "master"), m_slave(*this, "slave"), m_audiocpu(*this, "audiocpu"), - m_pandora(*this, "pandora") + m_pandora(*this, "pandora"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -50,6 +51,8 @@ public: required_device<cpu_device> m_slave; required_device<cpu_device> m_audiocpu; required_device<kaneko_pandora_device> m_pandora; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(devram_r); DECLARE_WRITE8_MEMBER(master_nmi_trigger_w); DECLARE_WRITE8_MEMBER(master_bankswitch_w); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index a9144836c39..5035c80fa09 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -14,7 +14,8 @@ public: m_videoram(*this, "videoram"), m_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT16> m_shared_ram; @@ -118,6 +119,7 @@ public: void sstingry_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int c, int d ); DECLARE_WRITE_LINE_MEMBER(ym3812_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index 070b643a21d..9c48a467ce3 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -14,7 +14,8 @@ public: m_colorram(*this, "colorram"), m_scrollram(*this, "scrollram"), m_colorbank(*this, "colorbank"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -29,4 +30,5 @@ public: UINT32 screen_update_ambush(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_chars( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index 3bacb1bd46e..b7f980dbf38 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -4,7 +4,8 @@ public: ampoker2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -26,4 +27,5 @@ public: DECLARE_VIDEO_START(sigma2k); UINT32 screen_update_ampoker2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 3430181ca9f..0726c72bb52 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -16,7 +16,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_ym2151(*this, "ymsnd") { } + m_ym2151(*this, "ymsnd"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -36,6 +37,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<ym2151_device> m_ym2151; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(amspdwy_wheel_0_r); DECLARE_READ8_MEMBER(amspdwy_wheel_1_r); DECLARE_WRITE8_MEMBER(amspdwy_sound_w); diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 52d38b5a9f9..7afb91183cc 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_paletteram(*this, "paletteram"), m_subcpu(*this, "sub"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgtopvideoram; @@ -65,4 +66,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int enable_n); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 7a061d7be99..7641fa00b86 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -12,7 +12,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_bg_colorram(*this, "bg_colorram"), m_msm(*this, "msm"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -59,6 +60,7 @@ public: void robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, UINT8 *sprite ); DECLARE_WRITE_LINE_MEMBER(appoooh_adpcm_int); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 15bd865c2e6..3a70127d26d 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -13,7 +13,8 @@ public: m_scroll(*this, "scroll"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_mid_videoram; @@ -54,4 +55,5 @@ public: UINT8 aquarium_snd_bitswap( UINT8 scrambled_data ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index a6b31bb093b..ca8c627fe8e 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_butasan_bg1ram(*this, "butasan_bg1ram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_bg0_scrollx; optional_shared_ptr<UINT8> m_bg0_scrolly; @@ -101,4 +102,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 8664587ff3d..7e622979d9f 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -19,7 +19,8 @@ public: m_spriteram(*this,"spriteram"), m_protram(*this,"protram"), m_mcu(*this, "mcu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -89,4 +90,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void arkanoid_bootleg_init( ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 561a04a73ac..90df87bd7c0 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -10,7 +10,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), m_maincpu(*this, "maincpu"), - m_extra(*this, "extra") { } + m_extra(*this, "extra"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT8 * m_text_videoram; @@ -89,6 +90,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_extra; + required_device<gfxdecode_device> m_gfxdecode; }; class bigfghtr_state : public armedf_state diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 961be2450ef..4cd5194857a 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -20,7 +20,8 @@ public: m_tilemap_reg(*this, "tilemap_reg"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT16 * m_tileram_1; @@ -82,4 +83,5 @@ public: DECLARE_WRITE_LINE_MEMBER(ashnojoe_vclk_cb); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index e8e867e5647..43cb9f98ab0 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -26,7 +26,8 @@ public: m_spriteram(*this, "spriteram"), m_scroll_register(*this, "scroll_register"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode"){ } /* video-related */ required_shared_ptr<UINT8> m_alphap1_videoram; @@ -61,6 +62,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(atarifb_out1_w); DECLARE_WRITE8_MEMBER(atarifb4_out1_w); DECLARE_WRITE8_MEMBER(abaseb_out1_w); diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 1d38efb1076..9bb76b8df2f 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -36,4 +37,5 @@ public: TIMER_CALLBACK_MEMBER(interrupt_gen); void reset_bank(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index c460d20814d..8789eff40b6 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -8,7 +8,8 @@ public: m_colorram(*this, "colorram"), m_video_enable(*this, "video_enable"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_ls259_buf[8]; UINT8 m_p1_res; @@ -52,6 +53,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- timings -----------*/ diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index adedf1bbf40..57de829fee7 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -42,4 +43,5 @@ public: UINT32 screen_update_bankp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index a9889e95f11..768927cd209 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_textram(*this, "textram"), m_maincpu(*this, "maincpu"), - m_cus30(*this, "namco") { } + m_cus30(*this, "namco"), + m_gfxdecode(*this, "gfxdecode") { } int m_inputport_selected; int m_counter; @@ -18,6 +19,7 @@ public: required_shared_ptr<UINT8> m_textram; required_device<cpu_device> m_maincpu; required_device<namco_cus30_device> m_cus30; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_tx_tilemap; tilemap_t *m_bg_tilemap[2]; int m_xscroll[2]; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index bc43c5b1651..a09232d4ddc 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -12,7 +12,8 @@ public: m_tileram(*this, "tileram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_tileram; @@ -27,6 +28,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(battlane_cpu_command_w); DECLARE_WRITE8_MEMBER(battlane_palette_w); DECLARE_WRITE8_MEMBER(battlane_scrollx_w); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index c25f4d668be..1e83e6bed2c 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } int m_control_port_select; int m_msm5205next; @@ -49,4 +50,5 @@ public: DECLARE_WRITE_LINE_MEMBER(battlera_adpcm_int); required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index e4f1e9c2f92..29b684443ed 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_in0_b4; @@ -40,4 +41,5 @@ public: INTERRUPT_GEN_MEMBER(battlex_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 64d1fc35776..969141cf85a 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -15,7 +15,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007342(*this, "k007342"), m_k007420(*this, "k007420"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ // UINT8 * paletteram; // this currently uses generic palette handling @@ -38,6 +39,7 @@ public: UINT32 screen_update_battlnts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(battlnts_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/battlnts.c -----------*/ diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 616d6a702e3..38176d49df6 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -15,7 +15,8 @@ public: m_pf1_scroll_data(*this, "pf1_scroll_data"), m_pf2_scroll_data(*this, "pf2_scroll_data"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT16> m_eprom_data; required_device<buffered_spriteram16_device> m_spriteram; @@ -65,4 +66,5 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 47e0aa76cce..45710418383 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -11,7 +11,8 @@ public: m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -101,4 +102,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 52ad03ea750..2ccb3e30048 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -9,7 +9,8 @@ public: m_spriteram(*this, "spriteram"), m_vidreg1(*this, "vidreg1"), m_vidreg2(*this, "vidreg2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tilemap; tilemap_t *m_tilemap2; @@ -34,4 +35,5 @@ public: UINT32 screen_update_bigstrkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index ebc64e55f4c..61f69988300 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -16,7 +16,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), m_paletteram(*this, "paletteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram16_device> m_spriteram; @@ -55,4 +56,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(bionicc_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 3d2cec6a4ea..e658cb6dbb6 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -8,7 +8,8 @@ public: m_playfield_ram(*this, "playfield_ram"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_bmcu(*this, "bmcu") { } + m_bmcu(*this, "bmcu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -45,6 +46,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; optional_device<buggychl_mcu_device> m_bmcu; + required_device<gfxdecode_device> m_gfxdecode; #if 0 /* 68705 */ diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 0997e6705db..9ff95164d14 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -18,7 +18,8 @@ public: m_k007342(*this, "k007342"), m_k007420(*this, "k007420"), m_maincpu(*this, "maincpu"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -47,6 +48,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(bladestl_scanline); required_device<cpu_device> m_maincpu; required_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/bladestl.c -----------*/ diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 300befe29fd..404fc5778fc 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -15,7 +15,8 @@ public: m_txvideoram(*this, "txvideoram"), m_mcu(*this, "mcu"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -69,4 +70,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 584b845c362..46bb78ef3b7 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -15,7 +15,8 @@ public: m_scroll_0(*this, "scroll_0"), m_paletteram(*this, "paletteram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_1; @@ -53,4 +54,5 @@ public: UINT32 screen_update_blmbycar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index 81dadf6b652..0068908366e 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_device<discrete_device> m_discrete; @@ -34,6 +35,7 @@ public: DECLARE_WRITE8_MEMBER(blockade_sound_freq_w); required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 3e0fd9e411e..b0b093b6ec4 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -7,7 +7,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_txvideoram(*this, "txvideoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_bgvideoram; @@ -35,4 +36,5 @@ public: void bloodbro_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void weststry_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 4f1f46670b5..264b8302e79 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -14,7 +14,8 @@ public: m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* device/memory pointers */ required_device<cpu_device> m_audiocpu; @@ -46,4 +47,5 @@ public: UINT32 screen_update_blueprnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index ce73cc58242..0f6bad5aa9d 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -14,7 +14,8 @@ public: m_colorram(*this, "colorram"), m_colorram2(*this, "colorram2"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -49,4 +50,5 @@ public: UINT32 screen_update_bogeyman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 7b56abe70b6..a99b187f117 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,4 +46,5 @@ public: TIMER_CALLBACK_MEMBER(soundlatch_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index b9b1d390f20..ddf85d2cfb3 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_fg_videoram; @@ -31,6 +32,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(brkthru_1803_w); diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index ee9b9146b3c..65fa7651ecb 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -21,7 +21,8 @@ public: m_videoram(*this, "videoram"), m_motion(*this, "motion"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -65,6 +66,7 @@ public: DECLARE_WRITE8_MEMBER(bsktball_noise_reset_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/bsktball.c -----------*/ diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 8856bcacf80..ca99cd7f226 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -20,7 +20,8 @@ public: m_spriteram(*this, "spriteram"), m_audio_rambase(*this, "audio_rambase"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -57,6 +58,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(audio_nmi_enable_w); DECLARE_WRITE8_MEMBER(lnc_w); diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index d78012d3224..03c52f0d69b 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_audiocpu(*this, "audiocpu"), - m_slave(*this, "slave"){ } + m_slave(*this, "slave"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -66,6 +67,8 @@ public: optional_device<cpu_device> m_mcu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_slave; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(bublbobl_bankswitch_w); DECLARE_WRITE8_MEMBER(tokio_bankswitch_w); DECLARE_WRITE8_MEMBER(tokio_videoctrl_w); diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index b9a3e6212f3..27735026d94 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -19,7 +19,8 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_bmcu(*this, "bmcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_charram; @@ -49,6 +50,7 @@ public: required_device<cpu_device> m_mcu; required_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(bankswitch_w); DECLARE_WRITE8_MEMBER(sound_command_w); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 48de379b9b4..b1e93d07d5a 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -19,7 +19,8 @@ public: m_bwp3_rombase(*this, "bwp3_rombase"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bwp1_sharedram1; @@ -54,6 +55,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(bwp12_sharedram1_w); DECLARE_WRITE8_MEMBER(bwp3_u8F_w); DECLARE_WRITE8_MEMBER(bwp3_nmimask_w); diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index 2fc8de5755b..b2b088abd54 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -15,7 +15,8 @@ public: m_adpcm1(*this, "adpcm1"), m_adpcm2(*this, "adpcm2"), m_msm1(*this, "msm1"), - m_msm2(*this, "msm2") { } + m_msm2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_colorram; @@ -28,6 +29,7 @@ public: optional_device<seibu_adpcm_device> m_adpcm2; optional_device<msm5205_device> m_msm1; optional_device<msm5205_device> m_msm2; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_background_layer; tilemap_t *m_text_layer; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 12e960a4493..bc1a8eda7b0 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_tx_line; int m_s903_mux_data; @@ -44,4 +45,5 @@ public: virtual void palette_init(); UINT32 screen_update_calomega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 334d3752f35..e4817cd1b16 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -24,7 +24,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -48,6 +49,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_bombs( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 0dfe8405cd4..bd448ca7e1f 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -35,4 +36,5 @@ public: UINT32 screen_update_carjmbre(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 6255e5c6363..9faee2b0e9d 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -32,7 +32,8 @@ public: m_ttl7474_1c_1(*this, "7474_1c_1"), m_ttl7474_1c_2(*this, "7474_1c_2"), m_ttl7474_1a_1(*this, "7474_1a_1"), - m_ttl7474_1a_2(*this, "7474_1a_2") + m_ttl7474_1a_2(*this, "7474_1a_2"), + m_gfxdecode(*this, "gfxdecode") {} required_shared_ptr<UINT8> m_alpharam; @@ -61,6 +62,8 @@ public: required_device<ttl7474_device> m_ttl7474_1c_2; required_device<ttl7474_device> m_ttl7474_1a_1; required_device<ttl7474_device> m_ttl7474_1a_2; + required_device<gfxdecode_device> m_gfxdecode; + bitmap_ind16 *m_sprite_sprite_collision_bitmap1; bitmap_ind16 *m_sprite_sprite_collision_bitmap2; bitmap_ind16 *m_sprite_goal_collision_bitmap1; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index cc02b554563..38ded379b7c 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -42,7 +42,8 @@ public: m_int_timer(*this, "int_timer"), m_int_timer_left(*this, "int_timer_left"), m_int_timer_right(*this, "int_timer_right"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr_array<UINT16, 4> m_videoregs; @@ -235,6 +236,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; void update_irq_state(); void unpack_sprites(const char *region); void ddonpach_unpack_sprites(const char *region); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index f78c18dacbf..21cad3c5aaa 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -10,7 +10,8 @@ public: cbasebal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -52,4 +53,5 @@ public: UINT32 screen_update_cbasebal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index f5f70fdb547..8432bd6ad30 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -16,7 +16,8 @@ public: m_nvram_4b(*this, "nvram_4b"), m_nvram_4a(*this, "nvram_4a") , m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode"){ } /* devices */ required_device<m6502_device> m_maincpu; @@ -26,6 +27,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ const UINT8 *m_syncprom; const UINT8 *m_wpprom; diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index fe9584706f0..63335496c94 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -16,7 +16,8 @@ public: m_toprollr_bg_videoram(*this, "bg_videoram"), m_toprollr_bg_coloram(*this, "bg_coloram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_bigsprite_videoram; required_shared_ptr<UINT8> m_videoram; @@ -85,4 +86,5 @@ public: void cannonb_patch(); required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 652effb103f..b816be34cf8 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_bullsdrt_tiles_bankram(*this, "bullsdrt_bank"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_rambase; required_shared_ptr<UINT8> m_videoram; @@ -89,4 +90,5 @@ public: inline int read_trackball(int idx, int switch_port); required_device<cpu_device> m_maincpu; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 1d2b16d3a61..1aff9a505e6 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -12,7 +12,8 @@ public: m_tx_ram(*this, "tx_ram"), m_attr_ram(*this, "attr_ram"), m_spr_ram(*this, "spr_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_mcu_ram; @@ -59,4 +60,5 @@ public: void draw_bitmap( bitmap_ind16 &bitmap, const rectangle &cliprect ); void mcu_update_seed( UINT8 data ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 85774d1537d..dbf47b4ddec 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -21,7 +21,8 @@ public: m_mcu(*this, CPUTAG_MCU), m_dac(*this, "dac"), m_dac1(*this, "dac1"), - m_dac2(*this, "dac2"){ } + m_dac2(*this, "dac2"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_bg_videoram; @@ -76,4 +77,5 @@ public: optional_device<dac_device> m_dac; optional_device<dac_device> m_dac1; optional_device<dac_device> m_dac2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 8e3c353b943..c3eaddef1f3 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_port_80(*this, "port_80"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac"){ } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -28,6 +29,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(cheekyms_port_40_w); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 6b08fbe5d16..de1886f1dd1 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -23,6 +24,7 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; /* game id */ int m_game_id; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index bdd43d26cd8..023a32f807b 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -23,7 +23,8 @@ public: m_sn_2(*this, "sn2"), m_dac(*this, "dac"), m_discrete(*this, "fltdisc"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spritebank; @@ -65,4 +66,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 36a4ae1a80f..e9e0997182b 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -18,7 +18,8 @@ public: m_cpu5(*this, "cpu5"), m_soundcpu(*this, "soundcpu"), m_oki1(*this, "oki1"), - m_oki2(*this, "oki2"){ } + m_oki2(*this, "oki2"), + m_gfxdecode(*this, "gfxdecode"){ } required_shared_ptr<UINT16> m_vregs; optional_shared_ptr_array<UINT16,3> m_scrollram; @@ -112,4 +113,5 @@ public: optional_device<cpu_device> m_soundcpu; required_device<okim6295_device> m_oki1; required_device<okim6295_device> m_oki2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index e068577dab8..14225f76801 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -13,7 +13,8 @@ public: m_linecolor(*this, "linecolor"), m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -29,6 +30,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(citycon_in_r); DECLARE_READ8_MEMBER(citycon_irq_ack_r); DECLARE_WRITE8_MEMBER(citycon_videoram_w); diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 0a176133d69..164c110f9c7 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_slave(*this, "slave") { } + m_slave(*this, "slave"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -48,4 +49,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_slave; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index c9caf035af2..88b262c805a 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -15,7 +15,8 @@ public: m_maincpu(*this, "maincpu"), m_nvram(*this, "nvram") , m_spriteram(*this, "spriteram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_gfxdecode(*this, "gfxdecode"){ } /* devices */ required_device<m6502_device> m_maincpu; @@ -25,6 +26,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_paletteram; + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ const UINT8 *m_syncprom; const UINT8 *m_wpprom; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 35ca7275f4a..d070c80b8d8 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -7,7 +7,8 @@ public: m_vram_1(*this, "vram_1"), m_vregs(*this, "vregs"), m_vram_0(*this, "vram_0"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_vram_1; @@ -34,4 +35,5 @@ public: UINT32 screen_update_clshroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 8484047ad3c..436a1eba0e8 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -35,7 +35,8 @@ public: m_ram(*this, "ram"), m_sprgen(*this, "spritegen"), m_sprgen1(*this, "spritegen1"), - m_sprgen2(*this, "spritegen2") + m_sprgen2(*this, "spritegen2"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ @@ -59,7 +60,8 @@ public: optional_device<decospr_device> m_sprgen; optional_device<decospr_device> m_sprgen1; optional_device<decospr_device> m_sprgen2; - + required_device<gfxdecode_device> m_gfxdecode; + /* misc */ int m_scanline; int m_irq_mask; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index eb76d43d675..5be2e0f37d3 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -18,7 +18,8 @@ public: m_k007121_2(*this, "k007121_2"), m_maincpu(*this, "maincpu"), m_upd7759(*this, "upd"), - m_msm5205(*this, "msm5205") { } + m_msm5205(*this, "msm5205"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT8 * m_videoram; @@ -54,6 +55,8 @@ public: required_device<cpu_device> m_maincpu; optional_device<upd7759_device> m_upd7759; optional_device<msm5205_device> m_msm5205; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(combatsc_vreg_w); DECLARE_WRITE8_MEMBER(combatscb_sh_irqtrigger_w); DECLARE_READ8_MEMBER(combatscb_io_r); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 25582bdcc70..2203d701c6d 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -17,7 +17,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -52,4 +53,5 @@ public: INTERRUPT_GEN_MEMBER(commando_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 9a3597be702..dbbd887c074 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,4 +48,5 @@ public: void compgolf_expand_bg(); DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index bc7e83a01f0..1c359848fdf 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -22,7 +22,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007121_1(*this, "k007121_1"), m_k007121_2(*this, "k007121_2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT8 * m_buffered_spriteram; @@ -71,4 +72,5 @@ public: void set_pens( ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int bank ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 47d7d5970c4..7a526808d0f 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_fgvideoram(*this, "fgvideoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -32,6 +33,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(cop01_sound_command_w); DECLARE_READ8_MEMBER(cop01_sound_command_r); DECLARE_WRITE8_MEMBER(cop01_irq_ack_w); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 1c5b57a3c38..ffc045b21e4 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -19,7 +19,8 @@ public: m_cary(*this, "cary"), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_trucky; @@ -40,6 +41,7 @@ public: virtual void palette_init(); UINT32 screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 53e20b86782..0311c1b9a25 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -20,7 +20,8 @@ public: m_spriteram(*this, "spriteram"), m_samples(*this, "samples"), m_dac(*this, "dac"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -88,4 +89,5 @@ public: void devzone_draw_grid( bitmap_ind16 &bitmap, const rectangle &cliprect ); void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 8ce647a115a..4f90629eff7 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -82,7 +82,8 @@ public: m_oki(*this, "oki"), m_m48t35(*this,"m48t35"), m_msm_1(*this, "msm1"), - m_msm_2(*this, "msm2") { } + m_msm_2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ // cps1 @@ -175,6 +176,7 @@ public: optional_device<m48t35_device> m_m48t35; optional_device<msm5205_device> m_msm_1; // fcrash optional_device<msm5205_device> m_msm_2; // fcrash + required_device<gfxdecode_device> m_gfxdecode; DECLARE_READ16_MEMBER(cps1_hack_dsw_r); DECLARE_READ16_MEMBER(cps1_in1_r); DECLARE_READ16_MEMBER(cps1_in2_r); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 021b89c9953..b1c669daef8 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -20,7 +20,8 @@ public: m_tilemap50_regs_base(*this, "tmap50_regs"), m_fullscreenzoom(*this, "fullscreenzoom"), m_0xc0000000_ram(*this, "0xc0000000_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_spriteram; @@ -131,6 +132,7 @@ public: int scalex, int scaley, bitmap_ind8 *pri_buffer, UINT32 pri_mask); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 7015c7463fd..85b12b8a65f 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -21,7 +21,8 @@ public: m_pc3092_data(*this, "pc3092_data"), m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -30,6 +31,8 @@ public: required_device<cpu_device> m_maincpu; required_device<sn76477_device> m_sn; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; + UINT16 m_collision_address; UINT8 m_collision_address_clear; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 1bdc718584d..17e18cb3cec 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_sprgen(*this, "spritegen"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_fg_videoram; @@ -54,4 +55,5 @@ public: void tumblepb_gfx1_rearrange(); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index c94145f0fbe..59644ce30d0 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), m_spr(*this, "vsystem_spr"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram1; @@ -64,4 +65,5 @@ public: void crshrace_patch_code( UINT16 offset ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 729f5a82e87..b387fc26be4 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -34,7 +34,8 @@ public: m_tms5110(*this, "tms"), m_s2636_0(*this, "s2636_0"), m_s2636_1(*this, "s2636_1"), - m_s2636_2(*this, "s2636_2") + m_s2636_2(*this, "s2636_2"), + m_gfxdecode(*this, "gfxdecode") { } @@ -75,7 +76,8 @@ public: optional_device<s2636_device> m_s2636_0; optional_device<s2636_device> m_s2636_1; optional_device<s2636_device> m_s2636_2; - + required_device<gfxdecode_device> m_gfxdecode; + /* memory */ UINT8 m_color_ram[0x400]; UINT8 m_palette_ram[0x10]; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index faaa0a1d308..a8c1d2ae097 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -43,7 +43,8 @@ public: m_filter1_3l(*this, "filter1.3l"), m_filter1_3r(*this, "filter1.3r"), m_msm5205_l(*this, "msm5205.l"), - m_msm5205_r(*this, "msm5205.r") { } + m_msm5205_r(*this, "msm5205.r"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -89,6 +90,8 @@ public: required_device<filter_volume_device> m_filter1_3r; required_device<filter_volume_device> m_msm5205_l; required_device<filter_volume_device> m_msm5205_r; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE16_MEMBER(darius_watchdog_w); DECLARE_READ16_MEMBER(darius_ioc_r); diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 60e7823eda9..8d2798302a7 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -11,7 +11,8 @@ public: m_workram(*this, "workram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_t5182(*this, "t5182") { } + m_t5182(*this, "t5182"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spritebank; required_shared_ptr<UINT8> m_scroll; @@ -21,6 +22,7 @@ public: required_device<cpu_device> m_maincpu; required_device<t5182_device> m_t5182; + required_device<gfxdecode_device> m_gfxdecode; int m_hw; tilemap_t *m_bgtilemap; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 7a33ca78e55..0466372a94e 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -25,7 +25,8 @@ public: m_k053252(*this, "k053252"), m_k056832(*this, "k056832"), m_k053936_1(*this, "k053936_1"), - m_k053936_2(*this, "k053936_2") { } + m_k053936_2(*this, "k053936_2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1_videoram; @@ -51,6 +52,8 @@ public: required_device<k056832_device> m_k056832; required_device<k053936_device> m_k053936_1; required_device<k053936_device> m_k053936_2; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(dbzcontrol_r); DECLARE_WRITE16_MEMBER(dbzcontrol_w); DECLARE_WRITE16_MEMBER(dbz_sound_command_w); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index d24ece1ff9a..1b3f8c59e3a 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -8,7 +8,8 @@ public: m_mid_data(*this, "mid_data"), m_textram(*this, "textram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_back_data; required_shared_ptr<UINT16> m_fore_data; @@ -42,4 +43,5 @@ public: UINT32 screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 195c3a6d1f8..b2af96f99b1 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -14,7 +14,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_textvideoram; @@ -55,4 +56,5 @@ public: TIMER_CALLBACK_MEMBER(countdown_timer_callback); void start_countdown_timer(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index ba649354319..357638e51be 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -22,7 +22,8 @@ public: m_soundcpu(*this, "soundcpu"), m_subcpu(*this, "sub"), m_adpcm1(*this, "adpcm1"), - m_adpcm2(*this, "adpcm2") { } + m_adpcm2(*this, "adpcm2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT8> m_rambase; @@ -69,6 +70,7 @@ public: optional_device<cpu_device> m_subcpu; optional_device<msm5205_device> m_adpcm1; optional_device<msm5205_device> m_adpcm2; + required_device<gfxdecode_device> m_gfxdecode; int scanline_to_vcount(int scanline); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index b42c30e44fd..05c8b9ee40b 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { vblank_level = 6; @@ -53,6 +54,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE16_MEMBER(ddragon3_io_w); DECLARE_WRITE16_MEMBER(ddragon3_scroll_w); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 9dd5d3763c0..daf774c73da 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -23,7 +23,8 @@ public: m_vlm(*this, "vlm"), m_filter1(*this, "filter1"), m_filter2(*this, "filter2"), - m_filter3(*this, "filter3") { } + m_filter3(*this, "filter3"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -50,6 +51,7 @@ public: required_device<filter_rc_device> m_filter1; required_device<filter_rc_device> m_filter2; required_device<filter_rc_device> m_filter3; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(ddribble_bankswitch_w); DECLARE_READ8_MEMBER(ddribble_sharedram_r); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 8ddc1f4b4bf..819ca067be0 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -13,7 +13,8 @@ public: m_subcpu(*this, "sub"), m_seibu_sound(*this, "seibu_sound"), m_adpcm1(*this, "adpcm1"), - m_adpcm2(*this, "adpcm2") { } + m_adpcm2(*this, "adpcm2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -26,6 +27,8 @@ public: required_device<seibu_adpcm_device> m_adpcm1; required_device<seibu_adpcm_device> m_adpcm2; + required_device<gfxdecode_device> m_gfxdecode; + tilemap_t *m_pf3_layer; tilemap_t *m_pf2_layer; tilemap_t *m_pf1_layer; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index e057f700a77..dee701ead9d 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -25,7 +25,8 @@ public: m_spritegen_krn(*this, "spritegen_krn"), m_spritegen_mxc(*this, "spritegen_mxc"), m_videoram(*this, "videoram"), - m_bg_data(*this, "bg_data") { } + m_bg_data(*this, "bg_data"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -42,6 +43,8 @@ public: /* memory pointers */ required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_bg_data; + + required_device<gfxdecode_device> m_gfxdecode; UINT8 * m_pf1_data; UINT8 * m_row; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 5bce0264f7e..e784386b2b1 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -31,7 +31,8 @@ public: m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), m_deco_tilegen1(*this, "tilegen1"), - m_deco_tilegen2(*this, "tilegen2") + m_deco_tilegen2(*this, "tilegen2"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -88,6 +89,9 @@ public: required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; + + required_device<gfxdecode_device> m_gfxdecode; + UINT8 m_irq_source; DECLARE_WRITE_LINE_MEMBER(sound_irq_nslasher); DECLARE_READ32_MEMBER(deco32_irq_controller_r); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 4a213cab8b7..87d988b473e 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -14,7 +14,8 @@ public: m_mlc_vram(*this, "mlc_vram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_ymz(*this, "ymz") + m_ymz(*this, "ymz"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<deco146_device> m_deco146; @@ -67,6 +68,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<ymz280b_device> m_ymz; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index a4f9066e507..0d05559653e 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -28,7 +28,8 @@ public: m_colorram(*this, "colorram"), m_tileram(*this, "tileram"), m_objectram(*this, "objectram"), - m_paletteram(*this, "paletteram") + m_paletteram(*this, "paletteram"), + m_gfxdecode(*this, "gfxdecode") { m_type1_map = 0; } @@ -48,6 +49,7 @@ public: required_shared_ptr<UINT8> m_tileram; required_shared_ptr<UINT8> m_objectram; required_shared_ptr<UINT8> m_paletteram; + required_device<gfxdecode_device> m_gfxdecode; size_t m_bgvideoram_size; /* video-related */ diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 21d46c60a3a..173b3fbab2a 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -16,7 +16,8 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -71,4 +72,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; // system 16c does not have sound CPU required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index db85f7feafc..7128b0c5e36 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -19,7 +19,8 @@ public: m_cpu1(*this, "cpu1"), m_cpu2(*this, "cpu2"), m_beast(*this, "beast"), - m_pandora(*this, "pandora") + m_pandora(*this, "pandora"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -52,6 +53,8 @@ public: required_device<cpu_device> m_cpu2; required_device<cpu_device> m_beast; required_device<kaneko_pandora_device> m_pandora; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(beast_data_w); DECLARE_READ8_MEMBER(beast_data_r); DECLARE_READ8_MEMBER(beast_status_r); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 38edcedb72f..dbdd1b2fce0 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_k056832(*this, "k056832"), m_k055555(*this, "k055555"), - m_ata(*this, "ata") + m_ata(*this, "ata"), + m_gfxdecode(*this, "gfxdecode") { } @@ -69,6 +70,7 @@ public: required_device<k056832_device> m_k056832; required_device<k055555_device> m_k055555; required_device<ata_interface_device> m_ata; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/djmain.c -----------*/ diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 5e3a8e2aea9..d9396bfe8a0 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -103,7 +103,8 @@ public: m_vg2(0), m_vg3(0), m_cv3(0), - m_cv4(0) + m_cv4(0), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ @@ -179,6 +180,8 @@ public: double m_vc17; int m_pixelcnt; + required_device<gfxdecode_device> m_gfxdecode; + /* radarscp_scanline */ int m_counter; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 64a35f443af..696359dc244 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -19,7 +19,8 @@ public: m_msm(*this, "msm"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ @@ -33,6 +34,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_spriteram; + + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_do_tilemap; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 0ef6e32f913..8e890a19dda 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_sharedram(*this, "sharedram"), m_subcpu(*this, "sub") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -57,4 +58,5 @@ public: UINT32 screen_update_dogfgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index d792438b3b1..82487796556 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -10,7 +10,8 @@ public: m_txvideoram(*this, "txvideoram"), m_paletteram_flytiger(*this, "flytiger_palram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<buffered_spriteram8_device> m_spriteram; optional_device<buffered_spriteram16_device> m_spriteram16; @@ -99,4 +100,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index bd2b1060fb5..d3eeab90d3d 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -30,7 +30,8 @@ public: m_playfield_ram(*this, "playfield_ram"), m_position_ram(*this, "position_ram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -59,6 +60,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dragrace_frame_callback); void dragrace_update_misc_flags( address_space &space ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/dragrace.c -----------*/ diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index adab8235996..9b1182e8897 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -17,7 +17,8 @@ public: m_oki_1(*this, "oki1"), m_oki_2(*this, "oki2") , m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_vidregs; @@ -74,4 +75,5 @@ public: UINT8 drgnmst_asciitohex( UINT8 data ); required_device<cpu_device> m_maincpu; required_device<pic16c55_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index fb65cd7516b..cb5e35f8b7c 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -11,7 +11,8 @@ public: drmicro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_msm(*this, "msm"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT8 * m_videoram; @@ -40,4 +41,5 @@ public: INTERRUPT_GEN_MEMBER(drmicro_interrupt); DECLARE_WRITE_LINE_MEMBER(pcm_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index b2e992a2ab2..f2ab6cab62a 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -12,7 +12,8 @@ public: m_back_data(*this, "back_data"), m_fore_data(*this, "fore_data"), m_maincpu(*this, "maincpu"), - m_seibu_sound(*this, "seibu_sound") { } + m_seibu_sound(*this, "seibu_sound"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_scroll_ram; @@ -22,6 +23,7 @@ public: required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_seibu_sound; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_layer; tilemap_t *m_fg_layer; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 61454d32899..957e618940b 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -21,7 +21,8 @@ public: m_dac_2(*this, "dac2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -127,4 +128,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 8853aa85573..09aa316bad0 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -23,7 +23,8 @@ public: m_sprgen(*this, "spritegen"), m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { m_tilemap0_color = 0; m_tilemap1_color = 0; } @@ -71,4 +72,5 @@ public: static UINT16 hedpanic_pri_callback(UINT16 x); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 0453f37443b..41267a43b6a 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -17,7 +17,8 @@ public: m_spriteram_3(*this, "spriteram_3"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_attributeram; @@ -39,6 +40,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w); DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w); DECLARE_WRITE8_MEMBER(espial_sound_nmi_mask_w); diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index f72afc111e4..c108ef5daf3 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -17,7 +17,8 @@ public: m_nbg_yscroll(*this, "nbg_yscroll"), m_nbg_xscroll(*this, "nbg_xscroll"), m_bg_scroll(*this, "bg_scroll"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -53,4 +54,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(exedexes_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 89dc2b5c211..05b972d6b91 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -28,7 +28,8 @@ public: m_main_ram(*this, "main_ram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_main_ram; @@ -50,6 +51,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(exerion_protection_r); DECLARE_WRITE8_MEMBER(exerion_videoreg_w); DECLARE_WRITE8_MEMBER(exerion_video_latch_w); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 83fb9b47f23..4bf56b36324 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -45,7 +45,8 @@ public: m_characterram(*this, "characterram"), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; @@ -61,6 +62,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<dac_device> m_dac; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_last_dial; UINT8 m_collision_mask; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index b508b948d78..563eb9735de 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -15,7 +15,8 @@ public: m_main_ram(*this, "main_ram"), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram") { } + m_colorram(*this, "colorram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -26,6 +27,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; + + required_device<gfxdecode_device> m_gfxdecode; /* protection */ UINT8 m_prot_value; diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 64324068840..ef31b5bec6f 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -9,7 +9,8 @@ public: m_sharedram_ab(*this, "sharedram_ab"), m_objectram0(*this, "objectram0"), m_videoram0(*this, "videoram0"), - m_cpuc(*this, "cpuc"){ } + m_cpuc(*this, "cpuc"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_objectram1; required_shared_ptr<UINT8> m_videoram1; @@ -18,6 +19,7 @@ public: required_shared_ptr<UINT8> m_objectram0; required_shared_ptr<UINT8> m_videoram0; required_device<cpu_device> m_cpuc; + required_device<gfxdecode_device> m_gfxdecode; int m_cpua_bank; int m_cpub_bank; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index ea9f74802f1..4e1032d8079 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -24,7 +24,8 @@ public: m_spr(*this, "vsystem_spr"), m_audiocpu(*this, "audiocpu"), m_k053936(*this, "k053936"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_sharedram; @@ -98,4 +99,5 @@ public: void f1gpb_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 091e0abc3e7..e233790bc0c 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram", 0), m_spriteram2(*this, "spriteram2", 0), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ // UINT8 * m_spriteram; // currently directly used in a 16bit map... @@ -66,4 +67,5 @@ public: void borntofi_adpcm_int( msm5205_device *device, int voice ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 48416c19966..ce6a73b580e 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_attributesram(*this, "attributesram"), m_background_color(*this, "bgcolor"), - m_imago_fg_videoram(*this, "imago_fg_vram") { } + m_imago_fg_videoram(*this, "imago_fg_vram"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_imago_sprites[0x800*3]; UINT16 m_imago_sprites_address; @@ -27,6 +28,7 @@ public: required_shared_ptr<UINT8> m_attributesram; optional_shared_ptr<UINT8> m_background_color; optional_shared_ptr<UINT8> m_imago_fg_videoram; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_charbank; UINT8 m_colorbank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index dc7e4ab7911..75e271e94f0 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -20,7 +20,8 @@ public: m_spriteram(*this, "spriteram"), m_k007232_1(*this, "k007232_1"), m_k007232_2(*this, "k007232_2"), - m_k007121(*this, "k007121") { } + m_k007121(*this, "k007121"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -41,6 +42,7 @@ public: required_device<k007232_device> m_k007232_1; required_device<k007232_device> m_k007232_2; required_device<k007121_device> m_k007121; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(k007121_registers_w); DECLARE_WRITE8_MEMBER(fastlane_bankswitch_w); diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 0dace320d91..35de03222a9 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -29,7 +29,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -50,6 +51,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(fcombat_protection_r); DECLARE_READ8_MEMBER(fcombat_port01_r); DECLARE_WRITE8_MEMBER(e900_w); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index cff8c833d57..28a6d598570 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -12,7 +12,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_mb14241(*this, "mb14241") + m_mb14241(*this, "mb14241"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -34,6 +35,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<mb14241_device> m_mb14241; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(fgoal_analog_r); DECLARE_READ8_MEMBER(fgoal_nmi_reset_r); DECLARE_READ8_MEMBER(fgoal_irq_reset_r); diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index db5739bc03f..ce8bfc435be 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram_2(*this, "spriteram_2"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -58,4 +59,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(finalizr_scanline); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 15d81f8461f..6dd3bba1549 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_msm(*this, "msm"){ } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_bg1videoram; @@ -47,6 +48,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(firetrap_nmi_disable_w); DECLARE_WRITE8_MEMBER(firetrap_bankselect_w); DECLARE_READ8_MEMBER(firetrap_8751_bootleg_r); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index dcd3d0b1867..ff37d505f2a 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -45,7 +45,8 @@ public: m_blink(*this, "blink"), m_drone_x(*this, "drone_x"), m_drone_y(*this, "drone_y"), - m_drone_rot(*this, "drone_rot") + m_drone_rot(*this, "drone_rot"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -59,6 +60,7 @@ public: optional_shared_ptr<UINT8> m_drone_x; optional_shared_ptr<UINT8> m_drone_y; optional_shared_ptr<UINT8> m_drone_rot; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_in_service_mode; UINT32 m_dial[2]; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index b7ac54ceba0..b803c60d47d 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -14,7 +14,8 @@ public: m_fof_mid_tileram(*this, "fof_mid_tileram"), m_fof_txt_tileram(*this, "fof_txt_tileram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_fof_100000; @@ -66,4 +67,5 @@ public: INTERRUPT_GEN_MEMBER(snd_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 8c05323f4d7..9eea3ec95b4 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -15,7 +15,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007121(*this, "k007121"), m_k007232(*this, "k007232"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_k007121_ram; @@ -49,4 +50,5 @@ public: INTERRUPT_GEN_MEMBER(flkatck_interrupt); DECLARE_WRITE8_MEMBER(volume_callback0); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index 9fc57ace276..3c4ccb2f46a 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -12,7 +12,8 @@ public: m_bg1_scroll(*this, "bg1_scroll"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "subcpu") { } + m_subcpu(*this, "subcpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_sn_nmi_enable; required_shared_ptr<UINT8> m_spriteram; @@ -46,6 +47,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index b105286a240..42aa8bcc9cb 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_msm(*this, "msm"){ } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -61,6 +62,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; /* mcu */ UINT8 m_mcu_cmd; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 6efb3be4770..1f5fb3be9a5 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -57,4 +58,5 @@ public: void pbillrd_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void freekick_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 69bd8c43a82..90fcb63b68b 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -8,7 +8,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_eeprom(*this, "eeprom"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ UINT16 *m_paletteram[2]; @@ -118,4 +119,5 @@ public: inline void fromanc4_vram_w( offs_t offset, UINT16 data, UINT16 mem_mask, int layer ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index c1e46fcc325..1bf7d98da84 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -19,7 +19,8 @@ public: m_spr_old(*this, "vsystem_spr_old"), m_subcpu(*this, "sub"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers (used by pipedrm) */ optional_shared_ptr<UINT8> m_videoram; @@ -98,4 +99,5 @@ public: DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int); required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index a8b5e0a0a2f..6e526fd157d 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -33,4 +34,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_columns( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 39325821b0f..ac5032b022d 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -40,4 +41,5 @@ public: DECLARE_MACHINE_RESET(lunapark); UINT32 screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 27a626947c8..78a81b3d794 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -8,7 +8,8 @@ public: m_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -29,4 +30,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index be282fde655..ce857ead0df 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -19,7 +19,8 @@ public: m_priority(*this, "priority"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki"){ } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr_array<UINT16,4> m_vram; @@ -37,7 +38,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<cpu_device> m_audiocpu; DECLARE_WRITE16_MEMBER(fuuki16_vregs_w); DECLARE_WRITE16_MEMBER(fuuki16_sound_command_w); DECLARE_WRITE8_MEMBER(fuuki16_sound_rombank_w); @@ -60,6 +61,7 @@ public: void fuuki16_draw_layer( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int flag, int pri ); DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 629baaaaa7d..21ed967b7c2 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -28,7 +28,8 @@ public: m_priority(*this, "priority"), m_tilebank(*this, "tilebank"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr_array<UINT32,4> m_vram; @@ -51,6 +52,9 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; + + DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w); DECLARE_READ32_MEMBER(snd_020_r); DECLARE_WRITE32_MEMBER(snd_020_w); diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 2db7637d02a..25df5a08691 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_screenram(*this, "screenram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -45,4 +46,5 @@ public: UINT32 screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 7bda0111a61..43ca13bfdd9 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -11,13 +11,15 @@ public: m_spriteram(*this,"spriteram"), m_vregs(*this, "vregs"), m_snowboar_protection(*this, "snowboar_prot"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_device<m68000_device> m_maincpu; required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_vregs; optional_shared_ptr<UINT16> m_snowboar_protection; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; int m_clr_gun_int; UINT8 m_analog_ports[2]; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index a05cbaafa63..41c0533797c 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -16,7 +16,8 @@ public: m_videoram3(*this, "videoram3"), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -97,4 +98,5 @@ public: int sx,int sy,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 79adf9e2bbe..90ade242044 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -15,7 +15,8 @@ public: m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_subcpu2(*this, "sub2"), - m_namco_sound(*this, "namco") { } + m_namco_sound(*this, "namco"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT8> m_videoram; @@ -27,6 +28,7 @@ public: required_device<cpu_device> m_subcpu; required_device<cpu_device> m_subcpu2; required_device<namco_device> m_namco_sound; + required_device<gfxdecode_device> m_gfxdecode; emu_timer *m_cpu3_interrupt_timer; UINT8 m_custom_mod; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 07333d2f845..375c304e6be 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -28,7 +28,8 @@ public: m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), m_tc0100scn(*this, "tc0100scn"), - m_tc0480scp(*this, "tc0480scp") { } + m_tc0480scp(*this, "tc0480scp"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -37,6 +38,7 @@ public: required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_coin_word; UINT16 m_frame_counter; int m_tc0110pcr_addr; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 0018e167c75..5f9c007c758 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -50,7 +50,8 @@ public: m_ppi8255_1(*this, "ppi8255_1"), m_ppi8255_2(*this, "ppi8255_2"), m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -65,6 +66,7 @@ public: optional_device<i8255_device> m_ppi8255_2; required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; int m_bullets_base; int m_sprites_base; diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 28464999d3e..5b3eb0ccd6b 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -37,7 +37,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_7474_9m_1(*this, "7474_9m_1"), - m_7474_9m_2(*this, "7474_9m_2") + m_7474_9m_2(*this, "7474_9m_2"), + m_gfxdecode(*this, "gfxdecode") { } @@ -248,6 +249,7 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<ttl7474_device> m_7474_9m_1; optional_device<ttl7474_device> m_7474_9m_2; + required_device<gfxdecode_device> m_gfxdecode; }; #define galaxold_coin_counter_0_w galaxold_coin_counter_w diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index a4de39fa5de..bfab4a0a937 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -61,4 +62,5 @@ public: UINT32 screen_update_ninjemak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 4718e9fa825..a5a166e3a32 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -7,13 +7,16 @@ public: : kaneko16_state(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_bgvideoram; required_shared_ptr<UINT16> m_fgvideoram; bitmap_ind16 m_bitmap; bitmap_ind16 m_sprites_bitmap; optional_shared_ptr<UINT16> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(galpanic_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_misc_w); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 81b92c09947..b7799f55333 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -18,7 +18,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_scroll(*this, "scroll"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -37,4 +38,5 @@ public: void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index fe039ca729c..467310d9a8e 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -34,7 +34,8 @@ public: m_samples(*this, "samples") , m_customio_3(*this,"customio_3"), m_videoram(*this,"videoram"), - m_spriteram(*this,"spriteram") { } + m_spriteram(*this,"spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -44,6 +45,7 @@ public: required_shared_ptr<UINT8> m_customio_3; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; namco58xx_device *m_namco58xx; namco56xx_device *m_namco56xx; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index f14d2f56465..30d8648dc75 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -4,7 +4,8 @@ public: gatron_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -16,4 +17,5 @@ public: virtual void palette_init(); UINT32 screen_update_gat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 45151291634..a9fc8d10daf 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -18,7 +18,8 @@ public: m_scrollram(*this, "scrollram"), m_soundlatch(*this, "soundlatch"), m_sn(*this, "snsnd") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -62,4 +63,5 @@ public: void gberet_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index cf9c03137c0..9c3c0bff76c 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -18,7 +18,8 @@ public: m_msm(*this, "msm"), m_tilemapram(*this, "tilemapram"), m_spriteram(*this, "spriteram"), - m_ioc_ram(*this, "ioc_ram") + m_ioc_ram(*this, "ioc_ram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ @@ -30,6 +31,8 @@ public: required_shared_ptr<UINT16> m_tilemapram; required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_ioc_ram; + + required_device<gfxdecode_device> m_gfxdecode; // UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 81aed6b9a0c..83aec8afe8c 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -14,7 +14,8 @@ public: m_vregs(*this, "vregs"), m_fgram(*this, "fgram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_txtram; @@ -50,4 +51,5 @@ public: UINT32 screen_update_ginganin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 64a66a9ab44..e2f741c7654 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram; @@ -79,4 +80,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 4177bf3f7a5..aa5868c6550 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -13,7 +13,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_mainram(*this, "mainram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -51,4 +52,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void glass_ROM16_split_gfx( const char *src_reg, const char *dst_reg, int start, int length, int dest1, int dest2 ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index a7145a36584..11bf38a212e 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram") , m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -46,4 +47,5 @@ public: UINT32 screen_update_gng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 85e30c2ebd4..c84abd51cbe 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -16,7 +16,8 @@ public: m_scrollram(*this, "scrollram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_data; @@ -61,4 +62,5 @@ public: DECLARE_WRITE_LINE_MEMBER(goal92_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index c24db97e318..f6e01608b85 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -16,7 +16,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram2(*this, "spriteram2"), m_fg_videoram(*this, "fg_videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -51,4 +52,5 @@ public: UINT32 screen_update_goindol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int gfxbank, UINT8 *sprite_ram ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 1b6093a6fc0..7742232f7bb 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -14,7 +14,8 @@ public: m_reel1_attrram(*this, "reel1_attrram"), m_reel2_attrram(*this, "reel2_attrram"), m_reel3_attrram(*this, "reel3_attrram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_dataoffset; @@ -156,4 +157,5 @@ public: UINT8 decrypt(UINT8 cipherText, UINT16 address); UINT8 chry10_decrypt(UINT8 cipherText); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index eff633f6508..a1d90f857ae 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_bgram(*this, "bgram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -27,6 +28,7 @@ public: virtual void palette_init(); UINT32 screen_update_gomoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 9bef59cec55..358ef5a12eb 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -17,7 +17,8 @@ public: m_sprgen(*this, "spritegen"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_fgvideoram; @@ -52,4 +53,5 @@ public: inline void get_tile_info( tile_data &tileinfo, int tile_index ,UINT16 *vram, int color_offs); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index e32ac37512f..696ad4ad033 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -217,7 +217,8 @@ public: m_knocker_sample(*this, "knocker_sam"), m_videoram(*this, "videoram"), m_charram(*this, "charram"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } // devices @@ -230,6 +231,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; required_shared_ptr<UINT8> m_spriteram; + + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_knocker_prev; UINT8 m_joystick_select; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 15b0abfc362..da843e3ab6e 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -11,7 +11,8 @@ public: m_videoram2(*this, "videoram2"), m_spriteram(*this, "spriteram"), m_samples(*this, "samples"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -44,4 +45,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 5e7227c91c0..e1cf213e73e 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -19,7 +19,8 @@ public: m_subcpu(*this, "sub"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_gfxram; @@ -41,6 +42,8 @@ public: required_device<k007232_device> m_k007232; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(k052109_halfword_r); DECLARE_WRITE16_MEMBER(k052109_halfword_w); DECLARE_READ16_MEMBER(k051937_halfword_r); diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index bea1d5be3bd..177a6f34a42 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -20,7 +20,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_cpu0_out[16]; UINT8 m_cpu1_out[16]; @@ -84,6 +85,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index f467fbe0ff0..cc8d28bb3aa 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -25,7 +25,8 @@ public: m_spriteram(*this,"spriteram") , m_maincpu(*this, "maincpu"), m_tc0100scn(*this, "tc0100scn"), - m_tc0480scp(*this, "tc0480scp") { } + m_tc0480scp(*this, "tc0480scp"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -33,6 +34,7 @@ public: required_device<cpu_device> m_maincpu; required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_coin_word; UINT16 m_frame_counter; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index cf5ae3c624c..f1ba4d0dfa4 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -45,7 +45,8 @@ public: m_lineram(*this, "lineram"), m_spr(*this, "vsystem_spr"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } virtual void machine_start() { @@ -114,6 +115,7 @@ public: DECLARE_WRITE_LINE_MEMBER(gs_ym2610_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; #endif diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index ecb9bb7ac44..f1cd1544e93 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spritetile_ram; required_shared_ptr<UINT8> m_spritexy_ram; @@ -59,4 +60,5 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_subcpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 18508398713..6ff605c8240 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -28,4 +29,5 @@ public: virtual void video_start(); UINT32 screen_update_gumbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index 41e3e92abdc..d789e33320e 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -25,7 +25,8 @@ public: m_tc0480scp(*this, "tc0480scp"), m_ram(*this,"ram"), m_spriteram(*this,"spriteram"), - m_eeprom(*this, "eeprom") + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { m_coin_lockout = true; } @@ -35,6 +36,7 @@ public: required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; bool m_coin_lockout; UINT16 m_coin_word; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 274ac6b7d84..a6e90ba135f 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -13,7 +13,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), m_rambase(*this, "rambase"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -46,4 +47,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(gundealr_scanline); TIMER_DEVICE_CALLBACK_MEMBER(yamyam_mcu_sim); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 140ffdb8f3d..24ee7620672 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -14,7 +14,8 @@ public: m_scrollx(*this, "scrollx"), m_scrolly(*this, "scrolly"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -44,4 +45,5 @@ public: UINT32 screen_update_gunsmoke(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index e25e6c30d66..b6917689e67 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -19,7 +19,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_flipscreen(*this, "flipscreen"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices/memory pointers */ @@ -32,6 +33,7 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_flipscreen; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_tilemap; UINT8 m_master_nmi_mask; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 64f359ec216..4547d861938 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -34,4 +35,5 @@ public: UINT32 screen_update_hanaawas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(hanaawas_portB_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 42379502eee..3b948b1e188 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -22,7 +22,8 @@ public: m_k007121_1(*this, "k007121_1"), m_k007121_2(*this, "k007121_2"), m_k007232(*this, "k007232"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram8_device> m_spriteram; required_device<buffered_spriteram8_device> m_spriteram2; @@ -69,4 +70,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE8_MEMBER(volume_callback); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 63b954e8323..564f7250e5c 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -6,11 +6,13 @@ public: hexion_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_k053252(*this, "k053252") + m_k053252(*this, "k053252"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<k053252_device> m_k053252; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_vram[2]; UINT8 *m_unkram; int m_bankctrl; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 8894ef865ee..38aaad45fc9 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,4 +32,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(higemaru_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 44dc39e290a..791bee726f6 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -12,7 +12,8 @@ public: m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), m_subcpu(*this, "sub"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bg_ram; @@ -38,4 +39,5 @@ public: UINT32 screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 649023b7ab6..e83571a012a 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -19,7 +19,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,6 +48,7 @@ public: UINT8 read_port_and_t0_and_hblank( int port ); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 50341d12c2b..580cc37efc0 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -34,7 +34,8 @@ public: m_3dregs(*this, "3dregs"), m_3d_1(*this, "3d_1"), m_3d_2(*this, "3d_2"), - m_com_ram(*this, "com_ram") + m_com_ram(*this, "com_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -60,6 +61,7 @@ public: required_shared_ptr<UINT32> m_com_ram; //required_shared_ptr<UINT8> m_com_mmu_mem; + required_device<gfxdecode_device> m_gfxdecode; int m_mcu_type; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index e96b7b7f1c9..f84e3315c1e 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -37,4 +38,5 @@ public: void holeland_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 99e0ca8f48c..94080dc40ee 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), - m_ymsnd(*this, "ymsnd") + m_ymsnd(*this, "ymsnd"), + m_gfxdecode(*this, "gfxdecode") { } @@ -47,6 +48,7 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<dac_device> m_dac; optional_device<ym2203_device> m_ymsnd; + required_device<gfxdecode_device> m_gfxdecode; sn76489a_device *m_sn; UINT8 m_prot_data; DECLARE_READ8_MEMBER(mrokumei_keyboard_r); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 9dd8b2f79f4..164c8d88d43 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_d7756(*this, "d7756"), - m_samples(*this, "samples") + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -26,6 +27,7 @@ public: required_shared_ptr<UINT8> m_colorram; optional_device<upd7756_device> m_d7756; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_control; UINT8 m_sample; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index b48752d948b..483e517b9b4 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_sn(*this, "snsnd"), m_maincpu(*this, "maincpu"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -23,6 +24,7 @@ public: optional_device<sn76496_device> m_sn; required_device<cpu_device> m_maincpu; optional_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; UINT8 * m_scroll2; UINT8 * m_spriteram2; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index d53a85ebb87..9eda5c8607b 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -23,7 +23,8 @@ public: m_sharedram1(*this, "sharedram1"), m_sharedram3(*this, "sharedram3"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_0; @@ -63,6 +64,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(hyprduel_irq_cause_r); DECLARE_WRITE16_MEMBER(hyprduel_irq_cause_w); DECLARE_WRITE16_MEMBER(hyprduel_subcpu_control_w); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index e3d838bfea3..6e8336b0f6f 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -13,7 +13,8 @@ public: m_subcpu(*this, "sub"), m_videoram(*this, "videoram"), m_scroll(*this, "scroll"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -21,6 +22,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_scroll; required_shared_ptr<UINT8> m_spriteram; + + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ bitmap_ind16 m_sprite_bitmap; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 907c0b1dde6..fb5ba266f91 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -11,7 +11,8 @@ public: m_spriteram2(*this, "spriteram2"), m_spr(*this, "vsystem_spr"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -59,4 +60,5 @@ public: void screen_eof_inufuku(screen_device &screen, bool state); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index b5723c82ea3..7365baaf3c8 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -4,10 +4,12 @@ public: iqblock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), - m_rambase(*this, "rambase"){ } + m_rambase(*this, "rambase"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_rambase; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_bgvideoram; UINT8 *m_fgvideoram; int m_videoenable; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 5ad1116ad1c..e578003b9f9 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -28,7 +28,8 @@ public: : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -93,4 +94,5 @@ public: void load_oproms(); void irmb_run(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index ff4ce11ecdf..0a1af5b5b13 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -16,7 +16,8 @@ public: m_spriteram2(*this, "spriteram2"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_interrupt_enable; @@ -35,6 +36,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(ironhors_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(ironhors_videoram_w); DECLARE_WRITE8_MEMBER(ironhors_colorram_w); diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 2a416a1ddf1..cfd15637f39 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram") + m_colorram(*this, "colorram"), + m_gfxdecode(*this, "gfxdecode") { } /* device- and memory pointers */ @@ -24,7 +25,8 @@ public: optional_shared_ptr<UINT8> m_scrollram; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; - + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index b2cd485598e..e5bdedffc4a 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -12,7 +12,8 @@ public: m_videoctrl(*this, "videoctrl"), m_paletteram(*this, "paletteram"), m_mastercpu(*this, "master"), - m_slavecpu(*this, "slave"){ } + m_slavecpu(*this, "slave"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoctrl; @@ -30,6 +31,8 @@ public: /* devices */ required_device<cpu_device> m_mastercpu; required_device<cpu_device> m_slavecpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(jackalr_rotary_r); DECLARE_WRITE8_MEMBER(jackal_flipscreen_w); DECLARE_READ8_MEMBER(jackal_zram_r); diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 6a1bbc7c80b..11ed7f768a0 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -20,7 +20,8 @@ public: m_scroll_x(*this, "scroll_x"), m_scroll_dir(*this, "scroll_dir"), m_maincpu(*this, "maincpu"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -32,6 +33,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 6c4113704df..32ae49ffee4 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -18,7 +18,8 @@ public: m_spritegen(*this, "spritegen"), m_ram(*this, "ram"), m_videoram(*this, "videoram"), - m_pf_data(*this, "pf_data") { } + m_pf_data(*this, "pf_data"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -31,6 +32,8 @@ public: required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_pf_data; + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ bitmap_ind16 *m_bitmap_f; tilemap_t *m_fix_tilemap; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 3f8d9c62084..8c3539fbceb 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -62,4 +63,5 @@ public: DECLARE_WRITE_LINE_MEMBER(msmint); required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index e2887caa5e4..59f1e4b499e 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -20,7 +20,8 @@ public: m_adpcm(*this, "oki"), m_eeprom(*this, "eeprom") , m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_fgram; @@ -82,4 +83,5 @@ public: void kickgoal_play(okim6295_device *oki, int melody, int data); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index ed7331e84c9..ae3996b5c0a 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -18,7 +18,8 @@ public: m_video_cpu(*this, "video"), m_sprite_cpu(*this, "sprite"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll_y; @@ -69,4 +70,5 @@ public: void ringking_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index deed0ec5266..d2e18f09148 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -13,7 +13,8 @@ public: m_scrollregs(*this, "scrollregs"), m_spriteram(*this, "spriteram"), m_soundcpu(*this, "soundcpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -51,4 +52,5 @@ public: INTERRUPT_GEN_MEMBER(sound_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 7b8ff0205a3..fdabc4a22ba 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -28,7 +28,8 @@ public: m_konamigx_type3_psac2_bank(*this,"psac2_bank"), m_k056800(*this, "k056800"), m_k054539_1(*this,"k054539_1"), - m_k054539_2(*this,"k054539_2") + m_k054539_2(*this,"k054539_2"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -49,6 +50,7 @@ public: optional_device<k056800_device> m_k056800; optional_device<k054539_device> m_k054539_1; optional_device<k054539_device> m_k054539_2; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE32_MEMBER(esc_w); DECLARE_WRITE32_MEMBER(eeprom_w); diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 2d6c2bdf376..d757753fec7 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,6 +28,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(kopunch_in_r); DECLARE_WRITE8_MEMBER(kopunch_lamp_w); DECLARE_WRITE8_MEMBER(kopunch_coin_w); diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index c667347522b..14cfb65854d 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -43,4 +44,5 @@ public: UINT32 screen_update_ksayakyu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index bb8242cb418..7d255f36c1d 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -16,7 +16,8 @@ public: m_spriteram_2(*this, "spriteram_2"), m_shared_ram(*this, "shared_ram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgvideoram; @@ -39,6 +40,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(kyugo_nmi_mask_w); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index df4b1983860..dbe54becf50 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -18,7 +18,8 @@ public: m_paletteram(*this, "paletteram"), m_spriteram(*this, "spriteram"), m_videoram1(*this, "videoram1"), - m_videoram2(*this, "videoram2"){ } + m_videoram2(*this, "videoram2"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<k007121_device> m_k007121; @@ -30,6 +31,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram1; required_shared_ptr<UINT8> m_videoram2; + + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_layer0; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 5ae4104d729..23f8dd5655f 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -15,7 +15,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_grid_data(*this, "grid_data"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,6 +46,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(sraider_sound_low_r); DECLARE_READ8_MEMBER(sraider_sound_high_r); DECLARE_WRITE8_MEMBER(sraider_sound_low_w); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 99468069920..87d1cad78a7 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -15,7 +15,8 @@ public: m_scrlram(*this, "scrlram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -68,4 +69,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 478fbb5bf74..1604baec462 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -21,7 +21,8 @@ public: m_s2636_1(*this, "s2636_1"), m_s2636_2(*this, "s2636_2"), m_s2636_3(*this, "s2636_3"), - m_sn(*this, "snsnd") + m_sn(*this, "snsnd"), + m_gfxdecode(*this, "gfxdecode") { } @@ -33,6 +34,7 @@ public: required_device<s2636_device> m_s2636_2; required_device<s2636_device> m_s2636_3; optional_device<sn76477_device> m_sn; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 683309335e7..6eef0649f2f 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -22,7 +22,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_sn_1(*this, "sn76489.1"), - m_sn_2(*this, "sn76489.2"){ } + m_sn_2(*this, "sn76489.2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,6 +46,8 @@ public: required_device<cpu_device> m_audiocpu; optional_device<sn76489_device> m_sn_1; optional_device<sn76489_device> m_sn_2; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_select_w); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index f9a302828c4..4cb63ab9cb4 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -17,7 +17,8 @@ public: m_vram(*this, "vram"), m_scroll1(*this, "scroll1"), m_scroll2(*this, "scroll2"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_gfxdecode(*this, "gfxdecode"){ } /* devices */ required_device<cpu_device> m_maincpu; @@ -28,6 +29,8 @@ public: required_shared_ptr<UINT16> m_scroll1; required_shared_ptr<UINT16> m_scroll2; required_shared_ptr<UINT16> m_paletteram; + + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index d64efbf0e56..ac9931c42fc 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -27,7 +27,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } /* device */ @@ -35,6 +36,8 @@ public: required_device<dac_device> m_dac; /* memory pointers */ required_shared_ptr<UINT8> m_videoram; + + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ UINT8 m_marker_x; diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index a786b591250..b3e1c80fb56 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -12,7 +12,8 @@ public: m_textram(*this, "textram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_back_data; @@ -62,6 +63,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/legionna.c -----------*/ diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 9c34e0894ca..819468f54a1 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -19,7 +19,8 @@ public: m_pixel_1_data(*this, "pixel_1_data"), m_sprgen(*this, "spritegen"), m_sprgen2(*this, "spritegen2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ bitmap_ind16 m_bitmap0; @@ -56,6 +57,7 @@ public: void screen_eof_lemmings(screen_device &screen, bool state); void lemmings_copy_bitmap(bitmap_rgb32& bitmap, bitmap_ind16& srcbitmap, int* xscroll, int* yscroll, const rectangle& cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_READ16_MEMBER( lem_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( lem_protection_region_0_146_w ); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index b3ef9d2b725..f994acb8706 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -10,7 +10,8 @@ public: m_spriteram(*this, "spriteram"), m_scratchram(*this, "scratchram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_paletteram; optional_shared_ptr<UINT8> m_bg_vram; /* prosport */ @@ -33,6 +34,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(deco16_bank_r); DECLARE_READ8_MEMBER(deco16_io_r); DECLARE_WRITE8_MEMBER(deco16_bank_w); diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index d685a89890d..9aea7efb847 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -10,7 +10,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vreg; required_shared_ptr<UINT8> m_scroll; @@ -55,6 +56,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(lkage_sound_command_w); DECLARE_WRITE8_MEMBER(lkage_sh_nmi_disable_w); DECLARE_WRITE8_MEMBER(lkage_sh_nmi_enable_w); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 4f9f1a55e48..f74da977d47 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -36,7 +36,8 @@ public: m_f2203_3l(*this, "f2203.3l"), m_f2203_1r(*this, "f2203.1r"), m_f2203_2r(*this, "f2203.2r"), - m_f2203_3r(*this, "f2203.3r") { } + m_f2203_3r(*this, "f2203.3r"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_char_ram; @@ -86,6 +87,8 @@ public: required_device<filter_volume_device> m_f2203_1r; required_device<filter_volume_device> m_f2203_2r; required_device<filter_volume_device> m_f2203_3r; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(lockon_crtc_r); DECLARE_WRITE16_MEMBER(lockon_crtc_w); DECLARE_WRITE16_MEMBER(lockon_char_w); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 45f435c91a0..c019d5b81d2 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -26,7 +26,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_oki(*this, "oki"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_priority_ram; required_shared_ptr<UINT16> m_scrollram; @@ -84,6 +85,7 @@ public: required_device<cpu_device> m_soundcpu; required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index e2822813117..02b4301cedf 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -9,7 +9,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -39,6 +40,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w); DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w); DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_enable_w); diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index c1d6cb46bbf..a73da5cc730 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -10,7 +10,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_bg_colorram(*this, "bg_colorram"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_ym2149_portb; UINT8 m_usart_8251; @@ -50,4 +51,5 @@ public: DECLARE_WRITE_LINE_MEMBER(lucky74_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 10386d52e82..bd677c04391 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_payout; UINT8 m_pulse; @@ -26,4 +27,5 @@ public: DECLARE_PALETTE_INIT(ponttehk); UINT32 screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 4f9eb1397c1..d0d6fbf1573 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -11,7 +11,8 @@ public: m_bg1videoram(*this, "bg1videoram"), m_soundlatch2(*this, "soundlatch2"), m_maincpu(*this, "maincpu"), - m_msm(*this, "5205") { } + m_msm(*this, "5205"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -71,4 +72,5 @@ public: int avengers_fetch_paldata( ); required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index dddf45093ae..f79039f1c61 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -44,7 +44,8 @@ public: m_colorram(*this, "colorram"), m_chargen(*this, "chargen"), m_maincpu(*this, "maincpu"), - m_samples(*this, "samples"){ } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_memory; @@ -72,6 +73,8 @@ public: device_t *m_ic8j1; device_t *m_ic8j2; required_device<samples_device> m_samples; + optional_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(m10_ctrl_w); DECLARE_WRITE8_MEMBER(m11_ctrl_w); DECLARE_WRITE8_MEMBER(m15_ctrl_w); diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 01cc8d844c8..88077033607 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -20,12 +20,14 @@ public: m_spriteram(*this, "spriteram"), m_vram_data(*this, "vram_data"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu") { } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_vram_data; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_vectorbase; int m_sound_status; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 147c77933a8..2a4e5f8c3dc 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -38,4 +39,5 @@ public: UINT32 screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int xpos, int ypos, int image); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index c518eaf410f..47635535801 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -25,4 +26,5 @@ public: void draw_background(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 2617eb7763b..1453d6a0049 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -9,7 +9,8 @@ public: m_yard_scroll_x_high(*this, "scroll_x_high"), m_yard_scroll_y_low(*this, "scroll_y_low"), m_yard_score_panel_disabled(*this, "score_disable"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -35,4 +36,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 1ae491cdee5..0d1c9cfc80c 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -7,7 +7,8 @@ public: m_m62_tileram(*this, "m62_tileram"), m_m62_textram(*this, "m62_textram"), m_scrollram(*this, "scrollram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -113,4 +114,5 @@ public: void m62_start( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); void m62_textlayer( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index ebbbebdfb42..89b0aff4138 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -21,7 +21,8 @@ public: m_soundcpu(*this, "soundcpu"), m_mcu(*this, "mcu"), m_dac(*this, "dac"), - m_audio(*this, "m72") { } + m_audio(*this, "m72"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram1; @@ -35,6 +36,7 @@ public: optional_device<cpu_device> m_mcu; optional_device<dac_device> m_dac; optional_device<m72_audio_device> m_audio; + required_device<gfxdecode_device> m_gfxdecode; UINT16 *m_protection_ram; emu_timer *m_scanline_timer; diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index ed44e3675de..7bb0c3e7a90 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -9,7 +9,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_audio(*this, "m72") { } + m_audio(*this, "m72"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_video_data; optional_shared_ptr<UINT16> m_spriteram; @@ -17,6 +18,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; optional_device<m72_audio_device> m_audio; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_video_control_data[8]; tilemap_t *m_pf1_layer; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index fe3ac36c3d0..a2af88647ee 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -30,7 +30,8 @@ public: m_spritecontrol(*this, "spritecontrol"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_oki(*this, "oki") + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram16_device> m_spriteram; @@ -91,7 +92,7 @@ public: void m92_draw_tiles(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); void m92_sprite_interrupt(); optional_device<okim6295_device> m_oki; - + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 18b52a9e99f..095db36bcae 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -29,7 +29,8 @@ public: m_paletteram(*this, "paletteram"), m_mainram(*this, "mainram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } @@ -67,6 +68,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE32_MEMBER(paletteram32_macrossp_w); DECLARE_READ32_MEMBER(macrossp_soundstatus_r); DECLARE_WRITE32_MEMBER(macrossp_soundcmd_w); diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 61705de066f..6a071b5c920 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -29,7 +29,8 @@ public: m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -74,6 +75,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/madalien.c -----------*/ diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index db003c0544a..d343055c6c7 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -9,7 +9,8 @@ public: m_scroll_x(*this, "scroll_x"), m_scroll_y(*this, "scroll_y"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_spriteram; @@ -39,4 +40,5 @@ public: TIMER_CALLBACK_MEMBER(scanline_callback); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index 567018c3af2..2bc05265ad7 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_fgram(*this, "fgram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_tx_tilemap; tilemap_t *m_bg_tilemap; @@ -33,4 +34,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index fcb1159fd89..e9b31b7b1c0 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -16,13 +16,15 @@ public: m_s2636_0(*this, "s2636_0"), m_s2636_1(*this, "s2636_1"), m_trom(*this, "saa5050"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<s2636_device> m_s2636_0; required_device<s2636_device> m_s2636_1; required_device<saa5050_device> m_trom; required_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; /* misc */ // int playfield_x[256]; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index cd9007f5741..f59d2714b59 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -36,7 +36,8 @@ public: m_subcpu(*this, "sub"), m_subcpu2(*this, "sub2"), m_namco_15xx(*this, "namco"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -46,6 +47,7 @@ public: optional_device<cpu_device> m_subcpu2; required_device<namco_15xx_device> m_namco_15xx; optional_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; namco56xx_device *m_namco56xx_1; namco56xx_device *m_namco56xx_2; diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index cf505f4aa39..f5fa84fb2b3 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -25,6 +26,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(irq_mask_w); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 0148815d5cf..1ed0052272f 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -41,7 +41,8 @@ public: m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -99,6 +100,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 5ba74c740f4..2245ab1f628 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_xscroll(*this, "xscroll"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -30,4 +31,5 @@ public: UINT32 screen_update_markham(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 11a900bf789..5dbaa9a111f 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -16,7 +16,8 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -54,6 +55,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(matmania_sh_command_w); DECLARE_WRITE8_MEMBER(maniach_sh_command_w); DECLARE_WRITE8_MEMBER(matmania_paletteram_w); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 94469fad985..888e8651fbe 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -11,7 +11,8 @@ public: m_spriteram(*this, "spriteram"), m_vidregs(*this, "vidregs"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram1; @@ -33,6 +34,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(mcat_soundlatch_w); DECLARE_WRITE16_MEMBER(mcat_coin_w); DECLARE_READ16_MEMBER(mcat_wd_r); diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 87eed24c427..7a5bcd0f7a6 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -34,7 +34,8 @@ public: m_squawk_n_talk(*this, "snt"), m_dpoker_coin_in_timer(*this, "dp_coinin"), m_dpoker_hopper_timer(*this, "dp_hopper"), - m_samples(*this, "samples") + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } // these should be required but can't because mcr68 shares with us @@ -52,6 +53,7 @@ public: optional_device<timer_device> m_dpoker_coin_in_timer; optional_device<timer_device> m_dpoker_hopper_timer; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(mcr_control_port_w); DECLARE_WRITE8_MEMBER(mcr_ipu_laserdisk_w); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 9bb4f02ddf2..d7b207440ad 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -25,7 +25,8 @@ public: m_cvsd_sound(*this, "cvsd"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<midway_chip_squeak_deluxe_device> m_chip_squeak_deluxe; optional_device<midway_sounds_good_device> m_sounds_good; @@ -122,4 +123,5 @@ public: void subtract_from_counter(int counter, int count); void mcr68_common_init(int clip, int xoffset); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 9f05f203b76..5ed67023cfd 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), - m_samples(*this, "samples") + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } @@ -62,6 +63,7 @@ public: optional_device<s2650_device> m_audiocpu; optional_device<dac_device> m_dac; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index ffeec011042..3ec7570c18c 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -36,7 +36,8 @@ public: m_io_p2(*this, "P2"), m_io_dsw(*this, "DSW"), m_io_dsw1(*this, "DSW1"), - m_io_dsw2(*this, "DSW2") { } + m_io_dsw2(*this, "DSW2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_vregs; required_shared_ptr<UINT16> m_objectram; @@ -54,6 +55,7 @@ public: optional_ioport m_io_dsw; optional_ioport m_io_dsw1; optional_ioport m_io_dsw2; + required_device<gfxdecode_device> m_gfxdecode; UINT16 *m_spriteram; UINT16 m_ip_select; diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 99ea131c273..78ecd25cbbb 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -18,7 +18,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_daccpu(*this, "daccpu"){ } + m_daccpu(*this, "daccpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_scrolly; @@ -40,6 +41,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_daccpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(megazone_i8039_irq_w); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 39a56d3fe50..b925d7961c3 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -21,7 +21,8 @@ public: m_maincpu(*this, "maincpu"), m_adpcm(*this, "adpcm"), m_ay1(*this, "ay1"), - m_ay2(*this, "ay2") + m_ay2(*this, "ay2"), + m_gfxdecode(*this, "gfxdecode") { } @@ -61,6 +62,7 @@ public: optional_device<msm5205_device> m_adpcm; required_device<ay8910_device> m_ay1; required_device<ay8910_device> m_ay2; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(mermaid_ay8910_write_port_w); diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 6fd54c9a2df..f6c3fb7c4b3 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -14,7 +14,8 @@ public: m_bgram(*this, "bgram"), m_scrollx(*this, "scrollx"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgram; @@ -34,6 +35,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(metlclsh_cause_irq); DECLARE_WRITE8_MEMBER(metlclsh_ack_nmi); DECLARE_WRITE8_MEMBER(metlclsh_cause_nmi2); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7ebf3eb1da9..a3cb3480caa 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -44,7 +44,8 @@ public: m_screenctrl(*this, "screenctrl"), m_input_sel(*this, "input_sel"), m_k053936_ram(*this, "k053936_ram"), - m_eeprom(*this, "eeprom") + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ @@ -74,6 +75,7 @@ public: optional_shared_ptr<UINT16> m_k053936_ram; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; int m_flip_screen; diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index ad6b71f5250..a0f71920aaf 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -12,7 +12,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), - m_ymsnd(*this, "ymsnd") + m_ymsnd(*this, "ymsnd"), + m_gfxdecode(*this, "gfxdecode") { } @@ -45,6 +46,7 @@ public: optional_device<cpu_device> m_subcpu; optional_device<cpu_device> m_mcu; required_device<ym2203_device> m_ymsnd; + required_device<gfxdecode_device> m_gfxdecode; /* queue */ UINT8 m_queue[64]; diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 5d19302d956..219de52683a 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -30,6 +31,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_irq_mask; DECLARE_READ8_MEMBER(mikie_sh_timer_r); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index f98a56ae58c..ea2aca6110f 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -21,7 +21,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_eeprom(*this, "eeprom"), - m_msm(*this, "msm"){ } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode"){ } /* devices */ required_device<cpu_device> m_maincpu; @@ -34,7 +35,8 @@ public: optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<msm5205_device> m_msm; - + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ tilemap_t *m_bg_tilemap; UINT8 *m_objram; /* Sprite RAM */ diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index dbeca63e3da..a3395f92bc7 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -13,7 +13,8 @@ public: m_spriteram3(*this, "spriteram3"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_mjk_adpcm(*this, "adpcm") { } + m_mjk_adpcm(*this, "adpcm"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram1; @@ -23,6 +24,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mjkjidai_adpcm_device> m_mjk_adpcm; + required_device<gfxdecode_device> m_gfxdecode; int m_keyb; int m_nvram_init_count; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 183a0252574..6506927c221 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_bg_scrolly(*this, "bg_scrolly"), m_bg_scrollx(*this, "bg_scrollx"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -49,4 +50,5 @@ public: UINT32 screen_update_momoko(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void momoko_draw_bg_pri( bitmap_ind16 &bitmap, int chr, int col, int flipx, int flipy, int x, int y, int pri ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 2f8c037cb28..5bf7c799970 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgvideoram; @@ -37,4 +38,5 @@ public: virtual void video_start(); UINT32 screen_update_mosaic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 33fbc81e994..9d2ed245fa8 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -13,12 +13,13 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; - required_shared_ptr<UINT8> m_spriteram; + required_shared_ptr<UINT8> m_spriteram; /* misc */ UINT8 m_sound_byte; @@ -27,6 +28,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(mouser_nmi_enable_w); DECLARE_WRITE8_MEMBER(mouser_sound_interrupt_w); DECLARE_READ8_MEMBER(mouser_sound_byte_r); diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 348aa328d83..b3eed659287 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -12,7 +12,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -36,4 +37,5 @@ public: UINT32 screen_update_mrdo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index acee8b4a90e..9c8c1735cfb 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,6 +32,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(mrflea_main_w); DECLARE_WRITE8_MEMBER(mrflea_io_w); DECLARE_READ8_MEMBER(mrflea_main_r); diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 56614b90a36..3c7bcae5771 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -29,4 +30,5 @@ public: UINT32 screen_update_mrjong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index c30067dd04f..a13057c0e3c 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -17,7 +17,8 @@ public: m_bgram(*this, "bgram", 32), m_f1superb_extraram(*this, "f1sb_extraram", 32), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_roz_ctrl; @@ -108,4 +109,5 @@ public: void configure_banks(); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 7fc5927123a..9daafd96ad7 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -15,7 +15,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_bmcu(*this, "bmcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -52,6 +53,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(nmi_disable_w); diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 4041d39b79a..741729ff56b 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -10,7 +10,8 @@ public: m_regs2(*this, "regs2"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode"){ } required_shared_ptr<UINT16> m_videoram1; required_shared_ptr<UINT16> m_videoram2; @@ -23,6 +24,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(mugsmash_reg2_w); DECLARE_READ16_MEMBER(mugsmash_input_ports_r); DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w); diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 80af3832202..1877b3b1d10 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -16,7 +16,8 @@ public: m_status_vram(*this, "status_vram"), m_vreg(*this, "vreg"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_sprite_xpos; @@ -37,6 +38,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(mnchmobl_nmi_enable_w); DECLARE_WRITE8_MEMBER(mnchmobl_soundlatch_w); DECLARE_WRITE8_MEMBER(sound_nmi_ack_w); diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 5c176a9c23c..33ae140db9f 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -8,13 +8,15 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_cpu_decrypt(*this, "seibu_sound") { } + m_cpu_decrypt(*this, "seibu_sound"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_cpu_decrypt; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; int m_control_byte; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 89290f4deeb..8339e758199 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -23,7 +23,8 @@ public: m_paletteram(*this, "paletteram"), m_scroll(*this, "scroll"), m_video_control(*this, "video_control") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* machine state */ required_shared_ptr<UINT8> m_ay8910_data; @@ -53,6 +54,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int flip); void mystston_on_scanline_interrupt(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/mystston.c -----------*/ diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index f2d0464a62b..07b96abc01c 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -36,7 +36,8 @@ public: m_spriteram(*this,"spriteram"), m_workram(*this,"workram"), m_vreg(*this,"vreg"), - m_scroll(*this,"scroll") + m_scroll(*this,"scroll"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -47,6 +48,7 @@ public: required_shared_ptr<UINT16> m_workram; required_shared_ptr<UINT16> m_vreg; required_shared_ptr<UINT16> m_scroll; + required_device<gfxdecode_device> m_gfxdecode; UINT16 *m_mpBank0; UINT16 *m_mpBank1; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index f75299a0876..b0995e7867e 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -22,7 +22,8 @@ public: m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), m_cus30(*this, "namco"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -30,6 +31,7 @@ public: required_device<cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; int m_dac0_value; int m_dac1_value; int m_dac0_gain; diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 0bc149560ac..682a1864018 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -107,7 +107,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_slave(*this, "slave"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<cpu_device> m_dspmaster; optional_device<cpu_device> m_dspslave; @@ -221,6 +222,7 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_slave; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; class namcos2_state : public namcos2_shared_state diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 667003f2485..d2bd198681c 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -196,7 +196,8 @@ public: m_tilemapattr(*this, "tilemapattr"), m_czram(*this, "czram"), m_motor_timer(*this, "motor_timer"), - m_pc_pedal_interrupt(*this, "pc_p_int") + m_pc_pedal_interrupt(*this, "pc_p_int"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -222,6 +223,7 @@ public: optional_shared_ptr<UINT32> m_czram; optional_device<timer_device> m_motor_timer; optional_device<timer_device> m_pc_pedal_interrupt; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_syscontrol[0x20]; bool m_dsp_irq_enabled; diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index f3291aaaf4d..48d0539734b 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -10,7 +10,8 @@ public: m_rthunder_spriteram(*this, "spriteram"), m_cpu1(*this, "cpu1"), m_cpu2(*this, "cpu2"), - m_cus30(*this, "namco") { } + m_cus30(*this, "namco"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_spriteram; int m_wdog; @@ -20,6 +21,7 @@ public: required_device<cpu_device> m_cpu1; required_device<cpu_device> m_cpu2; required_device<namco_cus30_device> m_cus30; + required_device<gfxdecode_device> m_gfxdecode; int m_tilebank; int m_xscroll[4]; int m_yscroll[4]; diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 2f00b71536b..f34e80fab9a 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -10,7 +10,8 @@ public: m_scrollreg(*this, "scrollreg"), m_maincpu(*this, "maincpu"), m_naughtyb_custom(*this, "naughtyb_custom"), - m_popflame_custom(*this, "popflame_custom") { } + m_popflame_custom(*this, "popflame_custom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram2; @@ -18,6 +19,8 @@ public: required_device<cpu_device> m_maincpu; optional_device<naughtyb_sound_device> m_naughtyb_custom; optional_device<popflame_sound_device> m_popflame_custom; + required_device<gfxdecode_device> m_gfxdecode; + UINT8 m_popflame_prot_seed; int m_r_index; int m_prot_count; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 645cb9cc1d3..3c18af5390b 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -29,7 +29,8 @@ public: m_filter4(*this, "filter4"), m_k007232(*this, "k007232"), m_k005289(*this, "k005289"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_charram; @@ -74,6 +75,8 @@ public: optional_device<k007232_device> m_k007232; optional_device<k005289_device> m_k005289; optional_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(gx400_irq1_enable_word_w); DECLARE_WRITE16_MEMBER(gx400_irq2_enable_word_w); DECLARE_WRITE16_MEMBER(gx400_irq4_enable_word_w); diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 47b553db2a1..8e65f10c200 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -6,7 +6,8 @@ public: : driver_device(mconfig, type, tag), m_bgram(*this, "bgram"), m_fgram(*this, "fgram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgram; @@ -27,4 +28,5 @@ public: virtual void video_start(); UINT32 screen_update_news(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index e0e38b7e551..cc130ca418e 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -13,7 +13,8 @@ public: m_soundcpu(*this, "soundcpu"), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -21,6 +22,7 @@ public: optional_shared_ptr<UINT8> m_bg_videoram; required_shared_ptr<UINT8> m_fg_videoram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; const INT16* m_sampledata; UINT8 m_omegaf_io_protection[3]; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index bd07c0cf095..0f1f277ca50 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -31,7 +31,8 @@ public: m_2610_1l(*this, "2610.1.l"), m_2610_1r(*this, "2610.1.r"), m_2610_2l(*this, "2610.2.l"), - m_2610_2r(*this, "2610.2.r") { } + m_2610_2r(*this, "2610.2.r"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -57,6 +58,8 @@ public: required_device<filter_volume_device> m_2610_1r; required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(ninjaw_sound_w); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 34a66ae9d27..d00dda9e279 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -23,7 +23,8 @@ public: m_videoram(*this, "videoram"), m_hvc(*this, "hvc"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -46,6 +47,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(nitedrvr_steering_reset_r); DECLARE_WRITE8_MEMBER(nitedrvr_steering_reset_w); DECLARE_READ8_MEMBER(nitedrvr_in0_r); diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 1268687492d..b3dbf6c369d 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -22,7 +22,8 @@ public: m_nmk_bgvideoram2(*this, "nmk_bgvideoram2"), m_nmk_bgvideoram3(*this, "nmk_bgvideoram3"), m_afega_scroll_0(*this, "afega_scroll_0"), - m_afega_scroll_1(*this, "afega_scroll_1") {} + m_afega_scroll_1(*this, "afega_scroll_1"), + m_gfxdecode(*this, "gfxdecode") {} required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -41,6 +42,7 @@ public: optional_shared_ptr<UINT16> m_nmk_bgvideoram3; optional_shared_ptr<UINT16> m_afega_scroll_0; optional_shared_ptr<UINT16> m_afega_scroll_1; + required_device<gfxdecode_device> m_gfxdecode; int mask[4*2]; int m_simple_scroll; int m_redraw_bitmap; diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 585dc04cad8..81a9065812c 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -12,7 +12,8 @@ public: norautp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 *m_np_vram; UINT16 m_np_addr; @@ -32,6 +33,7 @@ public: UINT32 screen_update_norautp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/norautp.c -----------*/ diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 87200f8d4fe..0ca8c76b3c4 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -6,7 +6,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_ninjakun_io_a002_ctrl; optional_shared_ptr<UINT8> m_fg_videoram; @@ -49,4 +50,5 @@ public: void pkunwar_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void lineswap_gfx_roms(const char *region, const int bit); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 9353b6172e7..7f7737c9d65 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -12,7 +12,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -57,6 +58,8 @@ public: required_device<cpu_device> m_subcpu; optional_device<cpu_device> m_mcu; required_device<msm5232_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(sub_cpu_halt_w); DECLARE_READ8_MEMBER(from_snd_r); DECLARE_WRITE8_MEMBER(to_main_w); diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 6abd79e232a..0565ba1c720 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -41,4 +42,5 @@ public: UINT32 screen_update_ohmygod(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 359813adda2..7d1812df684 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -14,7 +14,8 @@ public: m_colorram(*this, "colorram"), m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), - m_msm(*this, "msm"){ } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT8> m_videoram; @@ -40,6 +41,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + optional_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(ojankohs_rombank_w); DECLARE_WRITE8_MEMBER(ojankoy_rombank_w); DECLARE_WRITE8_MEMBER(ojankohs_msm5205_w); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index ec9562e3ea4..216144b0771 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -12,7 +12,8 @@ public: m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki"){ } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_sprites; @@ -59,4 +60,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index c247eafa0bf..069e0fc7785 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -23,7 +23,8 @@ public: m_playfield_ram(*this, "playfield_ram"), m_sprite_ram(*this, "sprite_ram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -40,6 +41,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(orbit_misc_w); DECLARE_WRITE8_MEMBER(orbit_playfield_w); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 8081a7193ef..d92ba8afff9 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -46,7 +46,8 @@ public: m_2610_1l(*this, "2610.1l"), m_2610_1r(*this, "2610.1r"), m_2610_2l(*this, "2610.2l"), - m_2610_2r(*this, "2610.2r") { } + m_2610_2r(*this, "2610.2r"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -74,6 +75,8 @@ public: required_device<filter_volume_device> m_2610_1r; required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(irq_ack_w); DECLARE_WRITE16_MEMBER(othunder_tc0220ioc_w); DECLARE_READ16_MEMBER(othunder_tc0220ioc_r); diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 59949057ff8..dd2dc5a7e06 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -10,7 +10,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_cus30(*this, "namco") { } + m_cus30(*this, "namco"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram2; @@ -18,6 +19,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_palette_bank; const UINT8 *m_color_prom; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 517f9471ab9..f8788e4a626 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -19,7 +19,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_s2650games_tileram(*this, "s2650_tileram"), - m_rocktrv2_prot_data(*this, "rocktrv2_prot") + m_rocktrv2_prot_data(*this, "rocktrv2_prot"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -31,6 +32,7 @@ public: optional_shared_ptr<UINT8> m_colorram; optional_shared_ptr<UINT8> m_s2650games_tileram; optional_shared_ptr<UINT8> m_rocktrv2_prot_data; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_cannonb_bit_to_read; int m_mystery; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 900e0b2c287..ca1acec1db3 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -15,7 +15,8 @@ public: m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -37,6 +38,8 @@ public: required_device<cpu_device> m_subcpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(pandoras_int_control_w); DECLARE_WRITE8_MEMBER(pandoras_cpua_irqtrigger_w); DECLARE_WRITE8_MEMBER(pandoras_cpub_irqtrigger_w); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index f7c19a5b0f1..2d0ca852d9e 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -12,7 +12,8 @@ public: m_paletteram(*this, "paletteram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_oki2(*this, "oki2") { } + m_oki2(*this, "oki2"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_vram_0; @@ -62,4 +63,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 85bb70d886b..b0413c3daed 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; @@ -19,4 +20,5 @@ public: virtual void video_start(); UINT32 screen_update_pass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index f50eaa5f2db..dc33f87bf05 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -16,7 +16,8 @@ public: m_work_ram(*this, "work_ram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -35,6 +36,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(pbaction_sh_command_w); diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 4ba8252d6c6..29bd369c0f3 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -10,13 +10,16 @@ public: m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), m_tilegen1(*this, "tilegen1"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; required_device<deco_bac06_device> m_tilegen1; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(pcktgal_bank_w); DECLARE_WRITE8_MEMBER(pcktgal_sound_bank_w); DECLARE_WRITE8_MEMBER(pcktgal_sound_w); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 9619ee2735f..e012e794078 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -24,7 +24,8 @@ public: m_z80_mainram(*this, "z80_mainram"), m_mainram(*this, "sram"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu") + m_soundcpu(*this, "soundcpu"), + m_gfxdecode(*this, "gfxdecode") { m_irq4_disabled = 0; } @@ -51,6 +52,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<gfxdecode_device> m_gfxdecode; device_t *m_ics; /* used by rendering */ diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 9ebe52ce3b0..5f18fbffbce 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -8,10 +8,12 @@ public: phoenix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_pleiads_custom(*this, "pleiads_custom") { } + m_pleiads_custom(*this, "pleiads_custom"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_device<pleiads_sound_device> m_pleiads_custom; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_videoram_pg[2]; UINT8 m_videoram_pg_index; UINT8 m_palette_bank; diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 96d9a618277..bb5d1e6fc81 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -6,7 +6,8 @@ public: m_maincpu(*this,"maincpu"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } int m_intenable; int m_question_addr_high; @@ -14,6 +15,7 @@ public: required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; DECLARE_WRITE8_MEMBER(cashquiz_question_bank_high_w); diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 9defe75c872..6c67116540a 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -13,7 +13,8 @@ public: m_bg_tileram(*this, "bg_tileram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_scroll; @@ -44,4 +45,5 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index ed0e88f713a..63b28847783 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -7,7 +7,8 @@ public: m_videoram2(*this, "videoram2"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_nmi; @@ -63,4 +64,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index 2b061cbd480..bbad21c0c80 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -24,7 +24,8 @@ public: m_maincpu(*this, "maincpu"), m_oki2(*this, "oki2"), m_deco_tilegen1(*this, "tilegen1"), - m_decocomn(*this, "deco_common") { } + m_decocomn(*this, "deco_common"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<deco104_device> m_deco104; @@ -43,6 +44,8 @@ public: required_device<okim6295_device> m_oki2; optional_device<deco16ic_device> m_deco_tilegen1; optional_device<decocomn_device> m_decocomn; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(pckgaldx_unknown_r); DECLARE_READ16_MEMBER(pckgaldx_protection_r); DECLARE_WRITE16_MEMBER(pktgaldx_oki_bank_w); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index d7b1e210c49..d3fb8f845a8 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -20,7 +20,8 @@ public: m_ram_8w(*this, "ram_8w"), m_videoram(*this, "videoram"), m_timedata(*this, "timedata"), - m_work_ram(*this, "work_ram") + m_work_ram(*this, "work_ram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -32,6 +33,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_timedata; required_shared_ptr<UINT8> m_work_ram; + required_device<gfxdecode_device> m_gfxdecode; + int m_up_8w; int m_pc10_nmi_enable; int m_pc10_dog_di; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 6cc46a38a2c..ca741499265 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -16,7 +16,8 @@ public: m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT16> m_bgvideoram; @@ -108,4 +109,5 @@ public: UINT8 playmark_asciitohex(UINT8 data); required_device<cpu_device> m_maincpu; optional_device<pic16c57_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 06cde565132..3e6fb3750f5 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -20,7 +20,8 @@ public: m_k053936(*this, "k053936"), m_shared_ram(*this, "shared_ram"), m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"), - m_dsp56k_p_8000(*this, "dsp56k_p_8000") + m_dsp56k_p_8000(*this, "dsp56k_p_8000"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -34,6 +35,7 @@ public: required_shared_ptr<UINT16> m_dsp56k_p_mirror; required_shared_ptr<UINT16> m_dsp56k_p_8000; + required_device<gfxdecode_device> m_gfxdecode; ioport_port *m_inputs[4]; UINT8 m_sys0; UINT8 m_sys1; diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 971dcfdafc8..f42e92c8738 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -23,4 +24,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 7afaece4eff..ada9246c13f 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -23,7 +23,8 @@ public: m_sprite16_memory(*this, "sprite16_memory"), m_road16_memory(*this, "road16_memory"), m_alpha16_memory(*this, "alpha16_memory"), - m_view16_memory(*this, "view16_memory") { } + m_view16_memory(*this, "view16_memory"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -42,6 +43,7 @@ public: required_shared_ptr<UINT16> m_road16_memory; required_shared_ptr<UINT16> m_alpha16_memory; required_shared_ptr<UINT16> m_view16_memory; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_vertical_position_modifier[256]; UINT16 m_road16_vscroll; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index dbbdd0b7bf4..48f39fff00d 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -10,7 +10,8 @@ public: m_videoram(*this, "videoram"), m_characterram(*this, "characterram"), m_maincpu(*this, "maincpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_freq1; @@ -40,6 +41,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(polyplay_timer_callback); required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 804ecef9153..46cf094e388 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -17,7 +17,8 @@ public: m_hpos_ram(*this, "hpos_ram"), m_vpos_ram(*this, "vpos_ram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_da_latch; required_shared_ptr<UINT8> m_playfield_ram; @@ -40,6 +41,7 @@ public: DECLARE_WRITE8_MEMBER(poolshrk_click_sound_w); DECLARE_WRITE8_MEMBER(poolshrk_bump_sound_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 66d46784b48..ae03eac4843 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -24,6 +25,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(irq_enable_w); DECLARE_WRITE8_MEMBER(pooyan_videoram_w); DECLARE_WRITE8_MEMBER(pooyan_colorram_w); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 5f89a92f33f..d85a91b3c71 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_prot0; UINT8 m_prot1; @@ -48,4 +49,5 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 67701e90db5..9a1f776681a 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -15,7 +15,8 @@ public: m_attribram(*this, "attribram"), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_ol_videoram; @@ -60,4 +61,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index b5e023f9301..c0b2fb7b4f2 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -9,7 +9,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<tms5200_device> m_tms; required_shared_ptr<UINT8> m_bgvideoram; @@ -31,4 +32,5 @@ public: inline void get_tile_info( tile_data &tileinfo, int tile_index, const UINT8 *source ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 042b561f28f..b8f8a11a2c2 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -11,7 +11,8 @@ public: m_vctrl_0(*this, "vctrl_0"), m_vram_0(*this, "vram_0"), m_vram_1(*this, "vram_1"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } @@ -22,6 +23,8 @@ public: required_shared_ptr<UINT16> m_vram_0; required_shared_ptr<UINT16> m_vram_1; required_shared_ptr<UINT16> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; + UINT16 *m_vctrl_1; tilemap_t *m_tilemap_0; tilemap_t *m_tilemap_1; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index 5a3f60f0d39..f8c39ada891 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -10,7 +10,8 @@ public: m_bg_videoram16(*this, "bg_videoram16"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; @@ -38,4 +39,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index ac181864824..89deeedf83f 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -17,7 +17,8 @@ public: m_bootleg_spritebuffer(*this, "boot_spritebuf"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -106,6 +107,7 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/psikyo.c -----------*/ diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 9ff574cda0a..c10d2f92781 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -20,7 +20,8 @@ public: m_io_select(*this, "io_select"), m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -38,6 +39,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE32_MEMBER(ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w); DECLARE_WRITE32_MEMBER(ps4_bgpen_1_dword_w); diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 14615106191..2a295cee7c9 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -30,7 +30,8 @@ public: m_vidregs(*this, "vidregs"), m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_device<buffered_spriteram32_device> m_spriteram; @@ -50,6 +51,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE32_MEMBER(psikyosh_irqctrl_w); DECLARE_WRITE32_MEMBER(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 55fe17000b4..ed6adadb235 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_bank_latch; UINT8 m_ps5_vram_page; @@ -58,4 +59,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 984a461d92b..2eedf1e58d5 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -15,7 +15,8 @@ public: m_armwrest_fg_videoram(*this, "armwrest_fgram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } int m_rp5c01_mode_sel; int m_rp5c01_mem[16*4]; @@ -31,6 +32,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_top_tilemap; tilemap_t *m_bg_bot_tilemap; diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 5403e111404..cdd13b084d5 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -34,6 +35,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(pushman_flipscreen_w); DECLARE_WRITE16_MEMBER(pushman_control_w); DECLARE_READ16_MEMBER(pushman_68705_r); diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 54356625e45..f44977a2251 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -4,7 +4,8 @@ public: quizdna_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_bg_ram; UINT8 *m_fg_ram; @@ -28,4 +29,5 @@ public: UINT32 screen_update_quizdna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index 9eb769baa6c..b599f8a15c0 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -9,13 +9,15 @@ public: m_nmk112(*this, "nmk112"), m_scrollreg(*this, "scrollreg"), m_bg_videoram(*this, "bg_videoram"), - m_txt_videoram(*this, "txt_videoram") { } + m_txt_videoram(*this, "txt_videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<nmk112_device> m_nmk112; required_shared_ptr<UINT16> m_scrollreg; required_shared_ptr<UINT16> m_bg_videoram; required_shared_ptr<UINT16> m_txt_videoram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; tilemap_t *m_txt_tilemap; int m_bgbank; diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index a9d2cf1ee6a..797c8167c0e 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -19,7 +19,8 @@ public: m_videoram(*this, "videoram"), m_scroll_ram(*this, "scroll_ram"), m_back_data(*this, "back_data"), - m_fore_data(*this, "fore_data") + m_fore_data(*this, "fore_data"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -30,6 +31,7 @@ public: optional_shared_ptr<UINT16> m_scroll_ram; required_shared_ptr<UINT16> m_back_data; required_shared_ptr<UINT16> m_fore_data; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_layer; tilemap_t *m_fg_layer; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 9a31544cc0d..372a4db5af1 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -11,11 +11,13 @@ public: text_data(*this, "text_data"), sprites(*this, "sprites") , m_maincpu(*this, "maincpu"), - m_seibu_sound(*this, "seibu_sound") { } + m_seibu_sound(*this, "seibu_sound"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> back_data,fore_data,mid_data, text_data, sprites; required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_seibu_sound; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE16_MEMBER( cop_itoa_low_w ); DECLARE_WRITE16_MEMBER( cop_itoa_high_w ); diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 6daa0187048..aa5c56c30b4 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_pc080sn(*this, "pc080sn"), - m_pc090oj(*this, "pc090oj") { } + m_pc090oj(*this, "pc090oj"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT16> m_spriteram; @@ -39,6 +40,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<pc080sn_device> m_pc080sn; optional_device<pc090oj_device> m_pc090oj; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(jumping_sound_w); DECLARE_READ8_MEMBER(jumping_latch_r); DECLARE_WRITE16_MEMBER(rbisland_cchip_ctrl_w); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 50d4c6a72dc..a6d13867709 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -19,7 +19,8 @@ public: m_maincpu(*this, "maincpu"), m_namco_sound(*this, "namco"), m_samples(*this, "samples"), - m_timeplt_audio(*this, "timeplt_audio") { } + m_timeplt_audio(*this, "timeplt_audio"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -46,6 +47,7 @@ public: optional_device<namco_device> m_namco_sound; optional_device<samples_device> m_samples; optional_device<timeplt_audio_device> m_timeplt_audio; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_main_irq_mask; DECLARE_WRITE8_MEMBER(rallyx_interrupt_vector_w); diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index d867d22682a..e90cd070b70 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -15,7 +15,8 @@ public: m_vram_0ras(*this, "vram_0ras"), m_vram_1ras(*this, "vram_1ras"), m_maincpu(*this, "maincpu"), - m_tmp68301(*this, "tmp68301") { } + m_tmp68301(*this, "tmp68301"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_vram_0; @@ -55,4 +56,5 @@ public: void dai2kaku_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int layer); required_device<cpu_device> m_maincpu; required_device<tmp68301_device> m_tmp68301; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index 70fb068f0b5..30fc96a42fb 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_bank; int m_mcu_sim; @@ -84,6 +85,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; class renegade_adpcm_device : public device_t, diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 4b510726367..14cf706d5da 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -9,7 +9,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_68705(*this, "68705") { } + m_68705(*this, "68705"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_cpu2_m6000; required_shared_ptr<UINT8> m_fg_videoram; @@ -73,4 +74,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; optional_device<cpu_device> m_68705; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 3377adfa97d..c69f69c1c3c 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -18,7 +18,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007342(*this, "k007342"), m_k007420(*this, "k007420"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -33,6 +34,8 @@ public: required_device<k007342_device> m_k007342; required_device<k007420_device> m_k007420; required_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w); DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(rockrage_vreg_w); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index a45fe55ee06..1350d33bc6f 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -33,4 +34,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index f1d8e7106e4..67d4fb2e68d 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -39,4 +40,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 5681b49194b..822904f5a08 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; UINT8 m_sound_data; @@ -55,4 +56,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 1b6d8dbcf95..5b8e85e8bbd 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_sprite_ram(*this, "sprite_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } emu_timer *m_interrupt_timer; required_shared_ptr<UINT8> m_video_ram; @@ -29,4 +30,5 @@ public: UINT32 screen_update_qwak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_callback); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 802f3a6ee34..ce9b75cd1eb 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -22,7 +22,8 @@ public: m_k055673(*this, "k055673"), m_k053252(*this, "k053252"), m_sysreg(*this, "sysreg"), - m_936_videoram(*this, "936_videoram") { } + m_936_videoram(*this, "936_videoram"), + m_gfxdecode(*this, "gfxdecode") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -36,6 +37,8 @@ public: /* memory pointers */ required_shared_ptr<UINT16> m_sysreg; required_shared_ptr<UINT16> m_936_videoram; + + required_device<gfxdecode_device> m_gfxdecode; // UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index d11dbabfcc0..1ed9c6b86d4 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<sp0256_device> m_sp0256; required_shared_ptr<UINT8> m_spriteram; @@ -49,4 +50,5 @@ public: void sauro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 8793ff6a5f1..66057d4d7f0 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_sn(*this, "snsnd"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -31,7 +32,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<sn76489_device> m_sn; required_device<vlm5030_device> m_vlm; - + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 68fed5c5ea0..8d7fbcc65d6 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram_attr(*this, "videoram_attr"), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram_attr; required_shared_ptr<UINT8> m_videoram; @@ -19,4 +20,5 @@ public: virtual void palette_init(); UINT32 screen_update_sbugger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 2a46269dd05..14c7fc834b0 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_irq_enable; required_shared_ptr<UINT8> m_colorram; @@ -32,4 +33,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 20f015fab95..50633cdc6db 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -7,7 +7,8 @@ public: m_md_videoram(*this, "md_videoram"), m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_md_videoram; @@ -39,4 +40,5 @@ public: UINT32 screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int codeshift); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index c42600ede44..3bb2262feab 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -32,7 +32,8 @@ public: m_samples(*this, "samples"), m_speech(*this, "segaspeech"), m_usbsnd(*this, "usbsnd"), - m_005snd(*this, "005") { } + m_005snd(*this, "005"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_videoram; @@ -45,6 +46,7 @@ public: optional_device<speech_sound_device> m_speech; optional_device<usb_sound_device> m_usbsnd; optional_device<sega005_sound_device> m_005snd; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_sound_state[2]; UINT8 m_sound_rate; diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 67d47c32ca2..fd204fca657 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -48,7 +48,8 @@ public: m_atomicp_sound_count(0), m_hwc_input_value(0), m_mj_input_num(0), - m_mj_last_val(0) + m_mj_last_val(0), + m_gfxdecode(*this, "gfxdecode") { } // memory mapping @@ -199,6 +200,8 @@ protected: UINT8 m_hwc_input_value; UINT8 m_mj_input_num; UINT8 m_mj_last_val; + + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index b6996993d39..bff640c36f5 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -40,7 +40,8 @@ public: m_vdp_mixing(0), m_mcu_data(0), m_lghost_value(0), - m_lghost_select(0) + m_lghost_select(0), + m_gfxdecode(*this, "gfxdecode") { memset(m_misc_io_data, 0, sizeof(m_misc_io_data)); memset(m_wwally_last_x, 0, sizeof(m_wwally_last_x)); @@ -150,4 +151,6 @@ protected: UINT8 m_wwally_last_y[3]; UINT8 m_lghost_value; UINT8 m_lghost_select; + + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 65a00c5f96b..329d86ad572 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -24,7 +24,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_multipcm(*this, "sega"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_z80_shared_ram; optional_shared_ptr<UINT8> m_ga2_dpram; @@ -37,6 +38,7 @@ public: required_device<cpu_device> m_soundcpu; optional_device<multipcm_device> m_multipcm; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; typedef void (segas32_state::*sys32_output_callback)(int which, UINT16 data); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 691964a8b9d..d29e83786e4 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -25,7 +25,8 @@ public: m_soundfifo1(*this, "soundfifo1"), m_soundfifo2(*this, "soundfifo2"), m_oki1(*this, "oki1"), - m_oki2(*this, "oki2") + m_oki2(*this, "oki2"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -40,6 +41,7 @@ public: optional_device<fifo7200_device> m_soundfifo2; optional_device<okim6295_device> m_oki1; optional_device<okim6295_device> m_oki2; + required_device<gfxdecode_device> m_gfxdecode; int m_z80_prg_transfer_pos; int m_z80_lastbank; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 2960997b047..357797e95ff 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -10,7 +10,8 @@ public: m_colorram(*this, "colorram"), m_nvram(*this, "nvram"), m_maincpu(*this, "maincpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -36,4 +37,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index bd2b7f12bcc..d77d59c2d6d 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -24,7 +24,8 @@ public: m_bg3videoram(*this, "bg3videoram"), m_radarram(*this, "radarram"), m_bgstripesram(*this, "bgstripesram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_int_delay_kludge; UINT8 m_sound_cmd; @@ -89,6 +90,7 @@ public: void draw_radar(bitmap_ind16 &bitmap,const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int priority); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/senjyo.c -----------*/ diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 5d20a3a4647..ab6817198d0 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -46,7 +46,8 @@ public: m_paletteram2(*this,"paletteram2"), m_kiwame_nvram(*this,"kiwame_nvram"), m_inttoote_key_select(*this,"inttoote_keysel"), - m_inttoote_700000(*this,"inttoote_700000") { } + m_inttoote_700000(*this,"inttoote_700000"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -66,6 +67,8 @@ public: optional_shared_ptr<UINT16> m_kiwame_nvram; optional_shared_ptr<UINT16> m_inttoote_key_select; optional_shared_ptr<UINT16> m_inttoote_700000; + + required_device<gfxdecode_device> m_gfxdecode; int m_tiles_offset; tilemap_t *m_tilemap_0; diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index dab38fe266e..2b7d2961100 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -17,7 +17,8 @@ public: m_funcube_leds(*this, "funcube_leds"), m_x1(*this, "x1snd"), m_oki(*this, "oki"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; optional_device<tmp68301_device> m_tmp68301; @@ -32,6 +33,7 @@ public: optional_device<x1_010_device> m_x1; optional_device<okim9810_device> m_oki; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; int m_xoffset; int m_yoffset; diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index ff406dd2868..f3034a4e5d5 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -15,7 +15,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), - m_msm2(*this, "msm2"){ } + m_msm2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode"){ } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -58,4 +59,5 @@ public: void write_dword( address_space &space, offs_t offset, UINT32 data ); required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index e98d63c7971..e22b3013e78 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -11,7 +11,8 @@ public: m_spvideoram(*this, "spvideoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_fgtilemap; tilemap_t *m_bg0tilemap; @@ -54,4 +55,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index e9f6785cf84..2e821273a89 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -8,7 +8,8 @@ public: m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } int m_prot_count; required_shared_ptr<UINT16> m_ram; @@ -37,4 +38,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 2bc67a295a1..6528fabb377 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -8,7 +8,8 @@ public: m_videoreg(*this, "videoreg"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_bbx(*this, "bbx") { } + m_bbx(*this, "bbx"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_spriteram; @@ -42,4 +43,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_bbx; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 54e5366566c..e99a6790d6c 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -6,12 +6,14 @@ public: m_maincpu(*this,"maincpu"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; int m_palettebank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index f2c6e499297..0adeeba4f36 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -8,13 +8,15 @@ public: m_paletteram(*this, "paletteram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audio (*this, "m72") { } + m_audio (*this, "m72"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_paletteram; required_shared_ptr<UINT8> m_videoram; required_device<cpu_device> m_maincpu; required_device<m72_audio_device> m_audio; + required_device<gfxdecode_device> m_gfxdecode; int m_gfxbank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 513d1c03327..d153789f644 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -7,7 +7,8 @@ public: m_textram(*this, "textram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_background; tilemap_t *m_foreground; @@ -34,4 +35,5 @@ public: DECLARE_WRITE_LINE_MEMBER(shootout_snd2_irq); required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 31287a2a5fb..b75d2966159 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -11,7 +11,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_gameid; @@ -60,4 +61,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 03ba5fd32ff..28d054f2846 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -13,7 +13,8 @@ public: m_audiocpu(*this, "audiocpu"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram") + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; @@ -22,6 +23,7 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; const UINT8* m_prot_table[3]; UINT8 m_i8751_return; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index bff0977e179..5231473a0a7 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -11,7 +11,8 @@ public: m_sprram(*this, "sprram"), m_regs(*this, "regs"), m_maincpu(*this, "maincpu"), - m_oki1(*this, "oki1") { } + m_oki1(*this, "oki1"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_vidram; required_shared_ptr<UINT32> m_vidram2; @@ -35,4 +36,5 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki1; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 3c40dd7105c..d96f98ff871 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -26,7 +26,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram") , m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_nmion; @@ -57,6 +58,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/skydiver.c -----------*/ diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 665355041a3..52c87631c1e 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -10,7 +10,8 @@ public: skyfox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -25,6 +26,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(skyfox_vregs_r); DECLARE_WRITE8_MEMBER(skyfox_vregs_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 3682d0c2ff5..2bda7422a56 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -10,7 +10,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_cus30(*this, "namco") { } + m_cus30(*this, "namco"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_inputport_selected; required_shared_ptr<UINT8> m_videoram; @@ -19,6 +20,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; tilemap_t *m_tx_tilemap; UINT8 m_priority; diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 7b66342dd38..c047700da56 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -9,7 +9,8 @@ public: m_alpha_num_ram(*this, "alpha_num_ram"), m_obj_ram(*this, "obj_ram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_analog_range; int m_analog_offset; @@ -35,6 +36,7 @@ public: void draw_missiles(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_trapezoid(bitmap_ind16& dst, bitmap_ind16& src); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/skyraid.c -----------*/ diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 55fc5612ba7..6978613cccc 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -27,7 +27,8 @@ public: m_spriteram(*this, "spriteram") , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } int m_getstar_id; required_shared_ptr<UINT8> m_slapfight_videoram; @@ -136,6 +137,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 08231db769a..1b842ebb1a3 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -37,7 +37,8 @@ public: m_tc0140syt(*this, "tc0140syt"), m_tc0480scp(*this, "tc0480scp"), m_tc0360pri(*this, "tc0360pri"), - m_tc0640fio(*this, "tc0640fio") { } + m_tc0640fio(*this, "tc0640fio"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_color_ram; @@ -69,6 +70,8 @@ public: required_device<tc0480scp_device> m_tc0480scp; required_device<tc0360pri_device> m_tc0360pri; required_device<tc0640fio_device> m_tc0640fio; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(color_ram_word_r); DECLARE_WRITE16_MEMBER(color_ram_word_w); DECLARE_READ16_MEMBER(slapshot_service_input_r); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 88cc85c3fcb..b52fb3e8267 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -15,7 +15,8 @@ public: m_tx_videoram(*this, "tx_videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } int m_countryc_trackball; int m_last_value[2]; @@ -184,4 +185,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 7cc0493e431..a2b0341ede8 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -20,7 +20,8 @@ public: m_colorram(*this, "colorram"), m_charram(*this, "charram"), m_maincpu(*this, "maincpu"), - m_sound(*this, "snk6502") { } + m_sound(*this, "snk6502"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_sasuke_counter; @@ -31,6 +32,7 @@ public: required_device<cpu_device> m_maincpu; required_device<snk6502_sound_device> m_sound; + required_device<gfxdecode_device> m_gfxdecode; int m_charbank; int m_backcolor; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 419c8d53aa7..f1e0d4f47b7 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -10,7 +10,8 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_gfxdecode(*this, "gfxdecode") { } int m_invert_controls; int m_sound_status; @@ -55,4 +56,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 1067058815a..d8c1f9a04a1 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_outportl; int m_outporth; @@ -35,4 +36,5 @@ public: DECLARE_PALETTE_INIT(crystalc); UINT32 screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 8c8700804da..cecc8c1a5a0 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -12,7 +12,8 @@ public: m_oki(*this, "oki"), m_pandora(*this, "pandora"), m_hyperpac_ram(*this, "hyperpac_ram"), - m_bootleg_spriteram16(*this, "spriteram16b") + m_bootleg_spriteram16(*this, "spriteram16b"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -21,6 +22,7 @@ public: optional_device<kaneko_pandora_device> m_pandora; optional_shared_ptr<UINT16> m_hyperpac_ram; optional_shared_ptr<UINT16> m_bootleg_spriteram16; + required_device<gfxdecode_device> m_gfxdecode; int m_sb3_music_is_playing; int m_sb3_music; UINT8 m_semicom_prot_offset; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index cafc6c13d6a..20ca618b808 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -9,7 +9,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -37,4 +38,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 0924f766706..c36e5a37d92 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -43,4 +44,5 @@ public: UINT32 screen_update_sonson(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 4918e517910..90b7deccb40 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -12,7 +12,8 @@ public: m_extraram(*this, "extraram"), m_extraram2(*this, "extraram2"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_bgvideoram; required_shared_ptr<UINT16> m_fgvideoram; @@ -67,4 +68,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 1e5875a5481..358075a05ba 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -12,7 +12,8 @@ public: m_sn2(*this, "sn2"), m_sn3(*this, "sn3"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_scrollram; @@ -45,4 +46,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index ec47eee5ac3..6e3a1ee8511 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -10,7 +10,8 @@ public: m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), - m_msm2(*this, "msm2"){ } + m_msm2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode") { } int m_toggle; int m_adpcm_pos[2]; @@ -62,4 +63,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index f7de60e75d8..6d7868ccc23 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -30,4 +31,5 @@ public: UINT32 screen_update_speedatk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT8 iox_key_matrix_calc(UINT8 p_side); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 44a2e92885a..cbe7a641301 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -6,13 +6,15 @@ public: m_maincpu(*this, "maincpu"), m_spriteram(*this, "spriteram"), m_background_videoram(*this, "bg_videoram"), - m_foreground_videoram(*this, "fg_videoram") + m_foreground_videoram(*this, "fg_videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_background_videoram; required_shared_ptr<UINT8> m_foreground_videoram; + required_device<gfxdecode_device> m_gfxdecode; bool m_leds_start; UINT32 m_leds_shiftreg; diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 95fd99139b5..4a0819a4d18 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -8,7 +8,8 @@ public: m_attram(*this, "attram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_attram; tilemap_t *m_tilemap; @@ -31,4 +32,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index bbb129ec401..6dfde5a0e12 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -15,7 +15,8 @@ public: m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), m_msm1(*this, "msm1"), - m_msm2(*this, "msm2") { } + m_msm2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_pixelram; required_shared_ptr<UINT16> m_videoram; @@ -85,4 +86,5 @@ public: optional_device<msm5205_device> m_msm; optional_device<msm5205_device> m_msm1; optional_device<msm5205_device> m_msm2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index d28f485eeed..222f94e60f9 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -7,7 +7,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), m_master(*this,"master"), - m_slave(*this,"slave"){ } + m_slave(*this,"slave"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_s_port3; UINT8 m_port7; @@ -19,6 +20,8 @@ public: required_device<cpu_device> m_master; required_device<cpu_device> m_slave; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(sprcros2_m_port7_w); DECLARE_WRITE8_MEMBER(sprcros2_s_port3_w); DECLARE_WRITE8_MEMBER(sprcros2_fgvideoram_w); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 91b8ed0a1bf..e34ee20baa2 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -28,7 +28,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } int m_attract; int m_steering[2]; @@ -76,6 +77,7 @@ public: int service_mode(); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/sprint2.c -----------*/ diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index 77d83235f62..dc6ba3768f7 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -10,7 +10,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_da_latch; @@ -50,6 +51,7 @@ public: TIMER_CALLBACK_MEMBER(nmi_callback); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 5dfb60369bb..e3555aa9a5b 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -11,7 +11,8 @@ public: m_pos_d_ram(*this, "pos_d_ram"), m_team(*this, "team"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_steer_dir[8]; int m_steer_flag[8]; @@ -50,6 +51,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void sprint8_set_collision(int n); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in drivers/sprint8.c -----------*/ diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 0faf08e9dc5..adc5dd3710d 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -8,12 +8,14 @@ public: m_maincpu(*this,"maincpu"), m_spriteram(*this,"spriteram"), m_backgroundram(*this, "backgroundram"), - m_foregroundram(*this, "foregroundram"){ } + m_foregroundram(*this, "foregroundram"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; required_device<buffered_spriteram8_device> m_spriteram; required_shared_ptr<UINT8> m_backgroundram; required_shared_ptr<UINT8> m_foregroundram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; int m_scroll[4]; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 112e68eaa9a..f6bbb777967 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } emu_timer *m_music_timer; @@ -62,4 +63,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index d9cb2c67dce..a262a55185c 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -10,7 +10,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_paletteram; @@ -42,4 +43,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 885b41be6ec..2e0d86bffde 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -3,7 +3,8 @@ class sspeedr_state : public driver_device public: sspeedr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_led_TIME[2]; UINT8 m_led_SCORE[24]; @@ -42,4 +43,5 @@ public: void draw_drones(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index ac303eb3edb..8db50973d04 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -8,7 +8,8 @@ public: m_vram3(*this, "vram3"), m_vram4(*this, "vram4"), m_scrollram(*this, "scrollram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_oldport; tilemap_t *m_tilemap1; @@ -34,4 +35,5 @@ public: void screen_eof_ssrj(screen_device &screen, bool state); void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 3e23914bab7..bb7bc21ed91 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -33,7 +33,8 @@ public: m_io_service(*this, "SERVICE"), m_io_paddle(*this, "PADDLE"), m_io_trackx(*this, "TRACKX"), - m_io_tracky(*this, "TRACKY") + m_io_tracky(*this, "TRACKY"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -176,4 +177,5 @@ protected: optional_ioport m_io_paddle; optional_ioport m_io_trackx; optional_ioport m_io_tracky; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index 5a36bb352c9..b0dc6b89877 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -5,7 +5,8 @@ public: st0016_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } int mux_port; UINT32 m_st0016_rom_bank; @@ -44,6 +45,7 @@ public: void st0016_save_init(); void draw_bgmap(bitmap_ind16 &bitmap,const rectangle &cliprect, int priority); optional_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; #define ISMACS (st0016_game&0x80) diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 6621239d04b..5cafdcc98fc 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -11,7 +11,8 @@ public: m_tilegen1(*this, "tilegen1"), m_spritegen(*this, "spritegen"), m_spriteram(*this, "spriteram"), - m_pf1_data(*this, "pf1_data") { } + m_pf1_data(*this, "pf1_data"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -19,6 +20,8 @@ public: required_device<deco_mxc06_device> m_spritegen; required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_pf1_data; + required_device<gfxdecode_device> m_gfxdecode; + tilemap_t *m_pf1_tilemap; int m_flipscreen; DECLARE_READ16_MEMBER(stadhero_control_r); diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 083c23448b2..fbac6903a0e 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -5,7 +5,8 @@ public: starcrus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } bitmap_ind16 *m_ship1_vid; bitmap_ind16 *m_ship2_vid; @@ -60,4 +61,5 @@ public: int collision_check_s2p1p2(); required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index f0eb6166e18..9d896572e3f 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -40,7 +40,8 @@ public: m_vpos_ram(*this, "vpos_ram"), m_obj_ram(*this, "obj_ram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } int m_analog_in_select; int m_attract; @@ -100,6 +101,7 @@ public: int circle_collision(const rectangle &rect); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/starshp1.c -----------*/ diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 5286435e21a..8459cfdd9ce 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_text_char_ram; optional_shared_ptr<UINT8> m_text_attr_ram; @@ -29,6 +30,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_mcu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_decrypt; UINT8 m_fm_data; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index e2e7deb9c1d..ca944e3cc2e 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_bg_tilemap; tilemap_t *m_mlow_tilemap; @@ -54,4 +55,5 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 3d1b515fc0e..33383380242 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -7,13 +7,15 @@ public: m_subcpu(*this,"sub"), m_videoram(*this, "videoram"), m_xscroll(*this, "xscroll"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_xscroll; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_scrl_ctrl; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 5f4996c96ad..b759e1617a3 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -22,7 +22,8 @@ public: m_slave(*this, "slave"), m_audiocpu(*this, "audiocpu"), m_scudsp(*this, "scudsp"), - m_eeprom(*this, "eeprom") + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } @@ -148,6 +149,7 @@ public: required_device<m68000_base_device> m_audiocpu; required_device<scudsp_cpu_device> m_scudsp; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; bitmap_rgb32 m_tmpbitmap; DECLARE_VIDEO_START(stv_vdp2); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 9a54c5f3306..9d41d2e564c 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -24,7 +24,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -56,6 +57,7 @@ public: int subs_steering_1(); int subs_steering_2(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in audio/subs.c -----------*/ diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 955e5a10ee2..7374cd5766e 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -11,7 +11,8 @@ public: m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), m_dac3(*this, "dac3"), - m_dac4(*this, "dac4") + m_dac4(*this, "dac4"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -21,6 +22,7 @@ public: required_device<dac_device> m_dac2; optional_device<dac_device> m_dac3; optional_device<dac_device> m_dac4; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_prot; UINT16 *m_paletteram; int m_color_bank; diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index ddd1ac1f878..7cb42f64e09 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -13,7 +13,8 @@ public: m_wram(*this, "wram"), m_banked_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_hardhead_ip; @@ -22,6 +23,7 @@ public: optional_shared_ptr<UINT8> m_banked_paletteram; required_device<cpu_device> m_audiocpu; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_rombank; UINT8 m_rombank_latch; diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index be3b122531c..5c8408b6b8b 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -23,7 +23,8 @@ public: m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_tc0480scp(*this, "tc0480scp"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 m_coin_word; required_shared_ptr<UINT32> m_ram; @@ -51,4 +52,5 @@ public: required_device<cpu_device> m_subcpu; required_device<tc0480scp_device> m_tc0480scp; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 77c9f02c154..b1482ddd5c3 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -11,7 +11,8 @@ public: m_videoram(*this, "videoram"), m_bitmapram(*this, "bitmapram"), m_bitmapram2(*this, "bitmapram2"), - m_samples(*this, "samples"){ } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_mcu; @@ -20,6 +21,7 @@ public: optional_shared_ptr<UINT8> m_bitmapram; optional_shared_ptr<UINT8> m_bitmapram2; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; INT16 *m_samplebuf; UINT8 m_port1; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index ecc6b94edf6..022a2a17c76 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -30,4 +31,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 59ea46130b7..f57db399919 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -30,7 +30,8 @@ public: m_palette_ram(*this, "palette_ram"), m_v3t_ram(*this, "v3t_ram"), m_main_ram(*this, "main_ram"), - m_cache_ram(*this, "cache_ram"){ } + m_cache_ram(*this, "cache_ram"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT32> m_spriteram; @@ -46,6 +47,7 @@ public: required_shared_ptr<UINT32> m_v3t_ram; required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT32> m_cache_ram; + required_device<gfxdecode_device> m_gfxdecode; hit_t m_hit; UINT32 m_timer_0_temp[4]; bitmap_ind16 m_sprite_bitmap; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index bfa193b75c6..47faff76e95 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -15,7 +15,8 @@ public: m_bgram(*this, "bgram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_nmi_enable; UINT8 m_sound_data; @@ -50,6 +51,7 @@ public: int suprridr_is_screen_flipped(); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/suprridr.c -----------*/ diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index ab5a53b8fc3..2582905d560 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -20,7 +20,8 @@ public: m_spr(*this, "vsystem_spr"), m_audiocpu(*this, "audiocpu"), m_k053936(*this, "k053936"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_screen_videoram; @@ -60,4 +61,5 @@ public: UINT32 screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 7ab3b4c17d6..5638abf1f5c 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -13,7 +13,8 @@ public: m_nob_mcu_status(*this, "nob_mcu_status"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } optional_device<i8255_device> m_ppi8255; required_shared_ptr<UINT8> m_ram; @@ -127,4 +128,5 @@ public: required_device<z80_device> m_maincpu; required_device<cpu_device> m_soundcpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 1b3e5f4a58f..eaae6ef949b 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -21,7 +21,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_msm(*this, "5205"), - m_upd7759(*this, "7759") { } + m_upd7759(*this, "7759"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_textram; optional_shared_ptr<UINT16> m_bg0_tileram; @@ -117,6 +118,8 @@ public: optional_device<cpu_device> m_soundcpu; optional_device<msm5205_device> m_msm; optional_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(sound_command_nmi_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(sys16_coinctrl_w); diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 02060af2929..f6d5ac91bca 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -34,4 +35,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 2891f6a9024..c1a469cb424 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_k051316(*this, "k051316") { } + m_k051316(*this, "k051316"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_bgvideoram; @@ -33,6 +34,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<k051316_device> m_k051316; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w); DECLARE_READ16_MEMBER(tail2nos_zoomdata_r); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 39ee2aa971c..a6cbb41fd84 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -32,7 +32,8 @@ public: m_tc0640fio(*this, "tc0640fio"), m_tc0220ioc(*this, "tc0220ioc"), m_tc0510nio(*this, "tc0510nio"), - m_mb87078(*this, "mb87078") { } + m_mb87078(*this, "mb87078"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -66,6 +67,7 @@ public: optional_device<tc0220ioc_device> m_tc0220ioc; optional_device<tc0510nio_device> m_tc0510nio; optional_device<mb87078_device> m_mb87078; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE8_MEMBER(bankswitch_w); DECLARE_READ16_MEMBER(tracky1_hi_r); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index d964b31060b..8ab88180810 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -40,7 +40,8 @@ public: m_tc0430grw(*this, "tc0430grw"), m_tc0480scp(*this, "tc0480scp"), m_tc0220ioc(*this, "tc0220ioc"), - m_tc0510nio(*this, "tc0510nio") + m_tc0510nio(*this, "tc0510nio"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -107,6 +108,8 @@ public: optional_device<tc0480scp_device> m_tc0480scp; optional_device<tc0220ioc_device> m_tc0220ioc; optional_device<tc0510nio_device> m_tc0510nio; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(growl_coin_word_w); DECLARE_WRITE16_MEMBER(taitof2_4p_coin_word_w); DECLARE_WRITE16_MEMBER(ninjak_coin_word_w); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 580c1c9fb71..db991e57bbb 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -55,7 +55,8 @@ public: m_f3_ram(*this,"f3_ram") , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } UINT16 *m_videoram; UINT16 *m_spriteram; @@ -287,6 +288,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; optional_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 7abeb2ce015..055f9ff07b1 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_tc0080vco(*this, "tc0080vco"), - m_tc0220ioc(*this, "tc0220ioc") { } + m_tc0220ioc(*this, "tc0220ioc"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_m68000_mainram; @@ -30,6 +31,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<tc0080vco_device> m_tc0080vco; required_device<tc0220ioc_device> m_tc0220ioc; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ8_MEMBER(syvalion_input_bypass_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); virtual void machine_start(); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 13d87908ba5..f46506c0c53 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -10,7 +10,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_msm(*this, "msm") + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } @@ -62,6 +63,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; /* memory buffers */ UINT8 m_rambanks[0x1000 * 12]; diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 74c4c5ea7cb..37e07395226 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -12,7 +12,8 @@ public: taitoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_tc0080vco(*this, "tc0080vco") { } + m_tc0080vco(*this, "tc0080vco"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling @@ -20,6 +21,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<tc0080vco_device> m_tc0080vco; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE16_MEMBER(io_w); DECLARE_READ16_MEMBER(io_r); virtual void machine_start(); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 4c8d573e91d..11f0a710ccc 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -36,7 +36,8 @@ public: m_tc0110pcr(*this, "tc0110pcr"), m_tc0220ioc(*this, "tc0220ioc"), m_tc0510nio(*this, "tc0510nio"), - m_tc0140syt(*this, "tc0140syt") { } + m_tc0140syt(*this, "tc0140syt"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -64,6 +65,7 @@ public: optional_device<tc0220ioc_device> m_tc0220ioc; optional_device<tc0510nio_device> m_tc0510nio; required_device<tc0140syt_device> m_tc0140syt; + required_device<gfxdecode_device> m_gfxdecode; DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE16_MEMBER(chasehq_cpua_ctrl_w); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index b033ed24142..fda9c8e9bd6 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -35,7 +35,8 @@ public: m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), m_tc0080vco(*this, "tc0080vco"), - m_tc0220ioc(*this, "tc0220ioc") + m_tc0220ioc(*this, "tc0220ioc"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -59,6 +60,7 @@ public: required_device<cpu_device> m_dsp; required_device<tc0080vco_device> m_tc0080vco; required_device<tc0220ioc_device> m_tc0220ioc; + required_device<gfxdecode_device> m_gfxdecode; bitmap_ind16 *m_framebuffer[2]; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 8e2bf4f9cec..643e3fc1206 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -48,7 +48,8 @@ public: m_snd_shared_ram(*this, "snd_shared"), m_main_ram(*this, "main_ram"), m_dsp_shared_ram(*this, "dsp_shared"), - m_palette_ram(*this, "palette_ram") + m_palette_ram(*this, "palette_ram"), + m_gfxdecode(*this, "gfxdecode") { m_mcu_output = 0; m_speed_meter = 0; @@ -67,6 +68,8 @@ public: required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT16> m_dsp_shared_ram; required_shared_ptr<UINT32> m_palette_ram; + + required_device<gfxdecode_device> m_gfxdecode; taitojc_renderer *m_renderer; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 2e11bb9f711..8ef43651494 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -22,7 +22,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &, const rectangle &, int, int *, rectangle *); @@ -124,4 +125,5 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index cbd2a87f3b9..b4be2ae35f6 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -39,7 +39,8 @@ public: m_pos_d_ram(*this, "pos_d_ram"), m_team(*this, "team"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } int m_collision_index; required_shared_ptr<UINT8> m_video_ram; @@ -76,6 +77,7 @@ public: void tank8_set_collision(int index); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 7519bacbc46..e81843cd7b4 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -7,7 +7,8 @@ public: m_bulletsram(*this, "bulletsram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_bulletsram; required_shared_ptr<UINT8> m_videoram; @@ -37,4 +38,5 @@ public: void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 3c2140d08bb..fd1afb23fa2 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -8,7 +8,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } int m_latch; UINT32 m_timer1; @@ -51,4 +52,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index dc17e5538d3..effe660048d 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -9,7 +9,8 @@ public: m_bgram(*this, "bgram"), m_spr(*this, "vsystem_spr"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_pending_command; required_shared_ptr<UINT16> m_spriteram; @@ -41,4 +42,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index e2578a24330..32f4129281f 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -6,12 +6,14 @@ public: m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_vregs; required_shared_ptr<UINT16> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_pant[2]; DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index baaf4281dc1..d7d5f95acee 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -28,7 +28,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_subcpu2(*this, "sub2"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT16> m_videoram; optional_shared_ptr<UINT16> m_cyclwarr_cpua_ram; @@ -140,6 +141,7 @@ public: required_device<m68000_base_device> m_subcpu; optional_device<cpu_device> m_subcpu2; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in machine/tatsumi.c -----------*/ diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 62a8bd5d23b..9295d4f284c 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -12,7 +12,8 @@ public: m_vram6(*this, "vram6"), m_vram7(*this, "vram7"), m_scroll(*this, "scroll"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_s1; int m_s2; @@ -55,4 +56,5 @@ public: virtual void palette_init(); 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; }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 1ed419db0b9..f767fa9d8a3 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), - m_msm2(*this, "msm2") { } + m_msm2(*this, "msm2"), + m_gfxdecode(*this, "gfxdecode") { } int m_adpcm_pos[2]; int m_adpcm_end[2]; @@ -67,4 +68,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index af65949f09c..29b5b7edd6f 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -16,7 +16,8 @@ public: m_m68k_shared_ram(*this, "m68k_shared_ram"), m_sprite_ram(*this, "sprite_ram"), m_c45_road(*this, "c45_road"), - m_2dscreen(*this, "2dscreen") { } + m_2dscreen(*this, "2dscreen"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_m6809_irq_enable; UINT8 m_m68k_irq_enable; @@ -63,6 +64,8 @@ public: optional_device<namco_c45_road_device> m_c45_road; required_device<screen_device> m_2dscreen; + required_device<gfxdecode_device> m_gfxdecode; + TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 0284b60190c..d2d8f30f048 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -11,7 +11,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } int m_adpcm_pos; int m_adpcm_end; @@ -60,4 +61,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index fc342f1c806..11188d0104a 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -12,7 +12,8 @@ public: m_charram(*this, "charram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_colorram; @@ -56,4 +57,5 @@ public: UINT32 screen_update_tecmo16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 7a5727dfc9f..fc95b32b926 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -26,7 +26,8 @@ public: m_880000regs(*this, "880000regs"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_tilemap_paletteram16; @@ -95,4 +96,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index ef203e166ca..843e8b8a78a 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -17,7 +17,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } int m_track0[2]; int m_track1[2]; @@ -65,7 +66,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<msm5205_device> m_msm; - + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 77494b7b7e5..e6b2c684394 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_amazon_videoram(*this, "amazon_videoram"), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_amazon_videoram; @@ -39,4 +40,5 @@ public: UINT32 screen_update_amazon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index dc72f1f8357..16de1732c91 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -20,7 +20,8 @@ public: m_rocknms_sub_vram_bg(*this, "sub_vram_bg"), m_rocknms_sub_scroll_fg(*this, "sub_scroll_fg"), m_rocknms_sub_scroll_bg(*this, "sub_scroll_bg"), - m_rocknms_sub_rotregs(*this, "sub_rotregs") + m_rocknms_sub_rotregs(*this, "sub_rotregs"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -45,6 +46,7 @@ public: optional_shared_ptr<UINT16> m_rocknms_sub_scroll_fg; optional_shared_ptr<UINT16> m_rocknms_sub_scroll_bg; optional_shared_ptr<UINT16> m_rocknms_sub_rotregs; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_rocknms_sub_systemregs[0x10]; UINT16 m_rockn_protectdata; diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 2d1cd1754c8..3e31c896af5 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -10,7 +10,8 @@ public: m_scroll2(*this, "scroll2"), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), - m_mcu(*this, "mcu"){ } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; int m_nmi_enable; @@ -30,6 +31,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(thedeep_nmi_w); DECLARE_WRITE8_MEMBER(thedeep_sound_w); DECLARE_WRITE8_MEMBER(thedeep_protection_w); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 4d56721eb24..440a9d1ddc2 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -7,7 +7,8 @@ public: m_colorram(*this, "colorram"), m_attributesram(*this, "attributesram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_question_address; int m_question_rom; @@ -43,4 +44,5 @@ public: UINT32 screen_update_desertdan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 4a75c6a1de7..9480e9740a3 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_vregs; @@ -25,4 +26,5 @@ public: void thoop2_sort_sprites(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 392a7ed154b..8fa6dc6c9c1 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -4,7 +4,8 @@ class tiamc1_state : public driver_device public: tiamc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_tileram; UINT8 *m_charram; @@ -36,6 +37,7 @@ public: UINT32 screen_update_tiamc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 229e06e2329..1b8fd995977 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -11,7 +11,8 @@ public: m_ram16(*this, "ram16"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -38,4 +39,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 6d82edbb152..3c5da4f53c8 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -7,7 +7,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_nmi_enabled; @@ -35,4 +36,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index df646dd1bb1..313b2979de2 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -16,7 +16,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2") + m_spriteram2(*this, "spriteram2"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -28,6 +29,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_spriteram2; + required_device<gfxdecode_device> m_gfxdecode; + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index cab912ad97e..bd8680f5dcd 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -37,7 +37,8 @@ public: m_k053936(*this, "k053936"), m_k054000(*this, "k054000"), m_upd7759(*this, "upd"), - m_samples(*this, "samples"){ } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ optional_shared_ptr<UINT16> m_spriteram; @@ -85,6 +86,7 @@ public: optional_device<k054000_device> m_k054000; optional_device<upd7759_device> m_upd7759; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; /* memory buffers */ INT16 m_sampledata[0x40000]; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index cbda75aade3..4fc5f3c943e 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_dsp(*this, "dsp") { } + m_dsp(*this, "dsp"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_colorram1; required_shared_ptr<UINT16> m_colorram2; @@ -154,6 +155,7 @@ public: required_device<m68000_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_dsp; + required_device<gfxdecode_device> m_gfxdecode; }; class toaplan1_rallybik_state : public toaplan1_state diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index e98b39c3aad..57f729b980c 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -37,7 +37,8 @@ public: m_oki(*this, "oki"), m_oki1(*this, "oki1"), m_eeprom(*this, "eeprom"), - m_rtc(*this, "rtc") { } + m_rtc(*this, "rtc"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_shared_ram; // 8 bit RAM shared between 68K and sound CPU optional_shared_ptr<UINT16> m_shared_ram16; // Really 8 bit RAM connected to Z180 @@ -56,6 +57,7 @@ public: optional_device<okim6295_device> m_oki1; optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<upd4992_device> m_rtc; + required_device<gfxdecode_device> m_gfxdecode; UINT16 m_mcu_data; UINT16 m_video_status; diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 957d237c974..544ebdabb79 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -15,7 +15,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_seibu_sound(*this, "seibu_sound"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_background1_videoram16; @@ -27,6 +28,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<seibu_sound_device> m_seibu_sound; optional_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; int m_msm5205next; int m_toggle; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 3c5206374cf..b33b4164867 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -29,7 +29,8 @@ public: m_filter1l(*this, "filter1l"), m_filter1r(*this, "filter1r"), m_filter2(*this, "filter2"), - m_filter3(*this, "filter3") { } + m_filter3(*this, "filter3"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_spritemap; required_shared_ptr<UINT16> m_raster_ctrl; @@ -48,6 +49,7 @@ public: required_device<filter_volume_device> m_filter1r; required_device<filter_volume_device> m_filter2; required_device<filter_volume_device> m_filter3; + required_device<gfxdecode_device> m_gfxdecode; // Misc UINT16 m_cpua_ctrl; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index bdd009ee909..2f12d80d4fc 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -21,7 +21,8 @@ public: m_namco15xx(*this, "namco"), m_namco58xx(*this, "58xx"), m_namco56xx_1(*this, "56xx_1"), - m_namco56xx_2(*this, "56xx_2") { } + m_namco56xx_2(*this, "56xx_2"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -35,6 +36,7 @@ public: required_device<namco58xx_device> m_namco58xx; required_device<namco56xx_device> m_namco56xx_1; required_device<namco56xx_device> m_namco56xx_2; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 79fb4407ce9..c29a1a2c221 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -13,7 +13,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_bg_colorram(*this, "bg_colorram"), m_fg_colorram(*this, "fg_colorram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_audiocpu; required_shared_ptr<UINT8> m_palette_bank; @@ -26,6 +27,7 @@ public: required_shared_ptr<UINT8> m_bg_colorram; required_shared_ptr<UINT8> m_fg_colorram; required_shared_ptr<UINT8> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 6d522d28927..af33eca9c90 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -20,7 +20,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -34,6 +35,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<sn76496_device> m_sn; optional_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 630011d4f26..20429c183ae 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -29,4 +30,5 @@ public: void set_scroll( ); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index d1087a650ca..775b3539154 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -33,7 +33,8 @@ public: m_code_ram(*this, "code_ram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_cmos[16]; UINT8 m_da_latch; @@ -65,7 +66,7 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<samples_device> m_samples; - + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index e589ccf7532..ab650b6d410 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_gfxdecode(*this, "gfxdecode") { } int m_cur_dac_address; int m_cur_dac_address_index; @@ -34,6 +35,7 @@ public: INTERRUPT_GEN_MEMBER(trucocl_interrupt); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 40e9c902ca1..f81213b5a35 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -8,7 +8,8 @@ public: m_spriteram2(*this, "spriteram2"), m_gfx_control(*this, "gfx_control"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -40,4 +41,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 1f221d29773..9f13288f164 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -10,7 +10,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_audio2(*this, "audio2"), - m_audio3(*this, "audio3") { } + m_audio3(*this, "audio3"), + m_gfxdecode(*this, "gfxdecode") { } int m_nmi_enabled; int m_sound_command1; @@ -70,4 +71,5 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_audio2; optional_device<cpu_device> m_audio3; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index c21767ace1a..985c113a454 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -15,7 +15,8 @@ public: m_sprgen(*this, "spritegen"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ @@ -45,6 +46,8 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; + required_device<gfxdecode_device> m_gfxdecode; + UINT8 m_semicom_prot_offset; UINT16 m_protbase; DECLARE_WRITE16_MEMBER(tumblepb_oki_w); diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index ea0e469f4e2..f097901c7f3 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -6,7 +6,8 @@ public: m_workram(*this, "workram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_control; required_shared_ptr<UINT8> m_workram; @@ -32,4 +33,5 @@ public: void draw_shell(bitmap_ind16 &bitmap, const rectangle &cliprect, int picture_code, int hposition,int vstart,int vstop,int vstretch,int hstretch); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 58711b4a15c..c1a1a86eccb 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -29,7 +29,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_sprite_position(*this, "spritepos"), - m_samples(*this, "samples") + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } /* device/memory pointers */ @@ -46,6 +47,8 @@ public: required_shared_ptr<UINT8> m_sprite_position; required_device<samples_device> m_samples; + + required_device<gfxdecode_device> m_gfxdecode; UINT8 * m_buckrog_bitmap_ram; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 7243dfc6b1a..5c979b5b881 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -16,7 +16,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_k007232(*this, "k007232"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_gfxdecode(*this, "gfxdecode") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_text_ram; @@ -72,6 +73,7 @@ public: optional_device<cpu_device> m_subcpu; required_device<k007232_device> m_k007232; required_device<upd7759_device> m_upd7759; + required_device<gfxdecode_device> m_gfxdecode; }; class cuebrickj_state : public twin16_state diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 1a4b07fa70a..debdbc06a5d 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), - m_spritegen(*this, "toaplan_scu") + m_spritegen(*this, "toaplan_scu"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT8> m_sharedram; @@ -123,6 +124,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_dsp; required_device<toaplan_scu_device> m_spritegen; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index d89ea4e97d3..516c4d10896 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -18,7 +18,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_da_latch; @@ -52,6 +53,7 @@ public: TIMER_CALLBACK_MEMBER(nmi_callback); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 043cbc077d8..59feae0a224 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -29,7 +29,8 @@ public: m_eeprom(*this, "eeprom"), m_ram(*this, "ram"), m_shared_ram(*this, "shared_ram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_subcpu; @@ -45,6 +46,8 @@ public: UINT16 m_rotate_ctrl[8]; UINT8 m_dislayer[6]; required_shared_ptr<UINT32> m_spriteram; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE32_MEMBER(color_ram_w); DECLARE_READ32_MEMBER(undrfire_input_r); DECLARE_WRITE32_MEMBER(undrfire_input_w); diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 00cfdd37658..aaec3a27b68 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -8,7 +8,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } UINT16* m_vram; UINT16* m_scroll; @@ -47,4 +48,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; optional_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 9fdca29f66e..12e5b761fa5 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_charram(*this, "charram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -20,4 +21,5 @@ public: virtual void palette_init(); UINT32 screen_update_usgames(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 3e04c9c2486..02c4ab31aab 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -9,7 +9,8 @@ public: m_sprite_priority(*this, "sprite_priority"), m_sharedram(*this, "sharedram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_bg1videoram; required_shared_ptr<UINT8> m_bg2videoram; @@ -46,4 +47,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index e3d5f18922d..b7e9c40319e 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -8,7 +8,8 @@ public: m_vb_scrolly_lo(*this, "vb_scrolly_lo"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vb_attribram; required_shared_ptr<UINT8> m_vb_videoram; @@ -42,4 +43,5 @@ public: inline int scanline_to_vcount(int scanline); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index d3cf830ad9d..73fe699f7f9 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -27,7 +27,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } attotime m_time_pushed; attotime m_time_released; @@ -54,6 +55,7 @@ public: double calc_plunger_pos(); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 6a66f1de330..71732bbe6a3 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -8,13 +8,15 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audio(*this, "m72") { } + m_audio(*this, "m72"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; required_device<cpu_device> m_maincpu; required_device<m72_audio_device> m_audio; + required_device<gfxdecode_device> m_gfxdecode; int m_horiz_scroll_low; int m_horiz_scroll_high; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 86ef0c88dd5..083eccc1890 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_scroll_low; required_shared_ptr<UINT8> m_scroll_high; @@ -30,4 +31,5 @@ public: INTERRUPT_GEN_MEMBER(vulgus_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index c0b5177f513..8a37f402d6a 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -9,7 +9,8 @@ public: m_warpwarp_sound(*this, "warpwarp_custom"), m_geebee_sound(*this, "geebee_custom"), m_geebee_videoram(*this, "geebee_videoram"), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -17,6 +18,7 @@ public: optional_device<geebee_sound_device> m_geebee_sound; optional_shared_ptr<UINT8> m_geebee_videoram; optional_shared_ptr<UINT8> m_videoram; + required_device<gfxdecode_device> m_gfxdecode; int m_geebee_bgw; int m_ball_on; int m_ball_h; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index ff72e17d45a..1d3ac3b1115 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -29,7 +29,8 @@ public: m_2610_1l(*this, "2610.1.l"), m_2610_1r(*this, "2610.1.r"), m_2610_2l(*this, "2610.2.l"), - m_2610_2r(*this, "2610.2.r") { } + m_2610_2r(*this, "2610.2.r"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -52,6 +53,8 @@ public: required_device<filter_volume_device> m_2610_1r; required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(warriorb_sound_w); DECLARE_READ16_MEMBER(warriorb_sound_r); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 74150611fe5..79ff188887f 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -20,7 +20,8 @@ public: m_scroll2yhi(*this, "scroll2yhi"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } typedef void (wc90_state::*draw_sprites_func)(bitmap_ind16 &, const rectangle &, int, int, int, int, int ); @@ -71,4 +72,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 611cb2bc2eb..7cb441a4ea5 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } int m_msm5205next; int m_toggle; @@ -51,4 +52,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index d28aef9934b..d0b85d66e08 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -21,7 +21,8 @@ public: m_k007232(*this, "k007232"), m_k007232_1(*this, "k007232_1"), m_k007232_2(*this, "k007232_2"), - m_k007232_3(*this, "k007232_3") { } + m_k007232_3(*this, "k007232_3"), + m_gfxdecode(*this, "gfxdecode") { } optional_shared_ptr<UINT16> m_videostatus; optional_shared_ptr<UINT16> m_protection_ram; @@ -105,6 +106,7 @@ public: optional_device<k007232_device> m_k007232_1; optional_device<k007232_device> m_k007232_2; optional_device<k007232_device> m_k007232_3; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/wecleman.c -----------*/ diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index fe89f533e04..0c0f52937a4 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -10,7 +10,8 @@ public: m_charvideoram(*this, "charvideoram"), m_spr_old(*this, "vsystem_spr_old"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_pending_command; @@ -46,4 +47,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 22eb08f61dc..2acb5b23b0b 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -31,7 +31,8 @@ public: m_subcpu(*this, "sub"), m_tc0100scn(*this, "tc0100scn"), m_tc0140syt(*this, "tc0140syt"), - m_tc0220ioc(*this, "tc0220ioc") { } + m_tc0220ioc(*this, "tc0220ioc"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_spritemap; @@ -64,6 +65,8 @@ public: required_device<tc0100scn_device> m_tc0100scn; required_device<tc0140syt_device> m_tc0140syt; required_device<tc0220ioc_device> m_tc0220ioc; + required_device<gfxdecode_device> m_gfxdecode; + DECLARE_READ16_MEMBER(sharedram_r); DECLARE_WRITE16_MEMBER(sharedram_w); DECLARE_WRITE16_MEMBER(cpua_ctrl_w); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 50a98903643..fb31a38a546 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -20,7 +20,8 @@ public: m_williams2_tileram(*this, "williams2_tile"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_soundcpu_b(*this, "soundcpu_b") { } + m_soundcpu_b(*this, "soundcpu_b"), + m_gfxdecode(*this, "gfxdecode") { } enum { @@ -164,6 +165,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; optional_device<cpu_device> m_soundcpu_b; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 7875040705c..6377d7a5792 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -7,7 +7,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -28,4 +29,5 @@ public: INTERRUPT_GEN_MEMBER(sound_timer_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index cd1c441de0d..d1f3da4f045 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -15,7 +15,8 @@ public: m_sprite_bank(*this, "sprite_bank"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_gfxdecode(*this, "gfxdecode") { } int m_dsc0; int m_dsc1; @@ -64,4 +65,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<discrete_device> m_discrete; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 8606de4284c..b75e2613d5e 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -12,12 +12,14 @@ public: : driver_device(mconfig, type, tag), m_alpha_num_ram(*this, "alpha_num_ram"), m_maincpu(*this, "maincpu"), - m_s14001a(*this, "speech") { } + m_s14001a(*this, "speech"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_alpha_num_ram; required_device<cpu_device> m_maincpu; required_device<s14001a_device> m_s14001a; + required_device<gfxdecode_device> m_gfxdecode; int m_collision; unsigned m_current_index; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 6a85d9e52d5..7caeb61eabb 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -7,7 +7,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_shareram(*this, "shareram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tilemap_t *m_pant[2]; required_shared_ptr<UINT16> m_videoram; @@ -28,4 +29,5 @@ public: UINT32 screen_update_wrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 7600910f8c5..7b966b1fd22 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -7,7 +7,8 @@ public: m_fg0_videoram(*this, "fg0_videoram"), m_bg0_videoram(*this, "bg0_videoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode") { } int m_vblank; int m_scrollx; @@ -33,4 +34,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index ac572368222..41741ac4b29 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -10,7 +10,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_gfxdecode(*this, "gfxdecode") { } int m_vblank; int m_from_main; @@ -81,4 +82,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; optional_device<cpu_device> m_mcu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index d22b8018783..1fa32a07824 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT16> m_videoram; tilemap_t *m_bg_tilemap; @@ -27,4 +28,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 84f0e235699..8f536175746 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -7,7 +7,8 @@ public: m_fgram(*this, "fgram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_status; required_shared_ptr<UINT8> m_bgram; @@ -38,4 +39,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index e4ef11175ce..f3b9e9ef9a9 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -4,7 +4,8 @@ public: xyonix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vidram(*this, "vidram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vidram; tilemap_t *m_tilemap; @@ -23,4 +24,5 @@ public: UINT32 screen_update_xyonix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void handle_coins(int coin); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 715c502ae05..6b1668a823b 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -11,7 +11,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), - m_vlm(*this, "vlm") { } + m_vlm(*this, "vlm"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -22,6 +23,7 @@ public: required_device<cpu_device> m_maincpu; required_device<sn76489a_device> m_sn; required_device<vlm5030_device> m_vlm; + required_device<gfxdecode_device> m_gfxdecode; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 71ab3764dc8..cdd4ba04053 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -16,7 +16,8 @@ public: m_priorityram(*this, "priorityram"), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_0; @@ -50,4 +51,5 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 4b997362964..87d9651fc84 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -12,7 +12,8 @@ public: : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_gfxdecode(*this, "gfxdecode") { } /* video-related */ tilemap_t *m_tilemap_0; @@ -47,4 +48,5 @@ public: DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 3fc188e1be7..e52aaf3553a 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -8,14 +8,16 @@ public: m_videoram(*this, "videoram"), m_s2636_0_ram(*this, "s2636_0_ram"), m_maincpu(*this, "maincpu"), - m_s2636_sound(*this, "s2636snd") { } + m_s2636_sound(*this, "s2636snd"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_s2636_0_ram; required_device<cpu_device> m_maincpu; required_device<s2636_device> m_s2636_sound; - + required_device<gfxdecode_device> m_gfxdecode; + bitmap_ind16 m_bitmap; bitmap_ind16 m_spritebitmap; int m_CollisionBackground; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index b739f2fe879..ab9aa733875 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_audio2(*this, "audio2"), - m_dac2(*this, "dac2") { } + m_dac2(*this, "dac2"), + m_gfxdecode(*this, "gfxdecode") { } int m_dsw; int m_active_8910; @@ -58,4 +59,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_audio2; required_device<dac_device> m_dac2; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 33bca4b9bb1..09c09679c2c 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_spriteram; @@ -89,6 +90,7 @@ public: void zaxxonj_decode(const char *cputag); required_device<cpu_device> m_maincpu; optional_device<samples_device> m_samples; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index c4c42b0bd8d..1d645072b70 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -14,7 +14,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_vram(*this, "videoram") + m_vram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } // in drivers/zerozone.c @@ -32,6 +33,7 @@ public: required_shared_ptr<UINT16> m_vram; // currently this driver uses generic palette handling + required_device<gfxdecode_device> m_gfxdecode; // state // video-related UINT16 m_tilebank; diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 5d15d701bf4..baf232d0572 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -12,7 +12,8 @@ public: m_videoram_2(*this, "videoram_2"), m_attributeram(*this, "attributeram"), m_spriteram(*this, "spriteram"), - m_bulletsram(*this, "bulletsram") + m_bulletsram(*this, "bulletsram"), + m_gfxdecode(*this, "gfxdecode") { } // in drivers/zodiack.c @@ -40,6 +41,8 @@ public: required_shared_ptr<UINT8> m_attributeram; required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_bulletsram; + + required_device<gfxdecode_device> m_gfxdecode; // state tilemap_t *m_bg_tilemap; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index baa8c010cae..b702c14f401 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -971,7 +971,8 @@ atarigen_state::atarigen_state(const machine_config &mconfig, device_type type, m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_soundcomm(*this, "soundcomm") + m_soundcomm(*this, "soundcomm"), + m_gfxdecode(*this, "gfxdecode") { } diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 04b689966b8..664b7a9ab8b 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -426,6 +426,7 @@ public: optional_device<okim6295_device> m_oki; optional_device<atari_sound_comm_device> m_soundcomm; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c index 3b80b72caf4..d8984464efa 100644 --- a/src/mess/drivers/a5105.c +++ b/src/mess/drivers/a5105.c @@ -49,7 +49,8 @@ public: m_floppy2(*this, "upd765a:2"), m_floppy3(*this, "upd765a:3"), m_video_ram(*this, "video_ram"), - m_ram(*this, RAM_TAG) + m_ram(*this, RAM_TAG), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -84,6 +85,7 @@ public: virtual void palette_init(); DECLARE_FLOPPY_FORMATS( floppy_formats ); required_device<ram_device> m_ram; + required_device<gfxdecode_device> m_gfxdecode; }; /* TODO */ diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c index 82cf7194a3f..de4ff424181 100644 --- a/src/mess/drivers/apexc.c +++ b/src/mess/drivers/apexc.c @@ -17,7 +17,8 @@ class apexc_state : public driver_device public: apexc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT32 m_panel_data_reg; /* value of a data register on the control panel which can be edited - the existence of this register is a personnal @@ -45,6 +46,7 @@ public: void apexc_teletyper_linefeed(); void apexc_teletyper_putchar(int character); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; void apexc_state::machine_start() diff --git a/src/mess/drivers/ax20.c b/src/mess/drivers/ax20.c index 2157340191a..239f4ed9df6 100644 --- a/src/mess/drivers/ax20.c +++ b/src/mess/drivers/ax20.c @@ -26,9 +26,9 @@ class ax20_state : public driver_device public: ax20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - , - m_p_vram(*this, "p_vram"){ } + m_maincpu(*this, "maincpu"), + m_p_vram(*this, "p_vram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -36,6 +36,7 @@ public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_shared_ptr<UINT8> m_p_vram; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c index 56686417df1..6ad72618c3c 100644 --- a/src/mess/drivers/b16.c +++ b/src/mess/drivers/b16.c @@ -27,7 +27,8 @@ public: : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_dma8237(*this, "8237dma"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_char_rom; required_shared_ptr<UINT16> m_vram; @@ -50,6 +51,7 @@ public: virtual void machine_start(); virtual void machine_reset(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; #define mc6845_h_char_total (m_crtc_vreg[0]) diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index 94a2cd3fb02..081115970dd 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -159,9 +159,9 @@ public: casloopy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bios_rom(*this, "bios_rom"), - m_vregs(*this, "vregs") - , - m_maincpu(*this, "maincpu") { } + m_vregs(*this, "vregs"), + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT32> m_bios_rom; required_shared_ptr<UINT32> m_vregs; @@ -186,6 +186,7 @@ public: DECLARE_READ8_MEMBER(casloopy_bitmap_r); DECLARE_WRITE8_MEMBER(casloopy_bitmap_w); required_device<cpu_device> m_maincpu; + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c index def94b38c1d..22f96cb34f8 100644 --- a/src/mess/drivers/fp6000.c +++ b/src/mess/drivers/fp6000.c @@ -31,7 +31,8 @@ public: m_gvram(*this, "gvram"), m_vram(*this, "vram"), m_maincpu(*this, "maincpu") - , m_crtc(*this, "crtc") + , m_crtc(*this, "crtc"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_char_rom; @@ -57,6 +58,7 @@ public: UINT32 screen_update_fp6000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<mc6845_device>m_crtc; + required_device<gfxdecode_device> m_gfxdecode; }; void fp6000_state::video_start() diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c index 6412d2ec2f9..1721e8b50c7 100644 --- a/src/mess/drivers/hp9k.c +++ b/src/mess/drivers/hp9k.c @@ -122,7 +122,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), //m_terminal(*this, TERMINAL_TAG), - m_6845(*this, "mc6845") + m_6845(*this, "mc6845"), + m_gfxdecode(*this, "gfxdecode") { kbdBit=0; crtc_curreg=0; @@ -160,6 +161,8 @@ public: DECLARE_WRITE8_MEMBER(kbd_put); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + + required_device<gfxdecode_device> m_gfxdecode; }; // diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c index 686436e9ce0..5c3e311395a 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -231,7 +231,8 @@ public: , m_keyrow14(*this, "ROW14") , m_keyrow15(*this, "ROW15") , m_keyrow16(*this, "ROW16") - , m_vram(*this, "vram") + , m_vram(*this, "vram"), + m_gfxdecode(*this, "gfxdecode") { } // devices @@ -278,6 +279,7 @@ private: UINT8 m_unk; UINT8 m_bank; UINT8 m_kbdrow, m_kbdcol, m_kbdclk, m_kbdread; + required_device<gfxdecode_device> m_gfxdecode; }; void itt3030_state::video_start() diff --git a/src/mess/drivers/jr200.c b/src/mess/drivers/jr200.c index f9e6c447682..09e567842ea 100644 --- a/src/mess/drivers/jr200.c +++ b/src/mess/drivers/jr200.c @@ -44,7 +44,8 @@ public: m_row6(*this, "ROW6"), m_row7(*this, "ROW7"), m_row8(*this, "ROW8"), - m_row9(*this, "ROW9") { } + m_row9(*this, "ROW9"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; @@ -88,6 +89,7 @@ protected: required_ioport m_row7; required_ioport m_row8; required_ioport m_row9; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index c488cbbdb98..d29999d7a22 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -69,13 +69,15 @@ public: m_maincpu(*this, "maincpu"), m_rtc(*this, RP5C15_TAG), m_pit(*this, "pit"), - m_beeper(*this, "beeper") + m_beeper(*this, "beeper"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<rp5c15_device> m_rtc; required_device<pit8253_device> m_pit; required_device<beep_device> m_beeper; + required_device<gfxdecode_device> m_gfxdecode; UINT8 *m_main_ram; UINT8 *m_ipl_rom; diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c index 762ef8e9f08..54a62d5c498 100644 --- a/src/mess/drivers/paso1600.c +++ b/src/mess/drivers/paso1600.c @@ -25,7 +25,8 @@ public: m_dma(*this, "8237dma"), m_crtc(*this, "crtc"), m_p_vram(*this, "vram"), - m_p_gvram(*this, "gvram"){ } + m_p_gvram(*this, "gvram"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; required_device<pic8259_device> m_pic; @@ -47,6 +48,7 @@ public: UINT8 *m_p_pcg; required_shared_ptr<UINT16> m_p_vram; required_shared_ptr<UINT16> m_p_gvram; + required_device<gfxdecode_device> m_gfxdecode; struct{ UINT8 portb; diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index 82294ebb74d..d3183f23cce 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -73,7 +73,8 @@ public: m_maincpu(*this, "maincpu"), m_fdc(*this, "upd765"), m_dmac(*this, "dmac"), - m_palram(*this, "palram"){ } + m_palram(*this, "palram"), + m_gfxdecode(*this, "gfxdecode"){ } required_device<cpu_device> m_maincpu; required_device<upd765a_device> m_fdc; @@ -181,6 +182,7 @@ public: protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 44d3ac62252..91f768a4c6a 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -449,7 +449,8 @@ public: m_video_ram_1(*this, "video_ram_1"), m_video_ram_2(*this, "video_ram_2"), m_beeper(*this, "beeper"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<am9517a_device> m_dmac; @@ -747,6 +748,7 @@ public: DECLARE_DRIVER_INIT(pc9801_kanji); IRQ_CALLBACK_MEMBER(irq_callback); inline void set_dma_channel(int channel, int state); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index c954c6acfde..630e7e314b4 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -143,7 +143,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "pv1000_sound"), - m_p_videoram(*this, "p_videoram") + m_p_videoram(*this, "p_videoram"), + m_gfxdecode(*this, "gfxdecode") { } DECLARE_WRITE8_MEMBER(pv1000_io_w); @@ -172,6 +173,7 @@ public: TIMER_CALLBACK_MEMBER(d65010_irq_on_cb); TIMER_CALLBACK_MEMBER(d65010_irq_off_cb); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( pv1000_cart ); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index e011d9aa182..c1d17d6f447 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -55,7 +55,8 @@ public: m_crtc(*this, "crtc"), m_fdc(*this, "fdc"), m_sn(*this, "sn1"), - m_beeper(*this, "beeper") + m_beeper(*this, "beeper"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -125,6 +126,7 @@ public: DECLARE_WRITE_LINE_MEMBER(smc777_fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(smc777_fdc_drq_w); void check_floppy_inserted(); + optional_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index 23d6ed83eee..f9dc5c7c46e 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -119,7 +119,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_soundram(*this, "soundram") + m_soundram(*this, "soundram"), + m_gfxdecode(*this, "gfxdecode") { m_m6502_reset = 0; } @@ -225,6 +226,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void mark_active_tilemap_all_dirty(int layer); void supracan_suprnova_draw_roz(bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound/*, int columnscroll, UINT32* scrollram*/, int transmask); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c index 94fa221a35d..f4a3f8a31ab 100644 --- a/src/mess/drivers/ti99_2.c +++ b/src/mess/drivers/ti99_2.c @@ -88,7 +88,8 @@ public: ti99_2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; int m_ROM_paged; @@ -105,6 +106,7 @@ public: UINT32 screen_update_ti99_2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ti99_2_vblank_interrupt); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c index e5d50e24aa1..e9ec26b9037 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -36,7 +36,8 @@ public: : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_ppi(*this, "ppi") + m_ppi(*this, "ppi"), + m_gfxdecode(*this, "gfxdecode") { } @@ -51,6 +52,7 @@ private: UINT8 m_term_data; required_device<cpu_device> m_maincpu; required_device<i8255_device> m_ppi; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/ac1.h b/src/mess/includes/ac1.h index dabad01869d..06ccd0d702f 100644 --- a/src/mess/includes/ac1.h +++ b/src/mess/includes/ac1.h @@ -16,7 +16,8 @@ public: ac1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cassette(*this, "cassette"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cassette_image_device> m_cassette; DECLARE_DRIVER_INIT(ac1); @@ -29,6 +30,7 @@ public: DECLARE_WRITE8_MEMBER(ac1_port_a_w); DECLARE_WRITE8_MEMBER(ac1_port_b_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h index de594690cac..9c949a33b03 100644 --- a/src/mess/includes/apple1.h +++ b/src/mess/includes/apple1.h @@ -35,7 +35,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_gfxdecode(*this, "gfxdecode") { } int m_vh_clrscrn_pressed; int m_kbd_data; @@ -82,6 +83,7 @@ public: attotime apple1_vh_dsp_time_to_ready(); DECLARE_SNAPSHOT_LOAD_MEMBER( apple1 ); required_device<ram_device> m_ram; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h index 760c39bca9c..f8cddaf58ff 100644 --- a/src/mess/includes/aquarius.h +++ b/src/mess/includes/aquarius.h @@ -34,7 +34,8 @@ public: m_y4(*this, "Y4"), m_y5(*this, "Y5"), m_y6(*this, "Y6"), - m_y7(*this, "Y7") + m_y7(*this, "Y7"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -52,6 +53,7 @@ public: required_ioport m_y5; required_ioport m_y6; required_ioport m_y7; + required_device<gfxdecode_device> m_gfxdecode; UINT8 m_scrambler; tilemap_t *m_tilemap; diff --git a/src/mess/includes/arcadia.h b/src/mess/includes/arcadia.h index 3f12cced2ac..019f98b7b63 100644 --- a/src/mess/includes/arcadia.h +++ b/src/mess/includes/arcadia.h @@ -39,7 +39,8 @@ public: m_controller2_col3(*this, "controller2_col3"), m_controller2_extra(*this, "controller2_extra"), m_joysticks(*this, "joysticks") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } DECLARE_READ8_MEMBER(arcadia_vsync_r); DECLARE_READ8_MEMBER(arcadia_video_r); @@ -113,5 +114,6 @@ protected: int arcadia_sprite_collision(int n1, int n2); void arcadia_draw_sprites(); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; #endif /* ARCADIA_H_ */ diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h index 1cd3a2d1797..a6a96beeb91 100644 --- a/src/mess/includes/cgenie.h +++ b/src/mess/includes/cgenie.h @@ -47,7 +47,8 @@ public: m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), m_ram(*this, RAM_TAG), - m_ay8910(*this, "ay8910") + m_ay8910(*this, "ay8910"), + m_gfxdecode(*this, "gfxdecode") { } @@ -90,6 +91,7 @@ public: required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; required_device<ay8910_device> m_ay8910; + required_device<gfxdecode_device> m_gfxdecode; void cgenie_offset_xy(); int cgenie_get_register(int indx); diff --git a/src/mess/includes/galeb.h b/src/mess/includes/galeb.h index 084e5e1a2ce..674e6c47a6e 100644 --- a/src/mess/includes/galeb.h +++ b/src/mess/includes/galeb.h @@ -14,13 +14,15 @@ public: galeb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_video_ram; DECLARE_READ8_MEMBER(galeb_keyboard_r); virtual void video_start(); UINT32 screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in video/galeb.c -----------*/ diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h index 029c3d535e5..d2e980e35eb 100644 --- a/src/mess/includes/intv.h +++ b/src/mess/includes/intv.h @@ -40,7 +40,8 @@ public: m_bank4(*this, "bank4"), m_io_options(*this, "OPTIONS"), m_io_ecs_cntrlsel(*this, "ECS_CNTRLSEL"), - m_io_test(*this, "TEST") { } + m_io_test(*this, "TEST"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; required_device<sp0256_device> m_intellivoice; @@ -140,6 +141,8 @@ protected: required_ioport m_io_options; optional_ioport m_io_ecs_cntrlsel; optional_ioport m_io_test; + + optional_device<gfxdecode_device> m_gfxdecode; ioport_port *m_keypad[4]; ioport_port *m_disc[4]; diff --git a/src/mess/includes/kramermc.h b/src/mess/includes/kramermc.h index 8d5f8f9ac78..d058d3707f8 100644 --- a/src/mess/includes/kramermc.h +++ b/src/mess/includes/kramermc.h @@ -14,7 +14,8 @@ class kramermc_state : public driver_device public: kramermc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_key_row; DECLARE_DRIVER_INIT(kramermc); @@ -25,6 +26,7 @@ public: DECLARE_READ8_MEMBER(kramermc_port_b_r); DECLARE_WRITE8_MEMBER(kramermc_port_a_w); required_device<cpu_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/microtan.h b/src/mess/includes/microtan.h index fbdfe6c1563..151d5585c74 100644 --- a/src/mess/includes/microtan.h +++ b/src/mess/includes/microtan.h @@ -34,7 +34,8 @@ public: m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), m_via6522_0(*this, "via6522_0"), - m_via6522_1(*this, "via6522_1") + m_via6522_1(*this, "via6522_1"), + m_gfxdecode(*this, "gfxdecode") { } required_shared_ptr<UINT8> m_videoram; @@ -81,6 +82,7 @@ public: required_device<cassette_image_device> m_cassette; required_device<via6522_device> m_via6522_0; required_device<via6522_device> m_via6522_1; + required_device<gfxdecode_device> m_gfxdecode; UINT8 read_dsw(); void microtan_set_irq_line(); void store_key(int key); diff --git a/src/mess/includes/mz700.h b/src/mess/includes/mz700.h index db755b9aae6..a89a63ee7af 100644 --- a/src/mess/includes/mz700.h +++ b/src/mess/includes/mz700.h @@ -30,7 +30,8 @@ public: m_ppi(*this, "ppi8255"), m_cassette(*this, "cassette"), m_centronics(*this, "centronics"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_gfxdecode(*this, "gfxdecode") { } int m_mz700; /* 1 if running on an mz700 */ @@ -110,6 +111,7 @@ public: required_device<cassette_image_device> m_cassette; optional_device<centronics_device> m_centronics; required_device<ram_device> m_ram; + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index 9e03e39d068..8440837aa46 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -39,7 +39,8 @@ public: m_hd6402(*this, "hd6402"), m_cassette(*this, "cassette"), m_ram(*this, RAM_TAG), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -71,6 +72,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( nascom1_cassette ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette ); DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 ); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h index 71f08fe9c09..9ed8463b60c 100644 --- a/src/mess/includes/p2000t.h +++ b/src/mess/includes/p2000t.h @@ -20,7 +20,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), - m_videoram(*this, "videoram") + m_videoram(*this, "videoram"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -45,6 +46,7 @@ public: DECLARE_PALETTE_INIT(p2000m); UINT32 screen_update_p2000m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(p2000_interrupt); + optional_device<gfxdecode_device> m_gfxdecode; }; #endif /* P2000T_H_ */ diff --git a/src/mess/includes/pc1251.h b/src/mess/includes/pc1251.h index bed5b8425b1..687384cbd2a 100644 --- a/src/mess/includes/pc1251.h +++ b/src/mess/includes/pc1251.h @@ -25,7 +25,8 @@ public: pc1251_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_outa; UINT8 m_outb; @@ -47,6 +48,7 @@ public: virtual void machine_start(); DECLARE_MACHINE_START(pc1260); required_device<sc61860_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h index 207a7525da5..dff36c09a10 100644 --- a/src/mess/includes/pc1401.h +++ b/src/mess/includes/pc1401.h @@ -25,7 +25,8 @@ public: pc1401_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_portc; UINT8 m_outa; @@ -46,7 +47,7 @@ public: virtual void machine_start(); required_device<sc61860_device> m_maincpu; - + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h index fa734f47222..9fb2a73d3e7 100644 --- a/src/mess/includes/pc1403.h +++ b/src/mess/includes/pc1403.h @@ -25,7 +25,8 @@ public: pc1403_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 m_portc; UINT8 m_outa; @@ -50,6 +51,7 @@ public: virtual void video_start(); virtual void machine_start(); required_device<sc61860_device> m_maincpu; + required_device<gfxdecode_device> m_gfxdecode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/includes/pdp1.h b/src/mess/includes/pdp1.h index 748b0524b99..55cca5cbbf7 100644 --- a/src/mess/includes/pdp1.h +++ b/src/mess/includes/pdp1.h @@ -234,7 +234,8 @@ class pdp1_state : public driver_device public: pdp1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } pdp1_reset_param_t m_reset_param; int m_io_status; @@ -297,5 +298,6 @@ public: void drum_write(int field, int position, UINT32 data); void pdp1_keyboard(); void pdp1_lightpen(); + required_device<gfxdecode_device> m_gfxdecode; }; #endif /* PDP1_H_ */ diff --git a/src/mess/includes/tx0.h b/src/mess/includes/tx0.h index 7c2d678d61e..278d5b0c489 100644 --- a/src/mess/includes/tx0.h +++ b/src/mess/includes/tx0.h @@ -132,7 +132,8 @@ class tx0_state : public driver_device public: tx0_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } tape_reader_t m_tape_reader; tape_puncher_t m_tape_puncher; @@ -194,6 +195,7 @@ public: DECLARE_WRITE_LINE_MEMBER(tx0_sel); DECLARE_WRITE_LINE_MEMBER(tx0_io_reset_callback); void magtape_callback(); + required_device<gfxdecode_device> m_gfxdecode; }; /* defines for each bit and mask in input port "CSW" */ diff --git a/src/mess/includes/ut88.h b/src/mess/includes/ut88.h index 178358b5a9d..a22900205b2 100644 --- a/src/mess/includes/ut88.h +++ b/src/mess/includes/ut88.h @@ -42,7 +42,8 @@ public: m_io_line6(*this, "LINE6"), m_io_line7(*this, "LINE7"), m_io_line8(*this, "LINE8") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cassette_image_device> m_cassette; optional_device<i8255_device> m_ppi; @@ -83,6 +84,7 @@ protected: optional_ioport m_io_line7; optional_ioport m_io_line8; required_device<cpu_device> m_maincpu; + optional_device<gfxdecode_device> m_gfxdecode; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/vtech2.h b/src/mess/includes/vtech2.h index 948af1f2d2d..c85b89d9dce 100644 --- a/src/mess/includes/vtech2.h +++ b/src/mess/includes/vtech2.h @@ -18,7 +18,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), - m_cassette(*this, "cassette") { } + m_cassette(*this, "cassette"), + m_gfxdecode(*this, "gfxdecode") { } UINT8 *m_videoram; int m_laser_latch; @@ -81,6 +82,7 @@ public: void laser_get_track(); void laser_put_track(); device_t *laser_file(); + required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h index 43cc3314fd3..8ce105965c0 100644 --- a/src/mess/includes/x1.h +++ b/src/mess/includes/x1.h @@ -79,7 +79,8 @@ public: m_cassette(*this, "cassette"), m_fdc(*this, "fdc"), m_crtc(*this, "crtc"), - m_ctc(*this, "ctc") + m_ctc(*this, "ctc"), + m_gfxdecode(*this, "gfxdecode") { } required_device<cpu_device> m_maincpu; @@ -228,6 +229,7 @@ public: DECLARE_WRITE8_MEMBER(memory_write_byte); DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); + required_device<gfxdecode_device> m_gfxdecode; }; /*----------- defined in machine/x1.c -----------*/ diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h index 15dc2c3c851..ad1dcba6ee0 100644 --- a/src/mess/includes/x68k.h +++ b/src/mess/includes/x68k.h @@ -52,7 +52,8 @@ public: m_tvram32(*this, "tvram32"), m_maincpu(*this, "maincpu"), m_okim6258(*this, "okim6258"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_gfxdecode(*this, "gfxdecode") { } required_device<mc68901_device> m_mfpdev; required_device<rp5c15_device> m_rtc; @@ -310,6 +311,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6258_device> m_okim6258; required_device<ram_device> m_ram; + optional_device<gfxdecode_device> m_gfxdecode; bitmap_ind16* x68k_get_gfx_page(int pri,int type); attotime prescale(int val); void mfp_trigger_irq(int irq); |