diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-02-17 15:46:55 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-02-17 15:46:55 +0000 |
commit | a3e4a45f1a514eb3743c2aea07353ec6f950fb7a (patch) | |
tree | 3d306087e66de98834e6d5f963b12b0ae9d2c3d2 /src/mame/drivers | |
parent | 231d7c709abb698929c7871112c442b7c95015e6 (diff) |
moved optional_device<gfxdecode_device> to specific drivers state classes (nw)
Diffstat (limited to 'src/mame/drivers')
195 files changed, 598 insertions, 194 deletions
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; }; |