diff options
Diffstat (limited to 'src')
867 files changed, 3111 insertions, 942 deletions
diff --git a/src/emu/driver.c b/src/emu/driver.c index fc352a5c890..42f3bd50396 100644 --- a/src/emu/driver.c +++ b/src/emu/driver.c @@ -34,8 +34,6 @@ ADDRESS_MAP_END driver_device::driver_device(const machine_config &mconfig, device_type type, const char *tag) : device_t(mconfig, type, "Driver Device", tag, NULL, 0, "", __FILE__), device_memory_interface(mconfig, *this), - m_screen(*this, "screen"), - m_palette(*this, "palette"), m_generic_paletteram_8(*this, "paletteram"), m_generic_paletteram2_8(*this, "paletteram2"), m_generic_paletteram_16(*this, "paletteram"), diff --git a/src/emu/driver.h b/src/emu/driver.h index 68dfe71c35a..8570402927c 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -272,10 +272,6 @@ protected: inline UINT32 paletteram32_be(offs_t offset) const { return m_generic_paletteram_16[offset | 1] | (m_generic_paletteram_16[offset & ~1] << 16); } public: - // generic devices - optional_device<screen_device> m_screen; - optional_device<palette_device> m_palette; - // generic pointers optional_shared_ptr<UINT8> m_generic_paletteram_8; optional_shared_ptr<UINT8> m_generic_paletteram2_8; diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index b8cea59e7cd..08287b4f905 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -58,7 +58,8 @@ public: m_spriteram_2(*this, "spritera2"), m_bgram(*this, "bgram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<okim6295_device> m_oki1; @@ -83,6 +84,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 4adc5d94ac9..7c9b9b0b04c 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -34,7 +34,8 @@ public: : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_eeprom(*this, "eeprom"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } UINT32 m_seed; UINT32 m_magic; @@ -94,6 +95,7 @@ public: void pxa255_lcd_check_load_next_branch(int channel); void pxa255_start(); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index 67cf00b54aa..9cdaa25d35c 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -54,7 +54,8 @@ public: m_videoram3(*this, "videoram3"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } /* memory pointers */ @@ -70,7 +71,8 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + // 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 c6998f8fa56..36fffd9cb6c 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -461,7 +461,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_ay8910(*this, "ay8910"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -496,6 +497,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<ay8910_device> m_ay8910; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index ca0d6fd7bc4..b7eefe192a4 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -52,7 +52,8 @@ public: m_scoreram(*this, "scoreram"), m_ram2(*this, "ram2"), m_characterram(*this, "characterram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -74,6 +75,7 @@ public: UINT32 screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ace_postload(); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 26930d62d91..e82a4cdd248 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -24,13 +24,17 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } 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; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; 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 247ec8c70b3..fc48b9d5631 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -74,7 +74,8 @@ public: m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_ac_bgvram; required_shared_ptr<UINT16> m_ac_txvram; @@ -106,6 +107,7 @@ public: required_device<okim6295_device> m_oki1; required_device<okim6295_device> m_oki2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 8b68e53513b..b5e66efe53e 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -160,13 +160,17 @@ public: m_h63484(*this, "h63484"), m_microtouch(*this, "microtouch"), m_maincpu(*this, "maincpu"), - m_duart(*this, "duart68681") + m_duart(*this, "duart68681"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<h63484_device> m_h63484; required_device<microtouch_serial_device> m_microtouch; required_device<cpu_device> m_maincpu; required_device<duartn68681_device> m_duart; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index bf7fe6c135c..b609e00f327 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -23,7 +23,8 @@ public: m_spriteram2(*this, "spriteram2"), m_spriteram3(*this, "spriteram3"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ required_shared_ptr<UINT8> m_spriteram1; @@ -40,6 +41,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 3fb232bfc81..2e0643731b8 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -432,7 +432,8 @@ public: m_attr(*this, "attr"), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -460,6 +461,7 @@ public: void decrypt(int key1, int key2); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index 0d557bb5848..70d6ecc17ba 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -288,7 +288,8 @@ public: m_ay2(*this, "ay2"), m_samples(*this, "samples"), m_mkiv_vram(*this, "mkiv_vram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<mc146818_device> m_rtc; @@ -298,6 +299,7 @@ public: required_shared_ptr<UINT8> m_mkiv_vram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_rtc_address_strobe; int m_rtc_data_strobe; diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c index c6843d076e8..8facc551244 100644 --- a/src/mame/drivers/aristmk6.c +++ b/src/mame/drivers/aristmk6.c @@ -13,7 +13,8 @@ class aristmk6_state : public driver_device public: aristmk6_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_palette(*this, "palette") { } UINT32 m_test_x,m_test_y,m_start_offs; UINT8 m_type; @@ -21,6 +22,7 @@ public: virtual void video_start(); UINT32 screen_update_aristmk6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 1f697c5f1fa..1f36053f7ad 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -56,7 +56,8 @@ public: m_ppi8255_0(*this, "ppi8255_0"), m_ppi8255_1(*this, "ppi8255_1"), m_videoram(*this, "videoram"), - m_samples(*this, "samples"){ } + m_samples(*this, "samples"), + m_screen(*this, "screen"){ } required_device<cpu_device> m_maincpu; optional_device<i8255_device> m_ppi8255_0; @@ -72,6 +73,8 @@ public: UINT8 m_color_latch; required_device<samples_device> m_samples; + required_device<screen_device> m_screen; + DECLARE_WRITE8_MEMBER(color_latch_w); DECLARE_WRITE8_MEMBER(spaceint_videoram_w); DECLARE_READ8_MEMBER(kamikaze_ppi_r); diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c index dc370753230..d7411e78ae5 100644 --- a/src/mame/drivers/astrcorp.c +++ b/src/mame/drivers/astrcorp.c @@ -49,7 +49,9 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -77,6 +79,8 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*************************************************************************** diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c index d397abf91a4..a19f5ac6a81 100644 --- a/src/mame/drivers/atarisy4.c +++ b/src/mame/drivers/atarisy4.c @@ -29,7 +29,8 @@ public: m_screen_ram(*this, "screen_ram"), m_maincpu(*this, "maincpu"), m_dsp0(*this, "dsp0"), - m_dsp1(*this, "dsp1") { } + m_dsp1(*this, "dsp1"), + m_palette(*this, "palette") { } UINT8 m_r_color_table[256]; UINT8 m_g_color_table[256]; @@ -72,6 +73,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_dsp0; optional_device<cpu_device> m_dsp1; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index 6ad872a6ec9..a579c8f8592 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -425,13 +425,15 @@ public: m_crtc(*this, "crtc"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } 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; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(avt_6845_address_w); DECLARE_WRITE8_MEMBER(avt_6845_data_w); diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index ae0218a5cb5..7c02ba493ef 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -39,7 +39,8 @@ public: m_io_in0(*this, "IN0"), m_io_in1(*this, "IN1"), m_io_in2(*this, "IN2"), - m_io_in3(*this, "IN3") + m_io_in3(*this, "IN3"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -100,6 +101,7 @@ public: required_ioport m_io_in1; required_ioport m_io_in2; required_ioport m_io_in3; + required_device<palette_device> m_palette; DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); }; diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index 130a3e2ff68..ed9e128ec01 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -62,7 +62,8 @@ public: beaminv_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_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -75,6 +76,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; DECLARE_READ8_MEMBER(v128_r); DECLARE_WRITE8_MEMBER(controller_select_w); DECLARE_READ8_MEMBER(controller_r); diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index a1e752cb767..a7617cd2e1e 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -28,7 +28,8 @@ public: m_s14001a(*this, "speech"), m_ls181_10c(*this, "ls181_10c"), m_ls181_12c(*this, "ls181_12c"), - m_custom(*this, "exidy") { } + m_custom(*this, "exidy"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -38,6 +39,7 @@ public: required_device<ttl74181_device> m_ls181_10c; required_device<ttl74181_device> m_ls181_12c; required_device<exidy_sound_device> m_custom; + required_device<screen_device> m_screen; UINT8 m_magicram_control; UINT8 m_last_shift_data; diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 09e8c903cba..e3d7d2a2fed 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -37,7 +37,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_bgram; required_shared_ptr<UINT16> m_fgram; @@ -62,6 +63,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 2bbcfd95aef..ffcc01f012d 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -242,7 +242,8 @@ public: m_acia6850_0(*this, "acia6850_2"), m_acia6850_1(*this, "acia6850_2"), m_acia6850_2(*this, "acia6850_2"), - m_upd7759(*this, "upd") + m_upd7759(*this, "upd"), + m_palette(*this, "palette") { } @@ -316,6 +317,7 @@ public: required_device<acia6850_device> m_acia6850_1; required_device<acia6850_device> m_acia6850_2; required_device<upd7759_device> m_upd7759; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c index e069a6e30d2..1747764f727 100644 --- a/src/mame/drivers/bingor.c +++ b/src/mame/drivers/bingor.c @@ -449,7 +449,8 @@ public: bingor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_blit_ram(*this, "blit_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_blit_ram; DECLARE_READ16_MEMBER(test_r); @@ -459,6 +460,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(unk_irq); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 42340469c3e..3b5be0743e6 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -103,7 +103,8 @@ public: m_spriteram6(*this, "spriteram6"), m_spriteram7(*this, "spriteram7"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_tilemapram; required_shared_ptr<UINT16> m_spriteram0; @@ -155,6 +156,7 @@ public: void draw_page(bitmap_ind16 &bitmap, const rectangle &cliprect, int page); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #define GET_INFO( ram ) \ diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c index 66a549caeec..6877d2f3390 100644 --- a/src/mame/drivers/blitz68k.c +++ b/src/mame/drivers/blitz68k.c @@ -67,7 +67,8 @@ public: m_leds0(*this, "leds0"), m_leds1(*this, "leds1"), m_leds2(*this, "leds2") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT16> m_nvram; UINT8 *m_blit_buffer; @@ -178,6 +179,7 @@ public: UINT32 screen_update_blitz68k_noblit(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(steaser_mcu_sim); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; /************************************************************************************************************* diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 261c037db2b..bad39d1b4e7 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -119,13 +119,15 @@ public: m_stats_ram(*this, "nvram", 16), m_vid1(*this, "vid1"), m_vid2(*this, "vid2"), - m_colorram(*this, "colorram", 16) { } + m_colorram(*this, "colorram", 16), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_stats_ram; required_shared_ptr<UINT16> m_vid1; required_shared_ptr<UINT16> m_vid2; required_shared_ptr<UINT8> m_colorram; + required_device<palette_device> m_palette; int m_clr_offset; int m_bmc_input; DECLARE_READ16_MEMBER(bmc_random_read); diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index f2277b628ab..2b42fcde91a 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -50,7 +50,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } DECLARE_READ16_MEMBER( bmcpokr_unk_r ) @@ -61,6 +62,7 @@ public: required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 25d67cae03c..6032250ea8b 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -113,7 +113,8 @@ public: m_ms32_tx1_scroll(*this, "tx1_scroll"), m_ms32_bg1_scroll(*this, "bg1_scroll") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_ms32_tx_tilemap[2]; tilemap_t *m_ms32_bg_tilemap[2]; @@ -168,6 +169,7 @@ public: IRQ_CALLBACK_MEMBER(irq_callback); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 19c7e670c85..7f424640311 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -359,6 +359,7 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", boogwing_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index dfa850d93a2..a502326b587 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -34,7 +34,9 @@ public: m_tile_ram(*this, "tile_ram"), m_sprite_ram(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_tile_ram; @@ -47,6 +49,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(boxer_input_r); DECLARE_READ8_MEMBER(boxer_misc_r); diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index 6cc16e6ba77..19d36f3fd75 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -19,7 +19,8 @@ public: : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_vram; DECLARE_READ8_MEMBER(test_r); @@ -28,6 +29,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 1a27572709c..909885f4aaa 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -36,7 +36,8 @@ public: m_bg_scroll(*this, "bg_scroll"), m_bg_tile_ram(*this, "bg_tile_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; @@ -61,6 +62,7 @@ public: INTERRUPT_GEN_MEMBER(cabaret_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 6336f668577..b5ec68ae743 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -91,7 +91,8 @@ public: m_fg_ram(*this, "fg_ram"), m_sprites(*this, "sprites"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_fg_ram; @@ -117,6 +118,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index ba89c4e2977..f974db10da7 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -31,7 +31,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_video; required_shared_ptr<UINT8> m_videoram; @@ -46,6 +47,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 8be58182c76..63e5e1fb87a 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -59,7 +59,8 @@ public: : driver_device(mconfig, type, tag), m_tileram(*this, "tileram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_tileram; DECLARE_READ8_MEMBER(unknown_r); @@ -67,6 +68,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index 38bc972c399..665ba5f2e23 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -54,7 +54,8 @@ public: m_vram_fg(*this, "vrafg"), m_vram_bg(*this, "vrabg"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vram_fg; required_shared_ptr<UINT16> m_vram_bg; @@ -77,6 +78,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 2433a467a9b..aea0c83f302 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -20,7 +20,9 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -32,6 +34,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(cball_vram_w); DECLARE_READ8_MEMBER(cball_wram_r); diff --git a/src/mame/drivers/cesclass.c b/src/mame/drivers/cesclass.c index 8e6eb91e6fc..e9bba7d2fa2 100644 --- a/src/mame/drivers/cesclass.c +++ b/src/mame/drivers/cesclass.c @@ -33,7 +33,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_palette(*this, "palette") { } DECLARE_WRITE16_MEMBER(irq2_ack_w); DECLARE_WRITE16_MEMBER(irq3_ack_w); @@ -50,6 +51,7 @@ protected: required_device<okim6295_device> m_oki; required_shared_ptr<UINT16> m_vram; + required_device<palette_device> m_palette; // driver_device overrides virtual void video_start(); diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index d501ac0865d..ec55121a6f5 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -64,7 +64,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -82,6 +83,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(chanbara_videoram_w); DECLARE_WRITE8_MEMBER(chanbara_colorram_w); diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 8d56dda29fa..c2863809c3b 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -55,7 +55,8 @@ public: m_video(*this, "video"), m_maincpu(*this, "maincpu"), m_adpcm(*this, "adpcm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_video; @@ -83,6 +84,7 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_adpcm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c index b50aa6605b0..d51c3e7bc2b 100644 --- a/src/mame/drivers/chsuper.c +++ b/src/mame/drivers/chsuper.c @@ -27,7 +27,8 @@ public: chsuper_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } DECLARE_WRITE8_MEMBER(chsuper_vram_w); DECLARE_READ8_MEMBER(ff_r); @@ -37,7 +38,7 @@ public: required_device<z180_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index e19a57a0a6c..bb4ac946288 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -95,7 +95,8 @@ public: m_port_bank(0), m_phillips_code(0) , m_maincpu(*this, "maincpu"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete"), + m_screen(*this, "screen") { } required_device<pioneer_pr8210_device> m_laserdisc; @@ -119,6 +120,7 @@ public: TIMER_CALLBACK_MEMBER(cliff_irq_callback); required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index b68325146ef..d3358af85e6 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -57,12 +57,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_irq_mask; diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 6739b1b39a9..e731d16a06f 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -954,6 +954,7 @@ static MACHINE_CONFIG_START( cninja, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1020,6 +1021,7 @@ static MACHINE_CONFIG_START( stoneage, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1081,6 +1083,7 @@ static MACHINE_CONFIG_START( cninjabl, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1129,6 +1132,7 @@ static MACHINE_CONFIG_START( edrandy, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", edrandy_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1192,6 +1196,7 @@ static MACHINE_CONFIG_START( robocop2, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", robocop2_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1261,6 +1266,7 @@ static MACHINE_CONFIG_START( mutantf, cninja_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", mutantf_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 13cf865f39c..89c8f9a1eca 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -41,7 +41,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "subcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -71,6 +72,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(zerotrgt_vregs_w); DECLARE_WRITE8_MEMBER(cntsteer_vregs_w); diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c index 23e502c9827..2fec3825d46 100644 --- a/src/mame/drivers/cobra.c +++ b/src/mame/drivers/cobra.c @@ -610,7 +610,9 @@ public: m_gfxcpu(*this, "gfxcpu"), m_gfx_pagetable(*this, "pagetable"), m_k001604(*this, "k001604"), - m_ata(*this, "ata") + m_ata(*this, "ata"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -620,7 +622,9 @@ public: required_shared_ptr<UINT64> m_gfx_pagetable; required_device<k001604_device> m_k001604; required_device<ata_interface_device> m_ata; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_READ64_MEMBER(main_comram_r); DECLARE_WRITE64_MEMBER(main_comram_w); DECLARE_READ64_MEMBER(main_fifo_r); diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 9d8efb7a6d8..d7336c5735c 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -39,7 +39,8 @@ public: m_attr_ram2(*this, "attr_ram2"), m_attr_ram3(*this, "attr_ram3"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_attr_ram1; @@ -60,6 +61,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index f93a05c4fcf..be9ffa0cdb5 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -226,7 +226,8 @@ public: : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vram; struct { int r,g,b,offs,offs_internal; } m_bgpal, m_fgpal; @@ -242,6 +243,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index f29896b5feb..1e40bb8a7f3 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -320,7 +320,8 @@ public: m_io_an6(*this, "AN6"), m_io_an7(*this, "AN7"), m_io_config(*this, "CONFIG"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } @@ -364,6 +365,7 @@ public: required_ioport m_io_an7; required_ioport m_io_config; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; bitmap_ind16 m_temp_bitmap_sprites; bitmap_ind16 m_temp_bitmap_sprites2; diff --git a/src/mame/drivers/corona.c b/src/mame/drivers/corona.c index ceaaf8f0dee..31ec8eaae30 100644 --- a/src/mame/drivers/corona.c +++ b/src/mame/drivers/corona.c @@ -323,7 +323,8 @@ public: corona_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu") { } + m_soundcpu(*this, "soundcpu"), + m_screen(*this, "screen") { } UINT8 m_blitter_x_reg; UINT8 m_blitter_y_reg; @@ -354,6 +355,7 @@ public: UINT32 screen_update_luckyrlt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index e8d31d44084..079bd86dd69 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -100,7 +100,8 @@ public: m_txram(*this, "txram"), m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -109,6 +110,7 @@ public: optional_shared_ptr<UINT8> m_mainram; optional_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_txtilemap; int m_coin_stat; diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index fc92f7c2318..2b46d58a4b0 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -33,7 +33,8 @@ public: m_laserdisc(*this, "laserdisc"), m_rotatecpu(*this, "rotate_cpu"), m_linecpu(*this, "line_cpu"), - m_soundcpu(*this, "sound_cpu") { } + m_soundcpu(*this, "sound_cpu"), + m_screen(*this, "screen") { } UINT8 *m_depth_buffer; int m_video_field; @@ -43,6 +44,7 @@ public: required_device<cquestrot_cpu_device> m_rotatecpu; required_device<cquestlin_cpu_device> m_linecpu; required_device<cquestsnd_cpu_device> m_soundcpu; + required_device<screen_device> m_screen; rgb_t *m_colormap; DECLARE_WRITE16_MEMBER(palette_w); DECLARE_READ16_MEMBER(line_r); diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 65726ae71d5..91ae9dd37bf 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -27,7 +27,8 @@ public: m_bg2_regs_x(*this, "bg2_regs_x"), m_bg2_regs_y(*this, "bg2_regs_y"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_paletteram[0x4000]; /* memory pointers */ @@ -62,6 +63,7 @@ public: INTERRUPT_GEN_MEMBER(cultures_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 62237f7e4de..63f18b2f2d1 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -191,7 +191,8 @@ public: m_roadram(*this, "roadram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tilemap0_tilemap; tilemap_t *m_tilemap1_tilemap; @@ -228,6 +229,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /* tile format diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 08d6c13ca53..4b053ac1278 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -89,7 +89,8 @@ public: m_obj1_ram(*this, "obj1_ram"), m_obj2_ram(*this, "obj2_ram"), m_obj3_ram(*this, "obj3_ram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -100,6 +101,7 @@ public: required_shared_ptr<UINT8> m_obj2_ram; required_shared_ptr<UINT8> m_obj3_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; struct { diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 76201b601b0..b78ce6bbce2 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -48,7 +48,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -60,7 +61,8 @@ public: optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 188da91ff27..a630a89b50f 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -511,6 +511,7 @@ static MACHINE_CONFIG_START( dassault, dassault_state ) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", dassault_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/dblcrown.c b/src/mame/drivers/dblcrown.c index b653fb9c3ba..ea961abaedd 100644 --- a/src/mame/drivers/dblcrown.c +++ b/src/mame/drivers/dblcrown.c @@ -53,12 +53,14 @@ public: dblcrown_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } // devices required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; // 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 d3bfa2d2f3b..43413658de7 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -67,7 +67,8 @@ public: m_bgram(*this, "bgram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -113,6 +114,7 @@ public: INTERRUPT_GEN_MEMBER(ddayjlc_snd_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 942724077a2..5a1a2108019 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -131,7 +131,8 @@ public: m_work_ram(*this, "work_ram"), m_mcu_shared_ram(*this, "mcu_shared_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_vregs; @@ -167,6 +168,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(ddealer_mcu_sim); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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/deco156.c b/src/mame/drivers/deco156.c index 4bf6936c462..bdf93f7f29c 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -32,7 +32,8 @@ public: m_deco_tilegen1(*this, "tilegen1"), m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), - m_sprgen(*this, "spritegen") + m_sprgen(*this, "spritegen"), + m_palette(*this, "palette") { } /* devices */ @@ -41,6 +42,7 @@ public: optional_device<okim6295_device> m_oki1; optional_device<okim6295_device> m_oki2; optional_device<decospr_device> m_sprgen; + required_device<palette_device> m_palette; /* memory */ UINT16 m_pf1_rowscroll[0x800/2]; diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 37bd42e5114..e89a7ea22aa 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -126,7 +126,9 @@ public: m_attr0(*this, "attr0"), m_vram1(*this, "vram1"), m_attr1(*this, "attr1"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -137,7 +139,9 @@ public: required_shared_ptr<UINT8> m_vram1; required_shared_ptr<UINT8> m_attr1; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_laserdisc_data; int m_nmimask; DECLARE_WRITE8_MEMBER(rblaster_sound_w); diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 7a82dafa039..a0fe9f0d787 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -31,7 +31,9 @@ public: m_major_obj_ram(*this, "major_obj_ram"), m_minor_obj_ram(*this, "minor_obj_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_alpha_num_ram; @@ -52,6 +54,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(destroyr_misc_w); DECLARE_WRITE8_MEMBER(destroyr_cursor_load_w); diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index da4cbb23e91..bd33516a765 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -233,6 +233,7 @@ static MACHINE_CONFIG_START( dietgo, dietgo_state ) MCFG_GFXDECODE_ADD("gfxdecode", dietgo) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", dietgo_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 7eb943f1528..a560229fa95 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -54,7 +54,8 @@ public: m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ UINT8 m_ram_bank; @@ -97,6 +98,7 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 798b2adf499..13531059fef 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -62,7 +62,9 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -79,6 +81,8 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 28c109d5845..53daef6abf8 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -58,7 +58,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -128,6 +129,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<speaker_sound_device> m_speaker; optional_device<gfxdecode_device> m_gfxdecode; + optional_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index b05268ade7d..c53a87c3a1b 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -69,7 +69,8 @@ public: m_dderby_vidattribs(*this, "vidattribs"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_scroll_ram; required_shared_ptr<UINT8> m_sprite_ram; @@ -91,6 +92,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index e33aa9e6b81..97eccc1bdf1 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -73,7 +73,8 @@ public: m_spriteram(*this, "spriteram"), m_bgram(*this, "bgram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -91,6 +92,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void dominob_state::video_start() diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index b437335d662..5d8f46f3311 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -21,7 +21,8 @@ public: dorachan_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_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -37,6 +38,7 @@ public: virtual void machine_reset(); UINT32 screen_update_dorachan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index e0bce462d56..98e0c4b4308 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -30,7 +30,8 @@ public: dotrikun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_dotrikun_bitmap(*this, "dotrikun_bitmap"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_dotrikun_bitmap; @@ -42,6 +43,7 @@ public: virtual void machine_reset(); UINT32 screen_update_dotrikun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 193ba3577e6..61fc8e2948e 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -133,7 +133,8 @@ public: m_vregs(*this, "vregs"), m_workram(*this, "workram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -170,6 +171,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 8792189ccfe..47c9608a4d5 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -21,7 +21,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram_fg; @@ -48,6 +49,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index ad04a3a4074..e33395fd04e 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -64,7 +64,9 @@ public: dunhuang_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* video-related */ tilemap_t *m_tmap; @@ -127,6 +129,8 @@ public: 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; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 89b711d57e6..1f5eb9ee322 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -306,7 +306,8 @@ public: dwarfd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ @@ -335,6 +336,7 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(i8275_preg_w); DECLARE_READ8_MEMBER(i8275_preg_r); diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 289bb88ac64..fff58e83eef 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -54,7 +54,8 @@ public: m_atram(*this, "atram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ tilemap_t *m_bg_tilemap; @@ -88,6 +89,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 96369bf7899..fbf9b9c7b4d 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -63,7 +63,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_screen(*this, "screen"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -81,6 +82,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<screen_device> m_screen; DECLARE_READ8_MEMBER(dip_switch_r); DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w); diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 705c88b5bc2..83120000287 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -42,7 +42,8 @@ public: m_tile_ram(*this, "tile_ram"), m_tile_control_ram(*this, "tile_ctrl_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -60,6 +61,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_callback_esh); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index f506c1a79b0..ade25ce83f9 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -164,7 +164,8 @@ public: m_view2_0(*this, "view2_0"), m_kaneko_spr(*this, "kan_spr"), m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT16> m_galsnew_bg_pixram; optional_shared_ptr<UINT16> m_galsnew_fg_pixram; @@ -185,6 +186,7 @@ public: UINT32 screen_update_galsnew(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(expro02_scanline); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 2617141d05d..67a976900a5 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -74,7 +74,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT16 m_x; required_shared_ptr<UINT32> m_spriteram; @@ -88,6 +89,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index dd2d9f9a418..20b02f0fec8 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -47,7 +47,9 @@ public: m_tile_palette(*this, "tile_palette"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<phillips_22vp931_device> m_laserdisc; required_shared_ptr<unsigned char> m_tileram; @@ -108,6 +110,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c index 5d69522a933..11c5bfe0727 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -97,7 +97,8 @@ public: m_fbram(*this, "fb_ram"), m_vram(*this, "vram"), m_cram(*this, "cram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_soundlatch = 0; m_bank = 0; @@ -113,6 +114,7 @@ public: required_shared_ptr<UINT8> m_cram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_soundlatch; UINT8 m_bank; diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 789901f5b6c..4bbdc7f8ce6 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -32,7 +32,9 @@ public: m_playfield_ram(*this, "playfield_ram"), m_rombase(*this, "rombase"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -53,6 +55,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(flyball_input_r); DECLARE_READ8_MEMBER(flyball_scanline_r); diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 8f39e3a2e77..20067ee6240 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -335,7 +335,8 @@ public: m_maincpu(*this,"maincpu"), m_vram(*this, "vram"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_vram; @@ -350,6 +351,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/fresh.c b/src/mame/drivers/fresh.c index 8816eaff0a5..2c16ebfbc27 100644 --- a/src/mame/drivers/fresh.c +++ b/src/mame/drivers/fresh.c @@ -38,7 +38,8 @@ public: m_paletteram_1(*this, "paletteram_1"), m_paletteram_2(*this, "paletteram_2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_bg_tilemap; tilemap_t *m_bg_2_tilemap; @@ -102,6 +103,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index f23a6805ea7..603ebb55667 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -56,7 +56,9 @@ public: m_bg4_ram(*this, "bg4_ram"), m_fg_ram(*this, "fg_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1_ram; @@ -100,6 +102,8 @@ public: void show_out( ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c index 0cf0e65483c..e575588f709 100644 --- a/src/mame/drivers/galgame.c +++ b/src/mame/drivers/galgame.c @@ -19,7 +19,8 @@ class galaxygame_state : public driver_device public: galaxygame_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_palette(*this, "palette") { } UINT16 m_clk; @@ -51,6 +52,7 @@ public: INTERRUPT_GEN_MEMBER(galaxygame_irq); IRQ_CALLBACK_MEMBER(galaxygame_irq_callback); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; /************************************* diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 4bd6a3a3470..37eae2e0521 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -81,7 +81,8 @@ public: m_maincpu(*this,"maincpu"), m_grap2_0(*this,"grap2_0"), m_grap2_1(*this,"grap2_1"), - m_grap2_2(*this,"grap2_2") + m_grap2_2(*this,"grap2_2"), + m_palette(*this, "palette") { } @@ -93,6 +94,7 @@ public: required_device<kaneko_grap2_device> m_grap2_0; required_device<kaneko_grap2_device> m_grap2_1; required_device<kaneko_grap2_device> m_grap2_2; + required_device<palette_device> m_palette; UINT16 m_priority_buffer_scrollx; UINT16 m_priority_buffer_scrolly; diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 60129b34ee3..8e95083ddc8 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -76,10 +76,12 @@ 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_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_cga_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT32 *m_bios_ram; UINT8 m_mxtc_config_reg[256]; UINT8 m_piix4_config_reg[4][256]; diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 9fee1ee7f06..e2fe669fe1b 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -84,12 +84,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_ticket(*this, "ticket") { } + m_ticket(*this, "ticket"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; optional_device<ticket_dispenser_device> m_ticket; - + required_device<screen_device> m_screen; + virtual void video_start(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 2b71b135dbd..25c8876389c 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -43,7 +43,9 @@ public: m_videoram2(*this, "videoram2"), m_soundcpu(*this, "soundcpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -59,6 +61,8 @@ public: 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; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index dbf5ba93e72..95fd3bdcfa6 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -1029,7 +1029,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -1086,6 +1087,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 4298d77058f..809ae471c83 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -68,7 +68,8 @@ public: m_sc3_vram(*this, "sc3_vram"), m_spriteram16(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -77,6 +78,7 @@ public: required_shared_ptr<UINT16> m_spriteram16; required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 8a93e3c59a1..5a1eca1fef6 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -59,7 +59,8 @@ public: m_palette_ram(*this, "palette_ram"), m_tile_ram(*this, "tile_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_nmi_enable; UINT8 m_start_lamp; @@ -85,6 +86,7 @@ public: void gpworld_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 8773092d56c..7102a248d79 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -146,7 +146,8 @@ public: m_workram(*this, "workram"), m_vram(*this, "vram"), m_paletteram(*this, "paletteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_toggle = 0; } @@ -205,6 +206,7 @@ public: void rearrange_tile_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; CUSTOM_INPUT_MEMBER(gstream_state::x2222_toggle_r) // or the game hangs when starting, might be a status flag for the sound? diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index ead1976c286..4df129173b4 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -248,7 +248,8 @@ public: m_dsp2(*this, "dsp2"), m_k056800(*this, "k056800"), m_adc1038(*this, "adc1038"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_palette(*this, "palette") { } // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2400; @@ -259,8 +260,9 @@ public: required_device<adsp21062_device> m_dsp; optional_device<cpu_device> m_dsp2; required_device<k056800_device> m_k056800; - required_device<adc1038_device> m_adc1038; + required_device<adc1038_device> m_adc1038; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(paletteram32_w); DECLARE_READ32_MEMBER(gticlub_k001604_tile_r); diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index 419152c1b65..129db5480bd 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -79,12 +79,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tms34061(*this, "tms34061"), - m_sn(*this, "snsnd") { } + m_sn(*this, "snsnd"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; required_device<tms34061_device> m_tms34061; required_device<sn76489_device> m_sn; + required_device<palette_device> m_palette; struct ef9369 m_pal; emu_timer *m_fdc_timer; diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index c43f39a08dd..3be78ec4bf7 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -201,12 +201,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_wram(*this, "wram") + m_wram(*this, "wram"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_shared_ptr<UINT16> m_wram; + required_device<palette_device> m_palette; UINT16 *m_blit_buffer; UINT16 m_blit_ram[0x10]; diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index ad3ab610379..625fd966359 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -214,7 +214,8 @@ public: m_blitter_ram(*this, "blitter_ram"), m_io_ram(*this, "io_ram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_palette(*this, "palette") { } UINT16 *m_render_layer[MAX_LAYERS]; UINT8 m_sound_fifo[MAX_SOUNDS]; @@ -282,6 +283,7 @@ public: void init_common(); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index c3b43707c76..eec9bf14eb8 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -111,7 +111,8 @@ public: : driver_device(mconfig, type, tag), m_blit_ram(*this, "blit_ram"), m_maincpu(*this, "maincpu"), - m_okim6376(*this, "oki") { } + m_okim6376(*this, "oki"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_blit_ram; UINT16 m_vblank_bit; @@ -154,6 +155,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq_80186); required_device<cpu_device> m_maincpu; required_device<okim6376_device> m_okim6376; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 6fefcfc8f1e..3efc5316098 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -58,7 +58,8 @@ public: : driver_device(mconfig, type, tag), m_sys_regs(*this, "sys_regs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_sys_regs; @@ -88,6 +89,7 @@ public: INTERRUPT_GEN_MEMBER(hitpoker_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index de7a58c6340..3038280c80b 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -51,7 +51,8 @@ public: hotblock_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_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_vram; @@ -71,6 +72,7 @@ public: UINT32 screen_update_hotblock(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(hotblocks_irq); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 7e21642c5c3..294bed8c93e 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -83,7 +83,8 @@ public: m_mermaid(*this, "mermaid"), m_soundcpu(*this, "soundcpu"), m_pandora(*this, "pandora"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* Video */ @@ -109,6 +110,7 @@ public: required_device<cpu_device> m_soundcpu; required_device<kaneko_pandora_device> m_pandora; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(trigger_nmi_on_slave_cpu); DECLARE_WRITE8_MEMBER(master_bankswitch_w); diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index c70cb892f54..bfc0d661727 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -44,7 +44,9 @@ public: m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_bg_scroll; required_shared_ptr<UINT8> m_gp98_reel1_ram; @@ -95,6 +97,8 @@ public: INTERRUPT_GEN_MEMBER(jingbell_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index 68fa2d07ed0..e028fb385ad 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -87,7 +87,9 @@ public: m_maincpu(*this, "maincpu"), m_priority_ram(*this, "priority_ram"), m_vbowl_trackball(*this, "vbowl_trackball"), - m_oki(*this, "oki"){ } + m_oki(*this, "oki"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_priority_ram; @@ -219,6 +221,8 @@ public: void lhb2_decrypt_gfx(); void drgnwrld_gfx_decrypt(); optional_device<okim6295_device> m_oki; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index a043d4152d8..336f6a0bc71 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -64,7 +64,9 @@ public: m_oki(*this, "oki"), m_igs025(*this,"igs025"), m_igs022(*this,"igs022"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_input_addr; @@ -76,6 +78,8 @@ public: optional_device<igs025_device> m_igs025; // Mj Shuang Long Qiang Zhu 2 optional_device<igs022_device> m_igs022; // Mj Shuang Long Qiang Zhu 2 required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; void igs025_to_igs022_callback( void ); int m_toggle; diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 9501eaba080..e005f8ffac8 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -38,7 +38,8 @@ public: m_igs_tx_videoram(*this, "igs_tx_videoram"), m_igs_bg_videoram(*this, "igs_bg_videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_igs_mainram; required_shared_ptr<UINT32> m_igs_cg_videoram; @@ -74,6 +75,7 @@ public: void pgm_create_dummy_internal_arm_region(); required_device<cpu_device> m_maincpu; optional_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index f9962538e76..10ff8524721 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -80,13 +80,17 @@ 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_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } 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; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; 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 96e23952ca5..c7bebe82f17 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -23,13 +23,15 @@ public: m_maincpu(*this,"maincpu"), m_subcpu(*this,"subcpu"), m_vram(*this, "vram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_shared_ptr<UINT8> m_vram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_DRIVER_INIT(intrscti); virtual void video_start(); diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 757e5ab5035..88fee59eeaa 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -36,7 +36,8 @@ public: m_sprite_ram(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -61,6 +62,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index fc85ccf9144..a93da04d317 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -62,7 +62,8 @@ class itgambl2_state : public driver_device public: itgambl2_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_palette(*this, "palette") { } int m_test_x; int m_test_y; @@ -72,6 +73,7 @@ public: DECLARE_PALETTE_INIT(itgambl2); UINT32 screen_update_itgambl2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 7480ce41cf3..86269dd5f72 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -50,7 +50,8 @@ class itgambl3_state : public driver_device public: itgambl3_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_palette(*this, "palette") { } int m_test_x; int m_test_y; @@ -60,6 +61,7 @@ public: DECLARE_PALETTE_INIT(itgambl3); UINT32 screen_update_itgambl3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index 0b7d3dd73b5..62cec511613 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -64,7 +64,8 @@ class itgamble_state : public driver_device public: itgamble_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_palette(*this, "palette") { } UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -73,6 +74,7 @@ protected: // devices required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; // driver_device overrides virtual void machine_reset(); diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 536808c94af..20d2e1d47ba 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -61,7 +61,9 @@ public: m_reel3_ram(*this, "reel3_ram"), m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_bg_scroll2; @@ -72,6 +74,9 @@ public: required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + 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 d84904f675d..1d8b9cd1f19 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -32,7 +32,8 @@ public: m_io(*this, "io"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vram; UINT8 m_map_vreg; @@ -47,6 +48,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 5cdc3857507..6bc754c54d4 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -128,7 +128,8 @@ public: m_jm_shared_ram(*this, "jshared_ram"), m_jm_mcu_code(*this, "jmcu_code"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_sc0_tilemap_0; tilemap_t *m_sc0_tilemap_1; @@ -223,6 +224,7 @@ public: void second_mcu_run(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index e1b7855c4db..646e49e198d 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -46,7 +46,8 @@ public: m_cpu_1(*this, "cpu1"), m_nsc(*this, "nsc"), m_msm(*this, "msm"), - m_cvsd(*this, "cvsd") { } + m_cvsd(*this, "cvsd"), + m_palette(*this, "palette") { } /* sound-related */ // Jangou CVSD Sound @@ -68,6 +69,7 @@ public: optional_device<cpu_device> m_nsc; optional_device<msm5205_device> m_msm; optional_device<hc55516_device> m_cvsd; + required_device<palette_device> m_palette; /* video-related */ UINT8 m_pen_data[0x10]; diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index 6b5fcff99d8..3a43c2eee9b 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -107,7 +107,8 @@ public: jantotsu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_adpcm(*this, "adpcm") { } + m_adpcm(*this, "adpcm") , + m_palette(*this, "palette"){ } /* sound-related */ UINT32 m_adpcm_pos; @@ -138,6 +139,7 @@ public: DECLARE_WRITE_LINE_MEMBER(jan_adpcm_int); required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_adpcm; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index f63c264201d..17919c2ad58 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -189,7 +189,8 @@ public: m_mainsub_shared_ram(*this, "mainsub_shared"), m_ctrl(*this, "ctrl"), m_maincpu(*this,"maincpu"), - m_subcpu(*this,"sub") + m_subcpu(*this,"sub"), + m_palette(*this, "palette") { } optional_device<kaneko_view2_tilemap_device> m_view2_0; @@ -209,6 +210,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<palette_device> m_palette; sknsspr_device* m_spritegen1; sknsspr_device* m_spritegen2; diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index 2ca21a91c46..255c6b53008 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -113,7 +113,8 @@ public: m_spriteram(*this, "spriteram"), m_gdfs_st0020(*this, "st0020_spr"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_palette(*this, "palette") { } tilemap_t *m_tmap; tilemap_t *m_tmap2; @@ -127,6 +128,7 @@ public: optional_device<st0020_device> m_gdfs_st0020; required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(darkhors_tmapram_w); DECLARE_WRITE32_MEMBER(darkhors_tmapram2_w); DECLARE_WRITE32_MEMBER(darkhors_input_sel_w); diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 7798cf081f3..ceb01360cc7 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -113,7 +113,8 @@ public: m_bitmap(*this, "bitmap"), m_bulletram(*this, "bulletram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -147,6 +148,7 @@ public: void draw_bitmap( bitmap_ind16 &bitmap ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 6fae2d3a88d..c93c942bf8f 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -85,7 +85,8 @@ public: m_attr(*this, "attr"), m_spriteram(*this, "spriteram"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_sound_cmd; required_shared_ptr<UINT8> m_vram; @@ -118,6 +119,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 06166b73511..7cd43ba39d1 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -44,7 +44,8 @@ public: m_bmc_1_videoram(*this, "bmc_1_videoram"), m_bmc_2_videoram(*this, "bmc_2_videoram"), m_colorram(*this, "colorram", 16), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_main_ram; @@ -52,6 +53,7 @@ public: required_shared_ptr<UINT16> m_bmc_2_videoram; required_shared_ptr<UINT8> m_colorram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_tilemap_1; tilemap_t *m_tilemap_2; int m_clr_offset; diff --git a/src/mame/drivers/kontest.c b/src/mame/drivers/kontest.c index 428ecc7b092..6e4ecaa8e9e 100644 --- a/src/mame/drivers/kontest.c +++ b/src/mame/drivers/kontest.c @@ -32,12 +32,14 @@ public: kontest_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_palette(*this, "palette") { } // devices required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_ram; + required_device<palette_device> m_palette; // screen updates UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 956db22ce5f..08b90d61187 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -71,7 +71,9 @@ class lastfght_state : public driver_device public: lastfght_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_screen(*this, "screen"), + m_palette(*this, "palette") { } /* video-related */ @@ -99,6 +101,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* memory */ UINT8 m_colorram[256 * 3]; diff --git a/src/mame/drivers/lbeach.c b/src/mame/drivers/lbeach.c index 64100ce9556..f21345e575b 100644 --- a/src/mame/drivers/lbeach.c +++ b/src/mame/drivers/lbeach.c @@ -43,7 +43,9 @@ public: m_sprite_code(*this, "sprite_code"), m_collision_bg_car(0), m_collision_fg_car(0), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices / memory pointers */ @@ -57,6 +59,9 @@ public: int m_collision_bg_car; int m_collision_fg_car; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + 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 2437e0bc862..777b8aaa90e 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -78,7 +78,8 @@ public: m_tile_ram(*this, "tile_ram"), m_tile_control_ram(*this, "tile_ctrl_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -93,6 +94,7 @@ public: TIMER_CALLBACK_MEMBER(irq_stop); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index f296cedfd22..6c527a295ac 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -43,7 +43,8 @@ public: m_videoreg(*this, "videoreg"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_fg_videoram; @@ -96,6 +97,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /***************************************************************************************************** diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 5df55e79e87..0e1f2a4181a 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -96,6 +96,7 @@ public: littlerb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), m_dacl(*this, "dacl"), m_dacr(*this, "dacr"), #if USE_TMS @@ -111,6 +112,7 @@ public: required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; required_device<dac_device> m_dacl; required_device<dac_device> m_dacr; UINT8 m_sound_index_l,m_sound_index_r; diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index d5cfded32dc..4a3058dc7ed 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -106,7 +106,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -156,6 +157,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index f264bbd9104..4339462676a 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -104,7 +104,8 @@ public: m_luck_vram2(*this, "luck_vram2"), m_luck_vram3(*this, "luck_vram3"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_nmi_enable; tilemap_t *m_reel1_tilemap; @@ -156,6 +157,7 @@ public: INTERRUPT_GEN_MEMBER(luckgrln_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 15996ad761f..70d42bd4a84 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -136,7 +136,8 @@ public: m_maincpu(*this, "maincpu"), m_ay1(*this, "ay1"), m_ay2(*this, "ay2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -197,6 +198,7 @@ public: required_device<ay8910_device> m_ay1; optional_device<ay8910_device> m_ay2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 0715b636dcb..acea0fd20b7 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -96,7 +96,8 @@ public: m_layer2_videoram(*this, "layer2_videoram"), m_vregs(*this, "vregs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_layer0_tilemap; tilemap_t *m_layer1_tilemap; @@ -127,6 +128,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index e735537bc18..807707c4666 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -185,7 +185,8 @@ public: m_scc68070_dma_ch1_regs(*this, "scc_dma1_regs"), m_scc68070_dma_ch2_regs(*this, "scc_dma2_regs"), m_scc68070_mmu_regs(*this, "scc_mmu_regs"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_magicram; required_shared_ptr<UINT16> m_pcab_vregs; @@ -224,6 +225,7 @@ public: UINT32 screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(magicard_irq); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index a56b0915a88..cc2698d9c43 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -464,7 +464,8 @@ public: : driver_device(mconfig, type, tag), oki(*this, "oki") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_mux_data; int m_palette_bank; @@ -498,6 +499,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index a2be759013b..c14b0eded7b 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -104,7 +104,8 @@ public: : driver_device(mconfig, type, tag), m_tx_tileram(*this, "tx_tileram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_tx_tileram; @@ -157,6 +158,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index d11bd1eb0fd..0067c397065 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -451,7 +451,8 @@ public: m_colram(*this, "colram"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_workram; @@ -487,6 +488,7 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 61eb97d3d3c..04b56895c3d 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -221,12 +221,14 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_upd7759(*this, "upd"), - m_duart68681(*this, "duart68681") { } + m_duart68681(*this, "duart68681"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<i8052_device> m_soundcpu; required_device<upd7759_device> m_upd7759; required_device<duartn68681_device> m_duart68681; + required_device<palette_device> m_palette; int m_vsync_latch_preset; UINT8 m_p1; diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index f6aee4eb5f0..cc663caa597 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -136,13 +136,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_vcu(*this,"vcu") + m_vcu(*this,"vcu"), + m_screen(*this, "screen") { } /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<mb_vcu_device> m_vcu; + required_device<screen_device> m_screen; /* video-related */ bitmap_ind16 m_tmpbitmaps[4]; diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 00014a93212..c7eb4c72769 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -91,7 +91,9 @@ public: m_cga_ram(*this, "cga_ram"), m_bios_ram(*this, "bios_ram"), m_vram(*this, "vram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<ide_controller_32_device> m_ide; required_shared_ptr<UINT32> m_main_ram; @@ -99,6 +101,8 @@ public: required_shared_ptr<UINT32> m_bios_ram; required_shared_ptr<UINT32> m_vram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_pal[768]; diff --git a/src/mame/drivers/megaphx.c b/src/mame/drivers/megaphx.c index 066c0849e62..0f62ca51499 100644 --- a/src/mame/drivers/megaphx.c +++ b/src/mame/drivers/megaphx.c @@ -69,7 +69,8 @@ public: m_mainram(*this, "mainram"), m_vram(*this, "vram"), m_ctc(*this, "ctc"), - port_c_value(0) + port_c_value(0), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -102,7 +103,7 @@ public: UINT8 port_c_value; - + required_device<palette_device> m_palette; int m_soundsent; UINT8 m_sounddata; UINT8 m_soundback; diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 39b7b6b661f..f3b549dd7f5 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -90,7 +90,8 @@ public: m_ram_attr(*this, "raattr"), m_ram_video(*this, "ravideo"), m_backup_ram(*this, "backup_ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } void dodge_nvram_init(nvram_device &nvram, void *base, size_t size); pen_t m_pens[NUM_PENS]; @@ -126,6 +127,7 @@ public: virtual void machine_start(); DECLARE_MACHINE_START(casino5); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 10de6aad8ee..99fd892d0b3 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -19,7 +19,9 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_video_ram; @@ -36,6 +38,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(mgolf_vram_w); DECLARE_READ8_MEMBER(mgolf_wram_r); diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index e9d43dd2940..c723a107786 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -65,7 +65,8 @@ public: m_gfxregs(*this, "gfxregs"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT16 *m_gfxram; required_shared_ptr<UINT16> m_gfxregs; @@ -87,6 +88,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index ace8a203d01..25f42058b4e 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -115,7 +115,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -142,6 +143,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index 0d637ac21bf..69c9353a1e8 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -369,7 +369,9 @@ public: m_track0_x(*this, "TRACK0_X"), m_track0_y(*this, "TRACK0_Y"), m_track1_x(*this, "TRACK1_X"), - m_track1_y(*this, "TRACK1_Y") + m_track1_y(*this, "TRACK1_Y"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<m6502_device> m_maincpu; @@ -383,6 +385,8 @@ public: required_ioport m_track0_y; required_ioport m_track1_x; required_ioport m_track1_y; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; const UINT8 *m_mainrom; const UINT8 *m_writeprom; diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 3532107ff36..a07b5fccbf6 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -24,7 +24,8 @@ public: mjsister_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_palette(*this, "palette") { } /* video-related */ bitmap_ind16 *m_tmpbitmap0; @@ -50,6 +51,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; dac_device *m_dac; /* memory */ diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index b9c5289ed81..807abb9511d 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -87,7 +87,8 @@ public: m_g_ram(*this, "g_ram"), m_cha_ram(*this, "cha_ram"), m_dot_ram(*this, "dot_ram"), - m_power_ram(*this, "power_ram") + m_power_ram(*this, "power_ram"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -107,6 +108,8 @@ public: required_shared_ptr<UINT16> m_cha_ram; required_shared_ptr<UINT16> m_dot_ram; required_shared_ptr<UINT8> m_power_ram; + + required_device<palette_device> m_palette; UINT16 *m_dma_ram; UINT8 m_dma_cpu_bank; diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c index 849ea3f75be..c922c15866f 100644 --- a/src/mame/drivers/monzagp.c +++ b/src/mame/drivers/monzagp.c @@ -37,7 +37,8 @@ public: monzagp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_coordx; int m_coordy; @@ -56,6 +57,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index c00be75d8c3..50e8c1cb739 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -183,7 +183,8 @@ public: : driver_device(mconfig, type, tag), m_video(*this, "video"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_output[8]; required_shared_ptr<UINT8> m_video; @@ -204,6 +205,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index 2e5cd99565c..040af86b146 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -118,7 +118,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; DECLARE_WRITE8_MEMBER(outport_w); @@ -127,6 +128,7 @@ public: required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index d4dfddde530..1c2caa35717 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -47,7 +47,8 @@ public: : driver_device(mconfig, type, tag), m_video(*this, "video"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_video; virtual void video_start(); @@ -55,6 +56,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 075d78df452..249d53099d3 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -63,7 +63,8 @@ public: m_mwarr_ram(*this, "mwarr_ram"), m_maincpu(*this, "maincpu"), m_oki2(*this, "oki2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -107,6 +108,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index f43e64d62ab..19de76f98a1 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1361,7 +1361,9 @@ public: m_lightx(*this, "LIGHTX"), m_lighty(*this, "LIGHTY"), m_p1(*this, "P1"), - m_p2(*this, "P2") + m_p2(*this, "P2"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -1381,6 +1383,9 @@ public: optional_ioport m_lighty; required_ioport m_p1; required_ioport m_p2; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + c404_t m_c404; c361_t m_c361; diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 66df6fb7e44..7d0e0065e3e 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -38,7 +38,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_upd4990a(*this, "upd4990a"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_npvidram; required_shared_ptr<UINT16> m_npvidregs; @@ -46,6 +48,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<upd4990a_old_device> m_upd4990a; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_audio_result; UINT8 m_bank_val; diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 9fbbd068120..00fd4d0ebb0 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -56,7 +56,8 @@ public: m_io_sysa(*this, "SYSA"), m_io_dswa(*this, "DSWA"), m_io_dswb(*this, "DSWB"), - m_io_dswc(*this, "DSWC") { } + m_io_dswc(*this, "DSWC"), + m_palette(*this, "palette") { } /* video-related */ UINT8 m_blit_raw_data[3]; @@ -127,7 +128,8 @@ protected: required_ioport m_io_dswa; required_ioport m_io_dswb; required_ioport m_io_dswc; - + required_device<palette_device> m_palette; + UINT8 nightgal_gfx_nibble( int niboffset ); void plot_nightgal_gfx_pixel( UINT8 pix, int x, int y ); }; diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 9675cb57c4b..c846ab84772 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -301,12 +301,17 @@ public: : snes_state(mconfig, type, tag), m_m50458(*this,"m50458"), m_s3520cf(*this, "s3520cf"), - m_rp5h01(*this,"rp5h01") + m_rp5h01(*this,"rp5h01"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<m50458_device> m_m50458; required_device<s3520cf_device> m_s3520cf; required_device<rp5h01_device> m_rp5h01; + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; + UINT8 m_wram_wp_flag; UINT8 *m_wram; UINT8 m_nmi_enable; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 5deba72661a..b39949f23f2 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -237,7 +237,8 @@ public: m_dsp(*this, "dsp"), m_k056800(*this, "k056800"), m_k001604(*this, "k001604"), - m_adc12138(*this, "adc12138") { } + m_adc12138(*this, "adc12138"), + m_palette(*this, "palette") { } // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2400; @@ -251,6 +252,7 @@ public: required_device<k056800_device> m_k056800; required_device<k001604_device> m_k001604; required_device<adc12138_device> m_adc12138; + required_device<palette_device> m_palette; emu_timer *m_sound_irq_timer; int m_fpga_uploaded; int m_lanc2_ram_r; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 5cf557947b4..413074609ab 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -65,7 +65,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -93,6 +94,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 0c14f63a8cb..e204a3cb424 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -56,7 +56,8 @@ public: m_fgram(*this, "fgram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -70,6 +71,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(onetwo_fgram_w); DECLARE_WRITE8_MEMBER(onetwo_cpubank_w); diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index b6c71e9ca0f..a840964ed9b 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -75,7 +75,9 @@ public: m_spritebank(*this, "spritebank"), m_maincpu(*this, "maincpu"), m_t5182(*this, "t5182"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_spriteram; @@ -85,6 +87,8 @@ public: required_device<cpu_device> m_maincpu; required_device<t5182_device> m_t5182; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; tilemap_t *m_bgtilemap; tilemap_t *m_infotilemap_2; diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 8a4f456ebeb..2a00e2a52b9 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -85,7 +85,8 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), - m_oki2(*this, "oki2") { } + m_oki2(*this, "oki2"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_wram; @@ -116,6 +117,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki1; required_device<okim6295_device> m_oki2; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 6b66ea5983f..96a20b1b0a4 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -78,7 +78,8 @@ public: m_pic8259_1(*this,"pic8259_1"), m_dma8237_1(*this,"dma8237_1") , m_maincpu(*this, "maincpu"), - m_speaker(*this, "speaker") { } + m_speaker(*this, "speaker"), + m_palette(*this, "palette") { } UINT8 m_bg_bank; int m_bank; @@ -131,6 +132,7 @@ public: void pcxt_speaker_set_spkrdata(UINT8 data); required_device<cpu_device> m_maincpu; required_device<speaker_sound_device> m_speaker; + required_device<palette_device> m_palette; }; UINT32 pcxt_state::screen_update_tetriskr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index bfb37a501b9..f432b3acc8d 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -203,7 +203,8 @@ public: m_io_port(*this, "io_port"), m_maincpu(*this, "maincpu"), m_i2cmem(*this, "i2cmem"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -286,6 +287,7 @@ public: required_device<cpu_device> m_maincpu; required_device<i2cmem_device> m_i2cmem; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 809ad1698e5..8a2058a6830 100644 --- a/src/mame/drivers/pinball2k.c +++ b/src/mame/drivers/pinball2k.c @@ -34,13 +34,17 @@ public: m_cga_ram(*this, "cga_ram"), m_bios_ram(*this, "bios_ram"), m_vram(*this, "vram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } 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; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_pal[768]; diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index 0184867c2f3..fc72b9058ac 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -56,7 +56,8 @@ public: m_janshi_paletteram2(*this, "paletteram2"), m_janshi_crtc_regs(*this, "crtc_regs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_janshi_back_vram; required_shared_ptr<UINT8> m_janshi_vram1; @@ -87,6 +88,7 @@ public: 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; + required_device<palette_device> m_palette; 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 9619d5b7c8d..36f9c128be2 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -80,7 +80,8 @@ public: m_vram1(*this, "vram1"), m_vram2(*this, "vram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tilemap1; tilemap_t *m_tilemap2; @@ -107,6 +108,7 @@ public: TIMER_CALLBACK_MEMBER(protection_deferred_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index ce488e8aca3..788388dc620 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -26,7 +26,8 @@ public: m_pkscramble_mdtilemap_ram(*this, "mdtilemap_ram"), m_pkscramble_bgtilemap_ram(*this, "bgtilemap_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } UINT16 m_out; UINT8 m_interrupt_line_active; @@ -51,6 +52,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index a30f5a71492..de9f25cdc7b 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -347,6 +347,7 @@ static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state ) MCFG_GFXDECODE_ADD("gfxdecode", pktgaldx) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", pktgaldx_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index 172775dab93..cdd5b6cfcf5 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -23,7 +23,8 @@ public: m_vram(*this, "vram"), m_pal(*this, "pal"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_pal; @@ -38,6 +39,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c index 660a4368e78..c6e597950ec 100644 --- a/src/mame/drivers/popobear.c +++ b/src/mame/drivers/popobear.c @@ -90,7 +90,8 @@ public: m_maincpu(*this,"maincpu"), m_spr(*this, "spr"), m_vregs(*this, "vregs"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { tilemap_base[0] = 0xf0000; @@ -108,7 +109,8 @@ public: required_shared_ptr<UINT16> m_spr; required_shared_ptr<UINT16> m_vregs; optional_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + UINT16* m_vram; UINT16* m_vram_rearranged; diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index c1cd8cd099d..d258478c01a 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -67,7 +67,8 @@ public: m_fbram(*this, "fbram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_videoram; UINT8 m_char_pen; @@ -94,6 +95,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index ea1be3e9634..446efdf503c 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -87,7 +87,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_fgmap; @@ -124,6 +125,7 @@ public: INTERRUPT_GEN_MEMBER(pturn_main_intgen); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 81f61736e22..6788793f42f 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -35,7 +35,9 @@ public: m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_video_regs; @@ -70,6 +72,8 @@ public: required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index ea2330435f1..0f01f6e6502 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -97,7 +97,8 @@ public: m_bg_ram(*this, "bg_ram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } struct prot_t m_prot; required_shared_ptr<UINT8> m_fg_ram; @@ -119,6 +120,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/quizshow.c b/src/mame/drivers/quizshow.c index f8c2fb5f0f3..933d0b37a33 100644 --- a/src/mame/drivers/quizshow.c +++ b/src/mame/drivers/quizshow.c @@ -42,13 +42,15 @@ public: m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), m_main_ram(*this, "main_ram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } 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; + required_device<screen_device> m_screen; tilemap_t *m_tilemap; UINT32 m_clocks; diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 20f2b5c33d1..c11483ea922 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -34,7 +34,8 @@ public: m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_bg_vram; @@ -46,6 +47,7 @@ public: optional_device<seibu_sound_device> m_seibu_sound; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 6acf0b15a57..de37bdc7a13 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -107,7 +107,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_viewregs0; required_shared_ptr<UINT32> m_viewregs6; @@ -155,7 +156,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c index 754f7f5c47f..71a4690c761 100644 --- a/src/mame/drivers/rastersp.c +++ b/src/mame/drivers/rastersp.c @@ -53,7 +53,8 @@ public: m_dac_l(*this, "dac_l"), m_dac_r(*this, "dac_r"), m_tms_timer1(*this, "tms_timer1"), - m_tms_tx_timer(*this, "tms_tx_timer") + m_tms_tx_timer(*this, "tms_tx_timer"), + m_palette(*this, "palette") {} #define VIDEO_ADDR_MASK 0x3fffffff @@ -99,6 +100,7 @@ public: required_device<dac_device> m_dac_r; required_device<timer_device> m_tms_timer1; required_device<timer_device> m_tms_tx_timer; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(cyrix_cache_w); DECLARE_READ8_MEMBER(nvram_r); diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index ed98ffdc38d..048cbe5677c 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -67,7 +67,8 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_gms_vidram2; required_shared_ptr<UINT16> m_gms_vidram; @@ -88,6 +89,7 @@ public: required_device<cpu_device> m_mcu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index 7348ba47d05..596f622992f 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -27,7 +27,8 @@ public: m_vram(*this, "vram"), m_cram(*this, "cram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; @@ -37,6 +38,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index da1e660d447..b7eedeef1d3 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -834,6 +834,7 @@ static MACHINE_CONFIG_START( rohga, rohga_state ) MCFG_VIDEO_START_OVERRIDE(rohga_state,rohga) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -893,6 +894,7 @@ static MACHINE_CONFIG_START( wizdfire, rohga_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -960,6 +962,7 @@ static MACHINE_CONFIG_START( nitrobal, rohga_state ) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", nitrobal_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") @@ -1030,6 +1033,7 @@ static MACHINE_CONFIG_START( schmeisr, rohga_state ) MCFG_VIDEO_START_OVERRIDE(rohga_state,schmeisr) MCFG_DECOCOMN_ADD("deco_common") + MCFG_DECOCOMN_PALETTE("palette") MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index a3f0c30f948..c874b9a35ad 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -45,7 +45,9 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; emu_timer *m_scanline_timer; @@ -76,6 +78,8 @@ public: required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index 56842979bcb..9bd18c6fc79 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -54,7 +54,9 @@ public: m_s2636(*this, "s2636"), m_waveenable(false), m_collision(0), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -96,6 +98,8 @@ public: bool m_waveenable; UINT8 m_collision; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index aef17cebbf5..461d73b1332 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -35,7 +35,8 @@ public: m_color_ram(*this, "color_ram"), m_fix_ram(*this, "fix_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_nmi_enable; @@ -65,6 +66,7 @@ public: void astron_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /* VIDEO GOODS */ diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 5d99042cfa3..82c93a42f23 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -72,7 +72,8 @@ public: m_sc3_vram(*this, "sc3_vram"), m_spriteram16(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -81,6 +82,7 @@ public: required_shared_ptr<UINT16> m_spriteram16; required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 cd782cecf93..e5651310233 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -291,7 +291,8 @@ public: m_3000_regs(*this, "3000_regs"), m_3800_regs(*this, "3800_regs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } bitmap_ind16 *m_temp_reel_bitmap; tilemap_t *m_tilemap; @@ -458,6 +459,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index 6206e4386f5..82154f023fc 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -105,7 +105,9 @@ public: m_spriteram(*this, "spriteram"), m_nvram(*this, "nvram"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_spriteram; @@ -113,6 +115,8 @@ public: required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; dynamic_array<UINT8> m_paletteram; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_reg; UINT8 m_rombank; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 066eed95380..9626772e361 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -39,7 +39,8 @@ public: m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -59,6 +60,7 @@ public: INTERRUPT_GEN_MEMBER(skyarmy_nmi_source); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; WRITE8_MEMBER(skyarmy_state::skyarmy_flip_screen_x_w) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 4fb147c551d..addae78d9da 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -112,7 +112,8 @@ public: m_reelscroll3(*this, "reelscroll3"), m_reelscroll4(*this, "reelscroll4"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tmap; required_shared_ptr<UINT8> m_videoram; @@ -167,6 +168,7 @@ public: INTERRUPT_GEN_MEMBER(skylncr_vblank_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 2fe87b0a3c2..c6ec167acdc 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -83,7 +83,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_colorram(*this, "colorram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_screen(*this, "screen") { } UINT16 m_io_offset; UINT16 m_io_reg[IO_SIZE]; @@ -120,6 +121,7 @@ public: void blit_gfx(); void render_jpeg(); required_device<cpu_device> m_audiocpu; + required_device<screen_device> m_screen; }; void sliver_state::plot_pixel_rgb(int x, int y, UINT32 r, UINT32 g, UINT32 b) diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index ef06c584c57..e017959002c 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -38,7 +38,8 @@ public: m_backup_ram(*this, "backup_ram"), m_ram_attr(*this, "raattr"), m_ram_video(*this, "ravideo"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } pen_t m_pens[NUM_PENS]; required_shared_ptr<UINT8> m_backup_ram; @@ -51,6 +52,7 @@ public: DECLARE_WRITE_LINE_MEMBER(vsync_changed); virtual void machine_start(); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/smsmcorp.c b/src/mame/drivers/smsmcorp.c index 7e5b79fc146..f0b227aeb99 100644 --- a/src/mame/drivers/smsmcorp.c +++ b/src/mame/drivers/smsmcorp.c @@ -225,7 +225,8 @@ class smsmfg_state : public driver_device public: smsmfg_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_screen(*this, "screen") { } UINT8 m_communication_port[4]; UINT8 m_communication_port_status; @@ -248,6 +249,7 @@ public: DECLARE_MACHINE_START(sureshot); UINT32 screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 89933931275..01da2ebb776 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -182,7 +182,8 @@ public: m_videoram(*this, "videoram"), m_io9400(*this, "io9400"), m_io9401(*this, "io9401"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; @@ -193,6 +194,7 @@ public: DECLARE_PALETTE_INIT(spaceg); UINT32 screen_update_spaceg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; /************************************* diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index fbf80927bbe..f7bf08ec740 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -31,7 +31,9 @@ public: m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_bg_tile_ram; tilemap_t *m_bg_tilemap; @@ -64,6 +66,8 @@ public: INTERRUPT_GEN_MEMBER(spoker_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; WRITE8_MEMBER(spoker_state::bg_tile_w) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index f12de9570a9..d8ae68e3e4c 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -80,7 +80,8 @@ public: m_dmaram(*this, "dmaram"), m_video_regs(*this, "video_regs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT16* m_tileram; required_shared_ptr<UINT16> m_sprram; @@ -112,6 +113,7 @@ public: UINT32 process(UINT8 b,UINT32 dst_offset); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #define VERBOSE 0 diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 8fe992147c7..9ae66deb05b 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -220,7 +220,8 @@ public: m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), m_region_user2(*this, "user2"), - m_io_ps7500(*this, "PS7500") { } + m_io_ps7500(*this, "PS7500"), + m_palette(*this, "palette") { } UINT32 m_PS7500_IO[MAXIO]; UINT32 m_PS7500_FIFO[256]; @@ -257,6 +258,7 @@ public: required_device<cpu_device> m_maincpu; required_memory_region m_region_user2; required_ioport m_io_ps7500; + required_device<palette_device> m_palette; typedef void (ssfindo_state::*ssfindo_speedup_func)(address_space &space); ssfindo_speedup_func ssfindo_speedup; diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index ee700719809..0809a44230a 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -87,7 +87,8 @@ public: m_tms(*this, "tms"), m_videoram(*this, "videoram"), m_question_offset(*this, "question_offset"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -96,6 +97,7 @@ public: tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_question_offset; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 8b38eab1eb0..ac29e2fea7e 100644 --- a/src/mame/drivers/stuntair.c +++ b/src/mame/drivers/stuntair.c @@ -92,7 +92,8 @@ public: m_bgram(*this, "bgram"), m_bgattrram(*this, "bgattrram"), m_sprram(*this, "sprram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -102,6 +103,7 @@ public: required_shared_ptr<UINT8> m_bgattrram; required_shared_ptr<UINT8> m_sprram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; 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 be1dac465c5..5a76841e276 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -126,7 +126,8 @@ public: m_scrolly(*this, "scrolly"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vid; @@ -143,6 +144,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void sub_state::video_start() diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 479b1f600c0..44e103a7930 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -249,7 +249,8 @@ public: m_reel3_ram(*this, "reel3_ram"), m_stisub_out_c(*this, "stisub_out_c"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_colorram; @@ -326,6 +327,7 @@ public: virtual void machine_start(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void subsino_state::machine_start() diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index 45238338031..50edaa05411 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -82,7 +82,9 @@ public: m_outputs(*this, "outputs"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT8 *m_hm86171_colorram; layer_t m_layers[2]; @@ -168,6 +170,8 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; 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 647ab01ebc6..f5837585e3f 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -27,7 +27,8 @@ public: m_attr(*this, "attr"), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -37,6 +38,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 5d15c45a1c2..d53ab18bb59 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -76,7 +76,8 @@ public: m_videoram(*this, "videoram"), m_char_bank(*this, "char_bank"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_col_line; required_shared_ptr<UINT8> m_videoram; @@ -97,6 +98,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index d5e872fc844..763e6c08d4f 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -35,7 +35,8 @@ public: m_laserdisc(*this, "laserdisc") , m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<pioneer_ldv1000_device> m_laserdisc; UINT8 m_ld_in_latch; @@ -57,6 +58,7 @@ public: INTERRUPT_GEN_MEMBER(superdq_vblank); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index 9a4b988aef6..07e9192e05b 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -38,7 +38,8 @@ public: m_videoram_fg(*this, "videorafg"), m_colorram_bg(*this, "colorrabg"), m_colorram_fg(*this, "colorrafg"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -48,6 +49,7 @@ public: required_shared_ptr<UINT8> m_colorram_bg; required_shared_ptr<UINT8> m_colorram_fg; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_tile_bank; UINT8 m_sound_byte; diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index af6ddcb8fdc..4f7c691a273 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -36,7 +36,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_videoram; @@ -79,6 +80,7 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c index e12c8df9ddb..d8cfe9a37ba 100644 --- a/src/mame/drivers/taitotz.c +++ b/src/mame/drivers/taitotz.c @@ -544,7 +544,8 @@ public: m_iocpu(*this, "iocpu"), m_work_ram(*this, "work_ram"), m_mbox_ram(*this, "mbox_ram"), - m_ata(*this, "ata") + m_ata(*this, "ata"), + m_screen(*this, "screen") { } @@ -553,6 +554,7 @@ public: required_shared_ptr<UINT64> m_work_ram; required_shared_ptr<UINT16> m_mbox_ram; required_device<ata_interface_device> m_ata; + required_device<screen_device> m_screen; DECLARE_READ64_MEMBER(ppc_common_r); DECLARE_WRITE64_MEMBER(ppc_common_w); diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index d5df6cd1325..f96961d1e2e 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -41,7 +41,8 @@ public: : pcat_base_state(mconfig, type, tag), m_region_user1(*this, "user1"), m_region_user5(*this, "user5"), - m_bank1(*this, "bank1") { } + m_bank1(*this, "bank1"), + m_palette(*this, "palette") { } UINT32 *m_bios_ram; UINT8 m_mxtc_config_reg[256]; @@ -50,6 +51,7 @@ public: required_memory_region m_region_user1; required_memory_region m_region_user5; required_memory_bank m_bank1; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(pnp_config_w); DECLARE_WRITE32_MEMBER(pnp_data_w); DECLARE_WRITE32_MEMBER(bios_ram_w); diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c index 53b0ff69aa4..09f01722c71 100644 --- a/src/mame/drivers/tgtpanic.c +++ b/src/mame/drivers/tgtpanic.c @@ -19,13 +19,15 @@ public: tgtpanic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_ram; UINT8 m_color; DECLARE_WRITE8_MEMBER(color_w); UINT32 screen_update_tgtpanic(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index c15fc5eeb21..007c9a4eee1 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -46,7 +46,8 @@ public: m_vram(*this, "vram"), m_control(*this, "control"), m_maincpu(*this, "maincpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_screen(*this, "screen") { } required_device<tlc34076_device> m_tlc34076; required_shared_ptr<UINT16> m_vram; @@ -75,6 +76,7 @@ public: TIMER_CALLBACK_MEMBER(setup_gun_interrupts); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; + required_device<screen_device> m_screen; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 9989422b001..3d4cc5c08f9 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -128,7 +128,9 @@ public: m_regs(*this, "regs"), m_galgames_ram(*this, "galgames_ram"), m_oki(*this, "oki"), - m_duart(*this, "duart68681"){ } + m_duart(*this, "duart68681"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<microtouch_serial_device> m_microtouch; @@ -136,6 +138,8 @@ public: optional_shared_ptr<UINT16> m_galgames_ram; required_device<okim6295_device> m_oki; optional_device<duartn68681_device> m_duart; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_okibank; UINT8 m_rtc_ram[8]; diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index d911f61c6a4..597672eebdc 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -44,7 +44,8 @@ public: m_spriteram(*this, "spriteram") , m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr_array<UINT32, 4> m_tilemap_regs; required_shared_ptr<UINT32> m_spriteregs; @@ -81,6 +82,7 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index a067a1f81b7..ede9a92ad19 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -98,7 +98,8 @@ public: m_gfxram(*this, "gfxram"), m_tileram(*this, "tileram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_bg_tilemap; required_shared_ptr<UINT8> m_gfxram; @@ -116,6 +117,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 4603cc55a39..3d660509af5 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -50,7 +50,8 @@ class ttchamp_state : public driver_device public: ttchamp_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_palette(*this, "palette") { } UINT16* m_peno_vram; UINT16* m_peno_mainram; @@ -87,6 +88,7 @@ public: UINT32 screen_update_ttchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ttchamp_irq); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index d1030566d4d..1b04f66533a 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -40,11 +40,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, "ram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_hd46505_0_reg[18]; UINT8 m_hd46505_1_reg[18]; diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 96e356b8feb..48ac204161c 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -60,11 +60,13 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), - m_paletteram(*this, "paletteram") { } + m_paletteram(*this, "paletteram"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_paletteram; + required_device<palette_device> m_palette; UINT16 m_paloff; DECLARE_READ16_MEMBER(twins_port4_r); DECLARE_WRITE16_MEMBER(twins_port4_w); diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 000fb46bcbd..79f659df1f3 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -20,7 +20,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k056800(*this, "k056800"), - m_workram(*this, "workram") { } + m_workram(*this, "workram"), + m_palette(*this, "palette") { } static const UINT32 VRAM_PAGES = 2; static const UINT32 VRAM_PAGE_BYTES = 512 * 1024; @@ -29,6 +30,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<k056800_device> m_k056800; required_shared_ptr<UINT32> m_workram; + required_device<palette_device> m_palette; DECLARE_READ32_MEMBER(vram_r); DECLARE_WRITE32_MEMBER(vram_w); diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index 1d8d1b81024..b53e6c8cc93 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -35,7 +35,8 @@ public: m_vram_3(*this, "vra3"), m_z80_wram(*this, "z80_wram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vram_0; required_shared_ptr<UINT16> m_vram_1; @@ -74,6 +75,7 @@ public: 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; + required_device<palette_device> m_palette; }; 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 19f6bb93f65..cb93986bd18 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -83,7 +83,8 @@ public: m_oki(*this, "oki"), m_oki2(*this, "oki_2"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_has_extra_gfx = 0; } @@ -98,6 +99,7 @@ public: optional_device<okim6295_device> m_oki2; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_flip_bit; int m_flipscreen; diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index 817230ff65d..a0640197b34 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -105,13 +105,15 @@ public: m_i8255(*this, "ppi8255"), m_ins8154(*this, "ins8154"), m_ay8910(*this, "ay8910"), - m_gfxdecode(*this, "gfxdecode") {} + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") {} 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; + required_device<palette_device> m_palette; int m_p2_data; int m_ext_offset_w; diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 136eb4ac6cf..e72c51caec5 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -120,7 +120,8 @@ public: vpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_videoram; UINT8 m_blit_ram[8]; @@ -132,6 +133,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index b333a055d92..84820a6eb49 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -50,7 +50,8 @@ public: m_colorram(*this, "colorram"), m_ball(*this, "ball"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -67,6 +68,7 @@ public: 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; + required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 906b5357b02..66a87de6f74 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -231,10 +231,14 @@ public: wheelfir_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_subcpu(*this, "subcpu") { } + m_subcpu(*this, "subcpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; INT32 *m_zoom_table; UINT16 *m_blitter_data; diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 6e34f20a46b..533c32bd280 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -243,7 +243,8 @@ public: m_gfx0_cram(*this, "gfx0_cram"), m_gfx1_vram(*this, "gfx1_vram"), m_gfx1_cram(*this, "gfx1_cram"), - m_sprite_ram(*this, "sprite_ram") { } + m_sprite_ram(*this, "sprite_ram"), + m_palette(*this, "palette") { } tilemap_t *m_gfx0a_tilemap; tilemap_t *m_gfx0b_tilemap; @@ -258,6 +259,7 @@ public: required_shared_ptr<UINT8> m_gfx1_vram; required_shared_ptr<UINT8> m_gfx1_cram; required_shared_ptr<UINT8> m_sprite_ram; + required_device<palette_device> m_palette; int m_scrollx; int m_scrolly; diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index b861c8c18e2..49226560d4f 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -190,7 +190,8 @@ public: m_k001604(*this, "k001604"), m_k056800(*this, "k056800"), m_k056832(*this, "k056832"), - m_workram(*this, "workram") { } + m_workram(*this, "workram"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -199,6 +200,7 @@ public: required_device<k056800_device> m_k056800; optional_device<k056832_device> m_k056832; optional_shared_ptr<UINT32> m_workram; + required_device<palette_device> m_palette; UINT32 *m_sharc_dataram; UINT8 m_led_reg0; diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 83c94466ed7..41f33643a00 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -15,7 +15,8 @@ public: m_protopal(*this, "protopal"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -56,4 +57,5 @@ public: void draw_sprites_p( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index f50b8f56032..b4dcaa36123 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -16,7 +16,8 @@ public: m_scrolly(*this, "scrolly"), m_bgscrollx(*this, "bgscrollx"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices / memory pointers */ @@ -28,7 +29,8 @@ public: required_shared_ptr<UINT8> m_bgscrollx; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 7e6ef8ce1f0..13d42da0b9b 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -17,7 +17,8 @@ public: m_mcu(*this, "mcu"), m_bmcu(*this, "bmcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -71,6 +72,7 @@ public: optional_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(nmi_disable_w); diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 34bd311c598..cfe6923dd58 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -14,7 +14,8 @@ public: m_ay(*this, "aysnd"), m_snd_latch_bit(4), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<ay8910_device> m_ay; @@ -49,4 +50,5 @@ public: UINT32 screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 11c0c74d422..fda2168becd 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -22,7 +22,9 @@ public: m_discrete(*this, "discrete"), m_speaker(*this, "speaker"), m_eeprom(*this, "eeprom"), - m_sn(*this, "snsnd") + m_sn(*this, "snsnd"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices/memory pointers */ @@ -32,7 +34,8 @@ public: optional_device<speaker_sound_device> m_speaker; optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<sn76477_device> m_sn; - + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; /* misc game specific */ UINT8 m_color_map; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 8dbe81e0578..888702bcdc0 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -19,7 +19,8 @@ public: m_stary(*this, "stary"), m_bgcolor(*this, "bgcolor"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -65,4 +66,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index cadf2ee6198..9ff4e087957 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -21,7 +21,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1videoram; @@ -126,4 +127,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 5b44df80e5f..94e7e6fe63d 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -21,7 +21,9 @@ public: m_slave(*this, "slave"), m_audiocpu(*this, "audiocpu"), m_pandora(*this, "pandora"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -52,6 +54,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<kaneko_pandora_device> m_pandora; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(devram_r); DECLARE_WRITE8_MEMBER(master_nmi_trigger_w); diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 811b1038020..45bc2d453ed 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -16,7 +16,8 @@ public: m_k007232_2(*this, "k007232_2"), m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), - m_k051316(*this, "k051316") { } + m_k051316(*this, "k051316"), + m_palette(*this, "palette") { } /* memory pointers */ // UINT8 * m_paletteram; // currently this uses generic palette handling @@ -39,6 +40,7 @@ public: required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; required_device<k051316_device> m_k051316; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_bank_w); DECLARE_READ8_MEMBER(ajax_ls138_f10_r); DECLARE_WRITE8_MEMBER(ajax_ls138_f10_w); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 5035c80fa09..d1620dc5cde 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -15,7 +15,8 @@ public: m_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT16> m_shared_ram; @@ -120,6 +121,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ym3812_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index e8e63f7c6d1..aac7039521a 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -15,7 +15,8 @@ public: m_scrollram(*this, "scrollram"), m_colorbank(*this, "colorbank"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,4 +32,5 @@ public: void draw_chars( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index ee2989b5a58..9a8189b51c7 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -401,7 +401,9 @@ public: m_pot1dat_port(*this, "POT1DAT"), m_p1joy_port(*this, "P1JOY"), m_p2joy_port(*this, "P2JOY"), - m_bank1(*this, "bank1") + m_bank1(*this, "bank1"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -425,6 +427,9 @@ public: optional_ioport m_p2joy_port; optional_memory_bank m_bank1; + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; + address_space* m_maincpu_program_space; const amiga_machine_interface *m_intf; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 0726c72bb52..fe91f2fc036 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -17,7 +17,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_ym2151(*this, "ymsnd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -38,6 +40,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<ym2151_device> m_ym2151; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(amspdwy_wheel_0_r); DECLARE_READ8_MEMBER(amspdwy_wheel_1_r); diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 7afb91183cc..0e2b8cabdf4 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -16,7 +16,8 @@ public: m_paletteram(*this, "paletteram"), m_subcpu(*this, "sub"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgtopvideoram; @@ -67,4 +68,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 7641fa00b86..c25920ed2a3 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -13,7 +13,8 @@ public: m_bg_colorram(*this, "bg_colorram"), m_msm(*this, "msm"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -61,6 +62,7 @@ public: DECLARE_WRITE_LINE_MEMBER(appoooh_adpcm_int); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 3a70127d26d..3ae9c293bdf 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -14,7 +14,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_mid_videoram; @@ -56,4 +57,5 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index b363a69debc..ad6cfefb60d 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -14,7 +14,8 @@ public: m_custom_cpu_ram(*this, "custom_cpu_ram"), m_blitter(*this, "blitter"), m_maincpu(*this, "maincpu"), - m_mcu(*this, "mcu") { } + m_mcu(*this, "mcu"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_custom_cpu_ram; @@ -48,4 +49,5 @@ public: void blit_area( UINT8 plane, UINT16 src, UINT8 x, UINT8 y, UINT8 sx, UINT8 sy ); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index b7d97f663a2..cb77c9bbfba 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -49,7 +49,9 @@ public: m_i2cmem(*this, "i2cmem"), m_wd1772(*this, "wd1772"), m_region_maincpu(*this, "maincpu"), - m_region_vram(*this, "vram") { } + m_region_vram(*this, "vram"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_device<aakart_device> m_kart; void archimedes_init(); @@ -92,6 +94,8 @@ protected: optional_device<device_t> m_wd1772; required_memory_region m_region_maincpu; required_memory_region m_region_vram; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; dac_device *m_dac[8]; private: diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index ca8c627fe8e..ccf30f01392 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -14,7 +14,9 @@ public: m_butasan_bg1ram(*this, "butasan_bg1ram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_bg0_scrollx; optional_shared_ptr<UINT8> m_bg0_scrolly; @@ -103,4 +105,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 7e622979d9f..991e9df40cd 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -20,7 +20,8 @@ public: m_protram(*this,"protram"), m_mcu(*this, "mcu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -91,4 +92,5 @@ public: void arkanoid_bootleg_init( ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 90df87bd7c0..1d44d9bbae0 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -11,7 +11,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_maincpu(*this, "maincpu"), m_extra(*this, "extra"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_text_videoram; @@ -91,6 +92,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_extra; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; class bigfghtr_state : public armedf_state diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 42c0576f6e7..a53a764d21a 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -34,7 +34,8 @@ public: m_votrax(*this, "votrax"), m_astrocade_sound1(*this, "astrocade1"), m_videoram(*this, "videoram"), - m_protected_ram(*this, "protected_ram") { } + m_protected_ram(*this, "protected_ram"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_subcpu; @@ -43,6 +44,7 @@ public: optional_device<astrocade_device> m_astrocade_sound1; optional_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_protected_ram; + required_device<screen_device> m_screen; UINT8 m_video_config; UINT8 m_sparkle[4]; diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index c78664ea637..de5c2865229 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -17,7 +17,8 @@ public: m_tomahawk_protection(*this, "tomahawk_prot"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_sn(*this, "snsnd") { } + m_sn(*this, "snsnd"), + m_screen(*this, "screen") { } /* video-related */ required_shared_ptr<UINT8> m_videoram; @@ -43,6 +44,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<samples_device> m_samples; // astrof & abattle optional_device<sn76477_device> m_sn; // tomahawk + required_device<screen_device> m_screen; DECLARE_READ8_MEMBER(irq_clear_r); DECLARE_WRITE8_MEMBER(astrof_videoram_w); DECLARE_WRITE8_MEMBER(tomahawk_videoram_w); diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index ce28ea5a961..12a3cde0c3b 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -27,7 +27,9 @@ public: m_scroll_register(*this, "scroll_register"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } /* video-related */ required_shared_ptr<UINT8> m_alphap1_videoram; @@ -63,7 +65,9 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_WRITE8_MEMBER(atarifb_out1_w); DECLARE_WRITE8_MEMBER(atarifb4_out1_w); DECLARE_WRITE8_MEMBER(abaseb_out1_w); diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 9bb76b8df2f..612f843f85c 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -12,7 +12,8 @@ public: m_nvram(*this, "nvram") , m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -38,4 +39,5 @@ public: void reset_bank(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 2d426cfbb99..2ae80c39f74 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -15,13 +15,15 @@ public: m_audiocpu(*this, "audiocpu"), m_vector(*this, "vector"), m_nvram(*this, "nvram") , - m_vectorram(*this, "vectorram") { } + m_vectorram(*this, "vectorram"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<vector_device> m_vector; required_shared_ptr<UINT16> m_nvram; required_shared_ptr<UINT16> m_vectorram; + required_device<screen_device> m_screen; int m_sound_status; int m_xcenter; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index 8789eff40b6..8ada16d917b 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -9,7 +9,8 @@ public: m_video_enable(*this, "video_enable"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_ls259_buf[8]; UINT8 m_p1_res; @@ -54,6 +55,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- timings -----------*/ diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 85f3d008e23..ed30d2f9984 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -47,7 +47,9 @@ public: m_shrike_shared(*this, "shrike_shared"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_68k(*this, "68k") { } + m_68k(*this, "68k"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<timer_device> m_scanline_timer; @@ -216,6 +218,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_68k; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 81c2c761b95..682f19dd066 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -14,7 +14,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -44,4 +45,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index 99e25d4ad54..3722fa55094 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -10,7 +10,8 @@ public: m_textram(*this, "textram"), m_maincpu(*this, "maincpu"), m_cus30(*this, "namco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_inputport_selected; int m_counter; @@ -20,6 +21,7 @@ public: required_device<cpu_device> m_maincpu; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_tx_tilemap; tilemap_t *m_bg_tilemap[2]; int m_xscroll[2]; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index a09232d4ddc..9ad94c4edd8 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_tileram; @@ -29,6 +30,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(battlane_cpu_command_w); DECLARE_WRITE8_MEMBER(battlane_palette_w); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 1e83e6bed2c..1a9b12e6bab 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -8,7 +8,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_control_port_select; int m_msm5205next; @@ -51,4 +53,6 @@ public: required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 29b684443ed..3ca1121aee5 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_in0_b4; @@ -42,4 +43,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index f3452f10cc7..af7e9736f2c 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -11,7 +11,9 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_custom(*this, "custom") { } + m_custom(*this, "custom"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_pbus; @@ -20,6 +22,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<beezer_sound_device> m_custom; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(beezer_bankswitch_w); DECLARE_WRITE8_MEMBER(beezer_map_w); diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 45710418383..7536552ef5c 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -12,7 +12,9 @@ public: m_mcu(*this, "mcu"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -103,4 +105,6 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 2ccb3e30048..d548c480da4 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -10,7 +10,8 @@ public: m_vidreg1(*this, "vidreg1"), m_vidreg2(*this, "vidreg2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tilemap; tilemap_t *m_tilemap2; @@ -36,4 +37,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 61f69988300..9a5f1b0b7a8 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -17,7 +17,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram16_device> m_spriteram; @@ -57,4 +58,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 2c03652bc0a..c5cb022a47a 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -22,7 +22,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k056832(*this, "k056832"), m_k054338(*this, "k054338"), - m_k055555(*this, "k055555") { } + m_k055555(*this, "k055555"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_ram; @@ -41,6 +42,7 @@ public: required_device<k056832_device> m_k056832; required_device<k054338_device> m_k054338; required_device<k055555_device> m_k055555; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(control_r); DECLARE_WRITE16_MEMBER(control_w); DECLARE_WRITE16_MEMBER(control2_w); diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 7ab23395bd4..0e80f764bca 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -9,7 +9,9 @@ public: m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_bmcu(*this, "bmcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -47,6 +49,8 @@ public: optional_device<cpu_device> m_mcu; optional_device<buggychl_mcu_device> m_bmcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; #if 0 /* 68705 */ diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 951d5d4f70c..ea6192f8784 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -19,7 +19,8 @@ public: m_k007420(*this, "k007420"), m_maincpu(*this, "maincpu"), m_upd7759(*this, "upd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -49,6 +50,7 @@ public: required_device<cpu_device> m_maincpu; required_device<upd7759_device> m_upd7759; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/bladestl.c -----------*/ diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 404fc5778fc..d1b9f286b0e 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -16,7 +16,8 @@ public: m_mcu(*this, "mcu"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -71,4 +72,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 46bb78ef3b7..be4b2adfcaa 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -16,7 +16,8 @@ public: m_paletteram(*this, "paletteram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_1; @@ -55,4 +56,5 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index ac88e024506..0d0e695d1a0 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -10,7 +10,8 @@ public: m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_videoram; required_device<discrete_device> m_discrete; @@ -35,6 +36,7 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index 3303e1c2f4d..9d7d0f0fe2e 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -17,7 +17,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -36,6 +37,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(bankedram_r); DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(blockhl_sh_irqtrigger_w); diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index 1a863c9b2c5..aac623819f5 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -13,7 +13,9 @@ public: m_frontvideoram(*this, "frontvideoram"), m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -27,6 +29,9 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_WRITE_LINE_MEMBER(irq_handler); DECLARE_WRITE16_MEMBER(blockout_sound_command_w); DECLARE_WRITE16_MEMBER(blockout_irq6_ack_w); diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index b0b093b6ec4..5832fe3cfc3 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -8,7 +8,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_txvideoram(*this, "txvideoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_bgvideoram; @@ -37,4 +38,5 @@ public: void weststry_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index f1837371395..723e7747637 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* device/memory pointers */ required_device<cpu_device> m_audiocpu; @@ -48,4 +49,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 250db768f46..1f2f6b2f497 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -15,7 +15,8 @@ public: m_colorram2(*this, "colorram2"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -51,4 +52,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index a99b187f117..650caa9bfc3 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,4 +48,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 601c92f7ea7..09b28d3fc4c 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -32,7 +32,8 @@ public: m_pf3_rowscroll(*this, "pf3_rowscroll"), m_pf4_rowscroll(*this, "pf4_rowscroll"), m_sprgen1(*this, "spritegen1"), - m_sprgen2(*this, "spritegen2") + m_sprgen2(*this, "spritegen2"), + m_palette(*this, "palette") { } /* devices */ @@ -53,6 +54,7 @@ public: required_shared_ptr<UINT16> m_pf4_rowscroll; required_device<decospr_device> m_sprgen1; required_device<decospr_device> m_sprgen2; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_DRIVER_INIT(boogwing); diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index e793cc2eba7..5a799801ad6 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -20,7 +20,8 @@ public: m_k007232_2(*this, "k007232_2"), m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), - m_k051316(*this, "k051316") { } + m_k051316(*this, "k051316"), + m_palette(*this, "palette") { } /* memory pointers */ // UINT8 * m_paletteram; // currently this uses generic palette handling @@ -44,6 +45,7 @@ public: required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; required_device<k051316_device> m_k051316; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_READ8_MEMBER(bottom9_bankedram1_r); diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 76ddc3964fd..008b7b8d206 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_fg_videoram; @@ -33,6 +34,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(brkthru_1803_w); diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 243997f4a4c..5f7f184276f 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -22,7 +22,8 @@ public: m_motion(*this, "motion"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -67,6 +68,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/bsktball.c -----------*/ diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 2503bed754e..b9bb632092a 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -21,7 +21,9 @@ public: m_audio_rambase(*this, "audio_rambase"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -59,7 +61,9 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_WRITE8_MEMBER(audio_nmi_enable_w); DECLARE_WRITE8_MEMBER(lnc_w); DECLARE_WRITE8_MEMBER(mmonkey_w); diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index b2b995efe92..4c36d841cec 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -29,7 +29,8 @@ public: m_vram_bg1(*this, "vram_bg1"), m_sprite_scale(*this, "sprite_scale"), m_sprite_control(*this, "sprite_control") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } // in drivers/btoads DECLARE_WRITE16_MEMBER( main_sound_w ); @@ -115,4 +116,5 @@ protected: UINT16 m_misc_control; int m_xcount; required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index 03c52f0d69b..24161903c79 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -17,7 +17,8 @@ public: m_mcu(*this, "mcu"), m_audiocpu(*this, "audiocpu"), m_slave(*this, "slave"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -68,6 +69,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_slave; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(bublbobl_bankswitch_w); DECLARE_WRITE8_MEMBER(tokio_bankswitch_w); diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index be30c5f8042..3cd03811077 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -20,7 +20,9 @@ public: m_mcu(*this, "mcu"), m_bmcu(*this, "bmcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_charram; @@ -51,6 +53,9 @@ public: required_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_WRITE8_MEMBER(bankswitch_w); DECLARE_WRITE8_MEMBER(sound_command_w); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index b1e93d07d5a..72a083fce71 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -20,7 +20,8 @@ public: m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bwp1_sharedram1; @@ -56,6 +57,7 @@ public: required_device<cpu_device> m_subcpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(bwp12_sharedram1_w); DECLARE_WRITE8_MEMBER(bwp3_u8F_w); diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index b2b088abd54..92035066970 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -16,7 +16,8 @@ public: m_adpcm2(*this, "adpcm2"), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_colorram; @@ -30,6 +31,7 @@ public: optional_device<msm5205_device> m_msm1; optional_device<msm5205_device> m_msm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_background_layer; tilemap_t *m_text_layer; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 7f838d545ba..d6e56e5ec47 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -11,7 +11,8 @@ public: m_aciabaud(*this, "aciabaud"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -56,6 +57,7 @@ private: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_tx_line; int m_s903_mux_data; int m_s905_mux_data; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index c775f9002ab..16b2282876c 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -25,7 +25,8 @@ public: m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -50,6 +51,7 @@ public: void draw_bombs( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 8fab0c1019e..07438cc525a 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -20,7 +20,8 @@ public: m_rowaddress(*this, "rowaddress"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_tms34061(*this, "tms34061") { } + m_tms34061(*this, "tms34061"), + m_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_rowaddress; @@ -35,6 +36,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<tms34061_device> m_tms34061; + required_device<screen_device> m_screen; + DECLARE_WRITE8_MEMBER(capbowl_rom_select_w); DECLARE_READ8_MEMBER(track_0_r); DECLARE_READ8_MEMBER(track_1_r); diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 441c01a2e44..ea0dbc0fcdc 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -37,4 +38,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 33269ec062f..a88746c61c6 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -33,7 +33,8 @@ public: m_ttl7474_1c_2(*this, "7474_1c_2"), m_ttl7474_1a_1(*this, "7474_1a_1"), m_ttl7474_1a_2(*this, "7474_1a_2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") {} required_shared_ptr<UINT8> m_alpharam; @@ -63,6 +64,7 @@ public: required_device<ttl7474_device> m_ttl7474_1a_1; required_device<ttl7474_device> m_ttl7474_1a_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; bitmap_ind16 *m_sprite_sprite_collision_bitmap1; bitmap_ind16 *m_sprite_sprite_collision_bitmap2; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 38ded379b7c..8f8d5a893b1 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -43,7 +43,9 @@ public: m_int_timer_left(*this, "int_timer_left"), m_int_timer_right(*this, "int_timer_right"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr_array<UINT16, 4> m_videoregs; @@ -237,6 +239,8 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; void update_irq_state(); void unpack_sprites(const char *region); void ddonpach_unpack_sprites(const char *region); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 21cad3c5aaa..40b371a082b 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -54,4 +55,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index b3ff8f52a00..b8d41ffb477 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -22,7 +22,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_deco_tilegen1(*this, "tilegen1"), - m_deco_tilegen2(*this, "tilegen2") + m_deco_tilegen2(*this, "tilegen2"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -45,6 +46,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(twocrude_control_w); DECLARE_READ16_MEMBER(twocrude_control_r); DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_rg_w); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 8432bd6ad30..49baba810b9 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -17,7 +17,9 @@ public: m_nvram_4a(*this, "nvram_4a") , m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } /* devices */ required_device<m6502_device> m_maincpu; @@ -28,6 +30,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* video-related */ const UINT8 *m_syncprom; diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index e79ee7f9b60..4ff7a980ff2 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -24,7 +24,8 @@ public: m_audiocpu(*this, "audiocpu"), m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), - m_vector(*this, "vector") { } + m_vector(*this, "vector"), + m_screen(*this, "screen") { } required_shared_ptr<UINT16> m_ram; required_device<cpu_device> m_maincpu; @@ -33,7 +34,8 @@ public: required_device<dac_device> m_dac1; required_device<dac_device> m_dac2; required_device<vector_device> m_vector; - + required_device<screen_device> m_screen; + int m_sound_flags; int m_coin_flag; int m_channel_active[2]; diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 63335496c94..5860d6a19b1 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -17,7 +17,8 @@ public: m_toprollr_bg_coloram(*this, "bg_coloram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_bigsprite_videoram; required_shared_ptr<UINT8> m_videoram; @@ -87,4 +88,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index b816be34cf8..77a5f0ebe18 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -17,7 +17,9 @@ public: m_bullsdrt_tiles_bankram(*this, "bullsdrt_bank"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_rambase; required_shared_ptr<UINT8> m_videoram; @@ -91,4 +93,6 @@ public: required_device<cpu_device> m_maincpu; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 7fd1c8079d3..993bf554f75 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -13,7 +13,8 @@ public: m_attr_ram(*this, "attr_ram"), m_spr_ram(*this, "spr_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_mcu_ram; @@ -61,4 +62,5 @@ public: void mcu_update_seed( UINT8 data ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index dbf47b4ddec..fc77de93c52 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -22,7 +22,8 @@ public: m_dac(*this, "dac"), m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_bg_videoram; @@ -78,4 +79,5 @@ public: optional_device<dac_device> m_dac1; optional_device<dac_device> m_dac2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 05883ebc4db..aecb34a6ee4 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -9,7 +9,9 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_mcu(*this, "mcu"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -99,4 +101,6 @@ public: void draw_river( bitmap_ind16 &bitmap, int sy ); void draw_tree( bitmap_ind16 &bitmap, int sy, int tree_num ); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index d703d363fc3..56bba362602 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -15,7 +15,9 @@ public: m_port_80(*this, "port_80"), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -30,6 +32,8 @@ public: required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(cheekyms_port_40_w); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 7e871276308..928afa2c24c 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -20,7 +20,8 @@ public: m_k007232_2(*this, "k007232_2"), m_k051960(*this, "k051960"), m_k051316_1(*this, "k051316_1"), - m_k051316_2(*this, "k051316_2") { } + m_k051316_2(*this, "k051316_2"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_ram; @@ -45,6 +46,7 @@ public: required_device<k051960_device> m_k051960; required_device<k051316_device> m_k051316_1; required_device<k051316_device> m_k051316_2; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(chqflag_bankswitch_w); DECLARE_WRITE8_MEMBER(chqflag_vreg_w); DECLARE_WRITE8_MEMBER(select_analog_ctrl_w); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 56dc5ad03f5..15b60635338 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -17,12 +17,14 @@ public: m_maincpu(*this, "maincpu"), m_ay1(*this, "ay1"), m_vector(*this, "vector"), - m_rambase(*this, "rambase") { } + m_rambase(*this, "rambase"), + m_screen(*this, "screen") { } required_device<ccpu_cpu_device> m_maincpu; optional_device<ay8910_device> m_ay1; required_device<vector_device> m_vector; optional_shared_ptr<UINT16> m_rambase; + required_device<screen_device> m_screen; UINT8 m_sound_control; void (*m_sound_handler)(running_machine &,UINT8 sound_val, UINT8 bits_changed); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index de1886f1dd1..4af908299e8 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -9,7 +9,8 @@ public: m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -25,6 +26,7 @@ public: required_device<samples_device> m_samples; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* game id */ int m_game_id; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 79959896f70..a9aa57835f8 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -24,7 +24,8 @@ public: m_dac(*this, "dac"), m_discrete(*this, "fltdisc"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spritebank; @@ -67,4 +68,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index e9e0997182b..985943054bf 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -19,7 +19,8 @@ public: m_soundcpu(*this, "soundcpu"), m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vregs; optional_shared_ptr_array<UINT16,3> m_scrollram; @@ -114,4 +115,5 @@ public: required_device<okim6295_device> m_oki1; required_device<okim6295_device> m_oki2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 14225f76801..69a5addd8ea 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,6 +32,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(citycon_in_r); DECLARE_READ8_MEMBER(citycon_irq_ack_r); diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 164c110f9c7..96ad827a0b6 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -13,7 +13,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_slave(*this, "slave"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -50,4 +52,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_slave; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 88b262c805a..a9ed3c4d87f 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -16,7 +16,9 @@ public: m_nvram(*this, "nvram") , m_spriteram(*this, "spriteram"), m_paletteram(*this, "paletteram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } /* devices */ required_device<m6502_device> m_maincpu; @@ -27,7 +29,9 @@ public: required_shared_ptr<UINT8> m_paletteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + /* video-related */ const UINT8 *m_syncprom; const UINT8 *m_wpprom; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index d070c80b8d8..cab8ce13440 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -8,7 +8,8 @@ public: m_vregs(*this, "vregs"), m_vram_0(*this, "vram_0"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_vram_1; @@ -36,4 +37,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 436a1eba0e8..fd007e1ab0d 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -36,7 +36,9 @@ public: m_sprgen(*this, "spritegen"), m_sprgen1(*this, "spritegen1"), m_sprgen2(*this, "spritegen2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices */ @@ -61,6 +63,8 @@ public: optional_device<decospr_device> m_sprgen1; optional_device<decospr_device> m_sprgen2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* misc */ int m_scanline; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 5be2e0f37d3..d05cde2c691 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -19,7 +19,8 @@ public: m_maincpu(*this, "maincpu"), m_upd7759(*this, "upd"), m_msm5205(*this, "msm5205"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_videoram; @@ -56,6 +57,7 @@ public: optional_device<upd7759_device> m_upd7759; optional_device<msm5205_device> m_msm5205; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(combatsc_vreg_w); DECLARE_WRITE8_MEMBER(combatscb_sh_irqtrigger_w); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 2203d701c6d..e96f2b99bf3 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -18,7 +18,8 @@ public: m_colorram(*this, "colorram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -54,4 +55,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 16eddf364a3..0071fc196a2 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -13,7 +13,8 @@ public: m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -49,4 +50,5 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index a5f4c6af717..2349622948e 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -23,7 +23,9 @@ public: m_k007121_1(*this, "k007121_1"), m_k007121_2(*this, "k007121_2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_buffered_spriteram; @@ -73,4 +75,6 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int bank ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index f0ff8a60b4a..c7e6db1eeac 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -14,7 +14,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -34,6 +35,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(cop01_sound_command_w); DECLARE_READ8_MEMBER(cop01_sound_command_r); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index ac70dee494a..c8492c544d3 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -20,7 +20,9 @@ public: m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_trucky; @@ -41,6 +43,8 @@ public: UINT32 screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 0311c1b9a25..5d20a573ebe 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -21,7 +21,9 @@ public: m_samples(*this, "samples"), m_dac(*this, "dac"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -90,4 +92,6 @@ public: void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; optional_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 4f90629eff7..607bf0ea6c5 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -83,7 +83,9 @@ public: m_m48t35(*this,"m48t35"), m_msm_1(*this, "msm1"), m_msm_2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ // cps1 @@ -177,6 +179,9 @@ public: optional_device<msm5205_device> m_msm_1; // fcrash optional_device<msm5205_device> m_msm_2; // fcrash required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_READ16_MEMBER(cps1_hack_dsw_r); DECLARE_READ16_MEMBER(cps1_in1_r); DECLARE_READ16_MEMBER(cps1_in2_r); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index b1c669daef8..d44689524d9 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -21,7 +21,8 @@ public: m_fullscreenzoom(*this, "fullscreenzoom"), m_0xc0000000_ram(*this, "0xc0000000_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_spriteram; @@ -133,6 +134,7 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 276115c671d..acb73f1857a 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -17,7 +17,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_palette(*this, "palette") { } /* memory pointers */ dynamic_array<UINT8> m_paletteram; @@ -32,6 +33,8 @@ public: required_device<k007232_device> m_k007232; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<palette_device> m_palette; + DECLARE_WRITE8_MEMBER(crimfght_coin_w); DECLARE_WRITE8_MEMBER(crimfght_sh_irqtrigger_w); DECLARE_READ8_MEMBER(k052109_051960_r); diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 974541b70fd..61f591f0bc2 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -17,7 +17,8 @@ public: m_spriteram2(*this, "spriteram2"), m_spr(*this, "vsystem_spr"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram1; @@ -68,4 +69,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index b387fc26be4..1c03ee3fbb2 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -35,7 +35,9 @@ public: m_s2636_0(*this, "s2636_0"), m_s2636_1(*this, "s2636_1"), m_s2636_2(*this, "s2636_2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -77,6 +79,8 @@ public: optional_device<s2636_device> m_s2636_1; optional_device<s2636_device> m_s2636_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* memory */ UINT8 m_color_ram[0x400]; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 4008db3bba0..eed459d70e2 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -34,7 +34,8 @@ public: m_lscreen(*this, "lscreen"), m_rscreen(*this, "rscreen"), m_paletteram_0(*this, "paletteram_0"), - m_paletteram_1(*this, "paletteram_1") { } + m_paletteram_1(*this, "paletteram_1"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<m6502_device> m_audiocpu; @@ -53,6 +54,7 @@ public: optional_device<screen_device> m_rscreen; optional_shared_ptr<UINT16> m_paletteram_0; optional_shared_ptr<UINT16> m_paletteram_1; + required_device<palette_device> m_palette; UINT16 m_current_slip[2]; UINT8 m_playfield_palette_bank[2]; UINT16 m_playfield_xscroll[2]; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index a8c1d2ae097..203f015fb43 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -44,7 +44,8 @@ public: m_filter1_3r(*this, "filter1.3r"), m_msm5205_l(*this, "msm5205.l"), m_msm5205_r(*this, "msm5205.r"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -91,6 +92,7 @@ public: required_device<filter_volume_device> m_msm5205_l; required_device<filter_volume_device> m_msm5205_r; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE16_MEMBER(darius_watchdog_w); diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index ca62cd05e05..0d1ff4d36ab 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_t5182(*this, "t5182"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spritebank; required_shared_ptr<UINT8> m_scroll; @@ -23,6 +24,7 @@ public: required_device<cpu_device> m_maincpu; required_device<t5182_device> m_t5182; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_hw; tilemap_t *m_bgtilemap; diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 226df119a39..880e3f43edd 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -15,7 +15,8 @@ public: m_pf3_rowscroll(*this, "pf3_rowscroll"), m_sprgen(*this, "spritegen"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_palette(*this, "palette") { } required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; @@ -39,4 +40,5 @@ public: void update_24bitcol(int offset); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index db84c127756..4d2d9c5897f 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -30,7 +30,8 @@ public: m_shared_ram(*this, "shared_ram"), m_ram2(*this, "ram2"), m_sprgen1(*this, "spritegen1"), - m_sprgen2(*this, "spritegen2") + m_sprgen2(*this, "spritegen2"), + m_palette(*this, "palette") { } /* devices */ @@ -53,6 +54,7 @@ public: optional_device<decospr_device> m_sprgen1; optional_device<decospr_device> m_sprgen2; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(dassault_control_r); DECLARE_WRITE16_MEMBER(dassault_control_w); diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 5c83531e367..e507c109beb 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -19,7 +19,8 @@ public: dcheese_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_screen(*this, "screen") { } /* video-related */ UINT16 m_blitter_color[2]; @@ -39,6 +40,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<screen_device> m_screen; device_t *m_bsmt; DECLARE_WRITE16_MEMBER(eeprom_control_w); DECLARE_WRITE16_MEMBER(sound_command_w); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index 1b3f8c59e3a..4ca9baa210b 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -9,7 +9,8 @@ public: m_textram(*this, "textram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_back_data; required_shared_ptr<UINT16> m_fore_data; @@ -44,4 +45,5 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index ba6666214b2..3806699721e 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -15,7 +15,9 @@ public: m_bgvideoram(*this, "bgvideoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_textvideoram; @@ -57,4 +59,6 @@ public: void start_countdown_timer(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 357638e51be..4e794670b89 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -23,7 +23,9 @@ public: m_subcpu(*this, "sub"), m_adpcm1(*this, "adpcm1"), m_adpcm2(*this, "adpcm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT8> m_rambase; @@ -71,6 +73,8 @@ public: optional_device<msm5205_device> m_adpcm1; optional_device<msm5205_device> m_adpcm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int scanline_to_vcount(int scanline); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 71c69724f87..1858b0b1eec 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -18,7 +18,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { vblank_level = 6; @@ -55,6 +57,8 @@ public: required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(ddragon3_io_w); DECLARE_WRITE16_MEMBER(ddragon3_scroll_w); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index e085e146244..126a30e6ae6 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -24,7 +24,8 @@ public: m_filter1(*this, "filter1"), m_filter2(*this, "filter2"), m_filter3(*this, "filter3"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -52,6 +53,7 @@ public: required_device<filter_rc_device> m_filter2; required_device<filter_rc_device> m_filter3; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(ddribble_bankswitch_w); DECLARE_READ8_MEMBER(ddribble_sharedram_r); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 819ca067be0..eb4f7035a91 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -14,7 +14,8 @@ public: m_seibu_sound(*this, "seibu_sound"), m_adpcm1(*this, "adpcm1"), m_adpcm2(*this, "adpcm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -28,6 +29,7 @@ public: required_device<seibu_adpcm_device> m_adpcm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_pf3_layer; tilemap_t *m_pf2_layer; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 2b014aa167f..7f9284e0e37 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -19,7 +19,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_ram; required_shared_ptr<UINT16> m_spriteram; @@ -101,6 +102,7 @@ public: optional_device<cpu_device> m_subcpu; optional_device<cpu_device> m_mcu; optional_device<msm5205_device> m_msm; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index dee701ead9d..21342e70295 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -26,7 +26,8 @@ public: m_spritegen_mxc(*this, "spritegen_mxc"), m_videoram(*this, "videoram"), m_bg_data(*this, "bg_data"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -45,6 +46,7 @@ public: optional_shared_ptr<UINT8> m_bg_data; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 * m_pf1_data; UINT8 * m_row; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index e784386b2b1..cd32a4cd99e 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -32,7 +32,9 @@ public: m_oki2(*this, "oki2"), m_deco_tilegen1(*this, "tilegen1"), m_deco_tilegen2(*this, "tilegen2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -91,6 +93,8 @@ public: required_device<deco16ic_device> m_deco_tilegen2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_irq_source; DECLARE_WRITE_LINE_MEMBER(sound_irq_nslasher); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 87d988b473e..b67d5a94a7e 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -15,7 +15,9 @@ public: m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), m_ymz(*this, "ymz"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_device<deco146_device> m_deco146; @@ -69,6 +71,8 @@ public: required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<ymz280b_device> m_ymz; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index bf56c9cbadb..032ab442f39 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -29,7 +29,9 @@ public: m_tileram(*this, "tileram"), m_objectram(*this, "objectram"), m_paletteram(*this, "paletteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { m_type1_map = 0; } @@ -50,6 +52,8 @@ public: required_shared_ptr<UINT8> m_objectram; required_shared_ptr<UINT8> m_paletteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; size_t m_bgvideoram_size; /* video-related */ diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 173b3fbab2a..2f77aa914bc 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -17,7 +17,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -73,4 +74,5 @@ public: optional_device<cpu_device> m_audiocpu; // system 16c does not have sound CPU required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 7128b0c5e36..ef9398c5873 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -20,7 +20,8 @@ public: m_cpu2(*this, "cpu2"), m_beast(*this, "beast"), m_pandora(*this, "pandora"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -54,6 +55,7 @@ public: required_device<cpu_device> m_beast; required_device<kaneko_pandora_device> m_pandora; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(beast_data_w); DECLARE_READ8_MEMBER(beast_data_r); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index dbdd1b2fce0..da7080ae958 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -13,7 +13,8 @@ public: m_k056832(*this, "k056832"), m_k055555(*this, "k055555"), m_ata(*this, "ata"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -71,6 +72,7 @@ public: required_device<k055555_device> m_k055555; required_device<ata_interface_device> m_ata; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/djmain.c -----------*/ diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index d9396bfe8a0..30b348a1980 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -104,7 +104,9 @@ public: m_vg3(0), m_cv3(0), m_cv4(0), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices */ @@ -181,6 +183,8 @@ public: int m_pixelcnt; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* radarscp_scanline */ int m_counter; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 0e0fc8f1ea1..16d7c057185 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -20,7 +20,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ @@ -36,7 +37,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_do_tilemap; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index f5adee819a5..d4be4277df2 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -13,7 +13,9 @@ public: m_sharedram(*this, "sharedram"), m_subcpu(*this, "sub") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -59,4 +61,6 @@ public: void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 82487796556..a4b519c4413 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -11,7 +11,8 @@ public: m_paletteram_flytiger(*this, "flytiger_palram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_device<buffered_spriteram8_device> m_spriteram; optional_device<buffered_spriteram16_device> m_spriteram16; @@ -101,4 +102,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index f6f6413868c..c0962cb184c 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -31,7 +31,8 @@ public: m_position_ram(*this, "position_ram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -61,6 +62,7 @@ public: void dragrace_update_misc_flags( address_space &space ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; /*----------- defined in audio/dragrace.c -----------*/ diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 9b1182e8897..13214c4acd0 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -18,7 +18,8 @@ public: m_oki_2(*this, "oki2") , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_vidregs; @@ -76,4 +77,5 @@ public: required_device<cpu_device> m_maincpu; required_device<pic16c55_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index f7f567abd86..d06b9024456 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -12,7 +12,8 @@ public: : driver_device(mconfig, type, tag), m_msm(*this, "msm"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_videoram; @@ -42,4 +43,5 @@ public: DECLARE_WRITE_LINE_MEMBER(pcm_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 52525ddd521..aeb684a3752 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -17,7 +17,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_oki(*this, "oki"), - m_msm(*this, "msm") + m_msm(*this, "msm"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } // up to 8 layers, 2 images per layer (interleaved on screen) @@ -164,6 +166,8 @@ public: device_t *m_ymsnd; optional_device<okim6295_device> m_oki; optional_device<msm5205_device> m_msm; + optional_device<screen_device> m_screen; + required_device<palette_device> m_palette; device_t *m_top_scr; device_t *m_bot_scr; DECLARE_WRITE8_MEMBER(dynax_vblank_ack_w); diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index f2ab6cab62a..fa40533d6b6 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -13,7 +13,8 @@ public: m_fore_data(*this, "fore_data"), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_scroll_ram; @@ -24,6 +25,7 @@ public: required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_seibu_sound; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_layer; tilemap_t *m_fg_layer; diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 9c3873ab2f4..e8fec69abb1 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -16,7 +16,9 @@ public: m_peny1port(*this, "PEN_Y_P1"), m_penx2port(*this, "PEN_X_P2"), m_peny2port(*this, "PEN_Y_P2"), - m_sndbank(*this, "sound_bank") + m_sndbank(*this, "sound_bank"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_coin_counter_bit; @@ -36,7 +38,8 @@ public: optional_ioport m_penx2port; optional_ioport m_peny2port; optional_memory_bank m_sndbank; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ32_MEMBER(eolith_custom_r); DECLARE_WRITE32_MEMBER(systemcontrol_w); diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index b61ab5568c3..375441dee4d 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -19,7 +19,8 @@ public: m_alpha_tilemap(*this, "alpha"), m_mob(*this, "mob"), m_jsa(*this, "jsa"), - m_extra(*this, "extra") { } + m_extra(*this, "extra"), + m_palette(*this, "palette") { } required_device<tilemap_device> m_playfield_tilemap; required_device<tilemap_device> m_alpha_tilemap; @@ -50,7 +51,7 @@ public: UINT32 screen_update_guts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void update_palette(); optional_device<cpu_device> m_extra; - + required_device<palette_device> m_palette; static const atari_motion_objects_config s_mob_config; static const atari_motion_objects_config s_guts_mob_config; }; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 957e618940b..cabd99b40e6 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -22,7 +22,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -129,4 +130,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 7929286077e..2810376c62a 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -18,7 +18,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_attributeram; @@ -41,6 +42,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w); DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w); diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index e0698715ef1..3ad77a976a8 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -43,7 +43,8 @@ public: m_soundcpu(*this, "sound_cpu"), m_tms(*this, "tms5220nl"), m_pal_ram(*this, "pal_ram"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_screen(*this, "screen") { } required_device<cpu_device> m_framecpu; required_device<esrip_device> m_videocpu; @@ -121,6 +122,7 @@ public: TIMER_CALLBACK_MEMBER(hblank_start_callback); TIMER_CALLBACK_MEMBER(hblank_end_callback); required_device<dac_device> m_dac; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 10997e71990..0d8cfa82bb9 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -18,7 +18,8 @@ public: m_nbg_xscroll(*this, "nbg_xscroll"), m_bg_scroll(*this, "bg_scroll"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -55,4 +56,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 52d77e4bd94..322aa1515b1 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -29,7 +29,9 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_main_ram; @@ -52,6 +54,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(exerion_protection_r); DECLARE_WRITE8_MEMBER(exerion_videoreg_w); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 4bf56b36324..f7a77d05134 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -46,7 +46,9 @@ public: m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; @@ -63,6 +65,8 @@ public: optional_device<dac_device> m_dac; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_last_dial; UINT8 m_collision_mask; diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index dc345b6d404..8e97b849475 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -20,7 +20,9 @@ public: m_spriteram(*this, "spriteram"), m_scanline(*this, "scanline"), m_maincpu(*this, "maincpu"), - m_custom(*this, "custom") { } + m_custom(*this, "custom"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_imageram; required_shared_ptr<UINT8> m_spriteram; @@ -28,7 +30,9 @@ public: required_device<cpu_device> m_maincpu; required_device<exidy440_sound_device> m_custom; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_bank; const UINT8 *m_showdown_bank_data[2]; INT8 m_showdown_bank_select; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 563eb9735de..c01cbde48ba 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -29,6 +30,7 @@ public: required_shared_ptr<UINT8> m_colorram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* protection */ UINT8 m_prot_value; diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index ef31b5bec6f..1e22a4818fb 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -10,7 +10,8 @@ public: m_objectram0(*this, "objectram0"), m_videoram0(*this, "videoram0"), m_cpuc(*this, "cpuc"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_objectram1; required_shared_ptr<UINT8> m_videoram1; @@ -20,6 +21,7 @@ public: required_shared_ptr<UINT8> m_videoram0; required_device<cpu_device> m_cpuc; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_cpua_bank; int m_cpub_bank; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 216b1ecd208..f48637ac832 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -26,7 +26,8 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_audiocpu(*this, "audiocpu"), - m_k053936(*this, "k053936") { } + m_k053936(*this, "k053936"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_sharedram; @@ -72,6 +73,7 @@ public: required_device<gfxdecode_device> m_gfxdecode; optional_device<cpu_device> m_audiocpu; optional_device<k053936_device> m_k053936; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(f1gp_sh_bankswitch_w); DECLARE_WRITE16_MEMBER(sound_command_w); diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index e233790bc0c..8b315a6ba11 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -13,7 +13,9 @@ public: m_spriteram2(*this, "spriteram2", 0), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ // UINT8 * m_spriteram; // currently directly used in a 16bit map... @@ -68,4 +70,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index ce6a73b580e..ae3db6923e3 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -17,7 +17,8 @@ public: m_attributesram(*this, "attributesram"), m_background_color(*this, "bgcolor"), m_imago_fg_videoram(*this, "imago_fg_vram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_imago_sprites[0x800*3]; UINT16 m_imago_sprites_address; @@ -29,6 +30,8 @@ public: optional_shared_ptr<UINT8> m_background_color; optional_shared_ptr<UINT8> m_imago_fg_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; + UINT16 m_charbank; UINT8 m_colorbank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index b9649bdd550..7f8bce0299c 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -21,7 +21,9 @@ public: m_k007232_1(*this, "k007232_1"), m_k007232_2(*this, "k007232_2"), m_k007121(*this, "k007121"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -43,6 +45,8 @@ public: required_device<k007232_device> m_k007232_2; required_device<k007121_device> m_k007121; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(k007121_registers_w); DECLARE_WRITE8_MEMBER(fastlane_bankswitch_w); diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 2c604e82111..fb54f5e61ed 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -30,7 +30,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -52,6 +53,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(fcombat_protection_r); DECLARE_READ8_MEMBER(fcombat_port01_r); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index b08fe9d5684..84a31b8dfdc 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -13,7 +13,9 @@ public: m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), m_mb14241(*this, "mb14241"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -36,6 +38,8 @@ public: required_device<cpu_device> m_maincpu; required_device<mb14241_device> m_mb14241; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(fgoal_analog_r); DECLARE_READ8_MEMBER(fgoal_nmi_reset_r); diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 39fc45fc4a8..68f01f9f42e 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -18,7 +18,8 @@ public: m_spriteram_2(*this, "spriteram_2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -60,4 +61,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index c1103e19333..bd33c2b47d3 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -17,7 +17,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_bg1videoram; @@ -49,6 +50,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(firetrap_nmi_disable_w); DECLARE_WRITE8_MEMBER(firetrap_bankselect_w); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 2e844320ee8..44947435b84 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -46,7 +46,9 @@ public: m_drone_x(*this, "drone_x"), m_drone_y(*this, "drone_y"), m_drone_rot(*this, "drone_rot"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -61,6 +63,8 @@ public: optional_shared_ptr<UINT8> m_drone_y; optional_shared_ptr<UINT8> m_drone_rot; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_in_service_mode; UINT32 m_dial[2]; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index b803c60d47d..46332a06c0b 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -15,7 +15,8 @@ public: m_fof_txt_tileram(*this, "fof_txt_tileram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_fof_100000; @@ -68,4 +69,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index c5df8d5d8f8..5d568348c2c 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "subcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_sn_nmi_enable; required_shared_ptr<UINT8> m_spriteram; @@ -47,6 +48,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 1b11b6221cc..22af48099aa 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -13,7 +13,8 @@ public: m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -64,6 +65,7 @@ public: optional_device<cpu_device> m_mcu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* mcu */ UINT8 m_mcu_cmd; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 1f5fb3be9a5..4f895b6ac7e 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -59,4 +60,5 @@ public: void freekick_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 90fcb63b68b..17218846c58 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -9,7 +9,8 @@ public: m_subcpu(*this, "sub"), m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ UINT16 *m_paletteram[2]; @@ -120,4 +121,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 1bf7d98da84..13fef6cd778 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -20,7 +20,9 @@ public: m_subcpu(*this, "sub"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers (used by pipedrm) */ optional_shared_ptr<UINT8> m_videoram; @@ -100,4 +102,6 @@ public: required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 27acbed9608..96653e09212 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -35,4 +36,5 @@ public: void draw_columns( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index ac5032b022d..f37d198b328 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -42,4 +43,5 @@ public: UINT32 screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 78a81b3d794..c2e980f1fe7 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -9,7 +9,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -31,4 +32,5 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index ce857ead0df..0d4c1bc591f 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -20,7 +20,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr_array<UINT16,4> m_vram; @@ -62,7 +64,8 @@ public: DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 21ed967b7c2..942dae5f6dd 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -29,7 +29,9 @@ public: m_tilebank(*this, "tilebank"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr_array<UINT32,4> m_vram; @@ -53,6 +55,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w); diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 25df5a08691..7652419260b 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -15,7 +15,8 @@ public: m_screenram(*this, "screenram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -47,4 +48,5 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 43ca13bfdd9..e56ed26679b 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -12,7 +12,8 @@ public: m_vregs(*this, "vregs"), m_snowboar_protection(*this, "snowboar_prot"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<m68000_device> m_maincpu; required_device<buffered_spriteram16_device> m_spriteram; @@ -20,6 +21,7 @@ public: optional_shared_ptr<UINT16> m_snowboar_protection; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_clr_gun_int; UINT8 m_analog_ports[2]; diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index d2f3dac2d54..ed05bca3110 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -65,7 +65,8 @@ public: m_adsp(*this, "adsp"), m_eeprom(*this, "eeprom"), m_tms(*this, "tms"), - m_serial(*this, "serial") { } + m_serial(*this, "serial"), + m_screen(*this, "screen") { } required_shared_ptr<UINT32> m_adsp_ram_base; required_shared_ptr<UINT16> m_m68k_ram_base; @@ -77,6 +78,8 @@ public: required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<cpu_device> m_tms; required_device<gaelco_serial_device> m_serial; + required_device<screen_device> m_screen; + UINT16 m_sound_data; UINT8 m_sound_status; offs_t m_tms_offset_xor; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 41c0533797c..c2cf4a62620 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -17,7 +17,9 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -99,4 +101,6 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 90ade242044..30f1fa44d4e 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -16,7 +16,9 @@ public: m_subcpu(*this, "sub"), m_subcpu2(*this, "sub2"), m_namco_sound(*this, "namco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT8> m_videoram; @@ -29,6 +31,8 @@ public: required_device<cpu_device> m_subcpu2; required_device<namco_device> m_namco_sound; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; emu_timer *m_cpu3_interrupt_timer; UINT8 m_custom_mod; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 375c304e6be..fe6a4d9f8bf 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -29,7 +29,9 @@ public: m_eeprom(*this, "eeprom"), m_tc0100scn(*this, "tc0100scn"), m_tc0480scp(*this, "tc0480scp"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -39,6 +41,9 @@ public: required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT16 m_coin_word; UINT16 m_frame_counter; int m_tc0110pcr_addr; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index d085cd74ef6..52c189d74de 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -51,7 +51,9 @@ public: m_ppi8255_2(*this, "ppi8255_2"), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -67,6 +69,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_bullets_base; int m_sprites_base; diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 5b3eb0ccd6b..f77757849cd 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -38,7 +38,9 @@ public: m_audiocpu(*this, "audiocpu"), m_7474_9m_1(*this, "7474_9m_1"), m_7474_9m_2(*this, "7474_9m_2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -250,6 +252,8 @@ public: optional_device<ttl7474_device> m_7474_9m_1; optional_device<ttl7474_device> m_7474_9m_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; #define galaxold_coin_counter_0_w galaxold_coin_counter_w diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index fbbbbf2c0e2..aa8d425bcbf 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -14,7 +14,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -63,4 +64,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index 24d69f12b27..be92174407f 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -20,7 +20,8 @@ public: m_kaneko_spr(*this, "kan_spr"), m_spriteram(*this, "spriteram"), m_oki2(*this, "oki2"), - m_eeprom(*this, "eeprom") + m_eeprom(*this, "eeprom"), + m_palette(*this, "palette") { } required_shared_ptr_array<UINT16, 2> m_bg8; @@ -72,4 +73,5 @@ public: DECLARE_WRITE16_MEMBER( galpani2_bg15_w ); required_device<okim6295_device> m_oki2; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index a5a166e3a32..e5584d0e79a 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -8,7 +8,9 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_bgvideoram; required_shared_ptr<UINT16> m_fgvideoram; @@ -16,6 +18,8 @@ public: bitmap_ind16 m_sprites_bitmap; optional_shared_ptr<UINT16> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(galpanic_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_6295_bankswitch_w); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index bcb72444796..9e52e732eb6 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -19,7 +19,8 @@ public: m_scroll(*this, "scroll"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -38,4 +39,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index ecef8e32bec..9839c431f84 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -40,7 +40,8 @@ public: m_riot(*this, "riot"), m_via_0(*this, "via6522_0"), m_via_1(*this, "via6522_1"), - m_via_2(*this, "via6522_2") { } + m_via_2(*this, "via6522_2"), + m_screen(*this, "screen") { } /* machine state */ UINT8 m_current_port; @@ -62,6 +63,7 @@ public: required_device<via6522_device> m_via_0; required_device<via6522_device> m_via_1; required_device<via6522_device> m_via_2; + required_device<screen_device> m_screen; DECLARE_WRITE8_MEMBER(io_select_w); DECLARE_READ8_MEMBER(io_port_r); DECLARE_WRITE_LINE_MEMBER(coin_w); diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 9a15adddb8a..56f5d9349a6 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -35,7 +35,9 @@ public: m_customio_3(*this,"customio_3"), m_videoram(*this,"videoram"), m_spriteram(*this,"spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -46,6 +48,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; namco58xx_device *m_namco58xx; namco56xx_device *m_namco56xx; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index a9fc8d10daf..8bacf570640 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -19,7 +19,8 @@ public: m_soundlatch(*this, "soundlatch"), m_sn(*this, "snsnd") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -64,4 +65,5 @@ public: void gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index 70616c8497e..ece165bece4 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -19,7 +19,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -39,6 +40,7 @@ public: required_device<k007232_device> m_k007232; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(bankedram_r); DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(gbusters_1f98_w); diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 9c3c0bff76c..c45c7b5f074 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -19,7 +19,8 @@ public: m_tilemapram(*this, "tilemapram"), m_spriteram(*this, "spriteram"), m_ioc_ram(*this, "ioc_ram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ @@ -33,6 +34,7 @@ public: required_shared_ptr<UINT16> m_ioc_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; // UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 9bbfc77e55d..6dc63a4c416 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -21,7 +21,8 @@ public: m_k054539(*this, "k054539"), m_k056832(*this, "k056832"), m_k053246(*this, "k053246"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -47,6 +48,7 @@ public: required_device<k056832_device> m_k056832; required_device<k053247_device> m_k053246; required_device<k053251_device> m_k053251; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(control2_r); DECLARE_WRITE16_MEMBER(control2_w); DECLARE_WRITE16_MEMBER(sound_cmd_w); diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 83aec8afe8c..8d6127e9ae1 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -15,7 +15,8 @@ public: m_fgram(*this, "fgram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_txtram; @@ -52,4 +53,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index e2f741c7654..4087132757a 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -14,7 +14,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram; @@ -81,4 +82,5 @@ public: required_device<cpu_device> m_subcpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index aa5868c6550..e9cbddbb8d8 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_mainram(*this, "mainram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -53,4 +54,5 @@ public: void glass_ROM16_split_gfx( const char *src_reg, const char *dst_reg, int start, int length, int dest1, int dest2 ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 11bf38a212e..2145925d645 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -15,7 +15,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -48,4 +49,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index c84abd51cbe..a1b9e48ca5a 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -17,7 +17,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_data; @@ -63,4 +64,5 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index f6e01608b85..3491a7be741 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -17,7 +17,8 @@ public: m_spriteram2(*this, "spriteram2"), m_fg_videoram(*this, "fg_videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -53,4 +54,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int gfxbank, UINT8 *sprite_ram ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 06f77b06736..f133d0a294d 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -15,7 +15,8 @@ public: m_reel2_attrram(*this, "reel2_attrram"), m_reel3_attrram(*this, "reel3_attrram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_dataoffset; @@ -160,4 +161,5 @@ public: UINT8 chry10_decrypt(UINT8 cipherText); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 1475f2f3c97..1fd348d6924 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -8,7 +8,8 @@ public: m_colorram(*this, "colorram"), m_bgram(*this, "bgram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -29,6 +30,7 @@ public: UINT32 screen_update_gomoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 696ad4ad033..15a71eabe62 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -218,7 +218,9 @@ public: m_videoram(*this, "videoram"), m_charram(*this, "charram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } // devices @@ -233,7 +235,9 @@ public: required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_knocker_prev; UINT8 m_joystick_select; UINT8 m_track[2]; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index aae1d3a9004..933e3deba83 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_samples(*this, "samples"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -46,4 +47,5 @@ public: void draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index a1312e7aba3..06d0b5adf72 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -21,7 +21,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } UINT8 m_cpu0_out[16]; UINT8 m_cpu1_out[16]; @@ -86,6 +87,7 @@ public: required_device<cpu_device> m_subcpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index d9cbc61c16a..440c8670997 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -29,11 +29,16 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_maincpu(*this, "maincpu"){ } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_last_analog_input[2]; UINT8 m_last_analog_output[2]; UINT8 *m_poly17; diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index cc8d28bb3aa..9dcdfc5bec1 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -26,7 +26,8 @@ public: m_maincpu(*this, "maincpu"), m_tc0100scn(*this, "tc0100scn"), m_tc0480scp(*this, "tc0480scp"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -35,6 +36,7 @@ public: required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT16 m_coin_word; UINT16 m_frame_counter; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index f1ba4d0dfa4..c8484e1e00d 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -46,7 +46,9 @@ public: m_spr(*this, "vsystem_spr"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } virtual void machine_start() { @@ -116,6 +118,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; #endif diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index f1cd1544e93..3f51737bb7e 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -14,7 +14,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spritetile_ram; required_shared_ptr<UINT8> m_spritexy_ram; @@ -61,4 +62,5 @@ public: optional_device<cpu_device> m_subcpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index d789e33320e..cbcd33d1a5d 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -26,7 +26,8 @@ public: m_ram(*this,"ram"), m_spriteram(*this,"spriteram"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_coin_lockout = true; } @@ -37,6 +38,7 @@ public: required_shared_ptr<UINT32> m_spriteram; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; bool m_coin_lockout; UINT16 m_coin_word; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index a6e90ba135f..1ed6968b1ec 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -14,7 +14,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_rambase(*this, "rambase"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -48,4 +49,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(yamyam_mcu_sim); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 0e2d91c93f2..b0ba3322e4b 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -15,7 +15,8 @@ public: m_scrolly(*this, "scrolly"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -46,4 +47,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 5315d27c641..7f3db0080c9 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -20,7 +20,9 @@ public: m_videoram(*this, "videoram"), m_flipscreen(*this, "flipscreen"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices/memory pointers */ @@ -34,7 +36,9 @@ public: required_shared_ptr<UINT8> m_flipscreen; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + tilemap_t *m_tilemap; UINT8 m_master_nmi_mask; UINT8 m_slave_irq_mask; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 9c9d1bc219f..db659f8d026 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -23,7 +23,8 @@ public: m_k007121_2(*this, "k007121_2"), m_k007232(*this, "k007232"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<buffered_spriteram8_device> m_spriteram; required_device<buffered_spriteram8_device> m_spriteram2; @@ -71,4 +72,5 @@ public: DECLARE_WRITE8_MEMBER(volume_callback); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index dba1b6a5b92..8b08af6b706 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -33,4 +34,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 791bee726f6..e148a84db7c 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_subcpu(*this, "sub"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bg_ram; @@ -40,4 +41,5 @@ public: void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index e83571a012a..805468ffe0c 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -20,7 +20,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -49,6 +50,7 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 580cc37efc0..e3e3c9615c7 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -35,7 +35,9 @@ public: m_3d_1(*this, "3d_1"), m_3d_2(*this, "3d_2"), m_com_ram(*this, "com_ram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -62,6 +64,8 @@ public: //required_shared_ptr<UINT8> m_com_mmu_mem; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_mcu_type; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index f84e3315c1e..e8195b1f08e 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -39,4 +40,5 @@ public: void crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 94080dc40ee..9035b2b637b 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -13,7 +13,8 @@ public: m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), m_ymsnd(*this, "ymsnd"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -49,6 +50,7 @@ public: optional_device<dac_device> m_dac; optional_device<ym2203_device> m_ymsnd; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; sn76489a_device *m_sn; UINT8 m_prot_data; DECLARE_READ8_MEMBER(mrokumei_keyboard_r); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 164c8d88d43..a81dbee9a80 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -18,7 +18,9 @@ public: m_colorram(*this, "colorram"), m_d7756(*this, "d7756"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -28,7 +30,9 @@ public: optional_device<upd7756_device> m_d7756; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_control; UINT8 m_sample; diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index dd6ad35e378..105aa819ff0 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -12,11 +12,14 @@ public: : driver_device(mconfig, type, tag), m_clut(*this, "clut"), m_maincpu(*this, "maincpu"), - m_nb1413m3(*this, "nb1413m3") { } + m_nb1413m3(*this, "nb1413m3"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_clut; required_device<cpu_device> m_maincpu; required_device<nb1413m3_device> m_nb1413m3; + required_device<screen_device> m_screen; + int m_blitter_destx; int m_blitter_desty; int m_blitter_sizex; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index c95c9456436..c100a2ca009 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -14,7 +14,8 @@ public: m_sn(*this, "snsnd"), m_maincpu(*this, "maincpu"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -25,6 +26,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 * m_scroll2; UINT8 * m_spriteram2; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 9eda5c8607b..24062ce78bd 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -24,7 +24,9 @@ public: m_sharedram3(*this, "sharedram3"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_0; @@ -65,6 +67,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(hyprduel_irq_cause_r); DECLARE_WRITE16_MEMBER(hyprduel_irq_cause_w); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 1617968c8e0..93e80be4e5f 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -14,7 +14,9 @@ public: m_videoram(*this, "videoram"), m_scroll(*this, "scroll"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -24,6 +26,8 @@ public: required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* video-related */ bitmap_ind16 m_sprite_bitmap; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index fb5ba266f91..2979bcdd5fb 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -12,7 +12,8 @@ public: m_spr(*this, "vsystem_spr"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -61,4 +62,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index f2722e932eb..892cf3c5030 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -29,7 +29,9 @@ public: m_nvram(*this, "nvram") , m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -95,4 +97,6 @@ public: void irmb_run(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 89b8e1db872..94fc23d298d 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_interrupt_enable; @@ -37,6 +38,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(ironhors_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(ironhors_videoram_w); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 1a67adfe78f..42a8c5bb8ad 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -32,7 +32,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_dsp1(*this, "dsp1"), - m_dsp2(*this, "dsp2") { } + m_dsp2(*this, "dsp2"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT16> m_main_ram; optional_shared_ptr<UINT16> m_nvram; @@ -193,4 +195,6 @@ public: required_device<cpu_device> m_soundcpu; optional_device<cpu_device> m_dsp1; optional_device<cpu_device> m_dsp2; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index d65a7e89d39..a14aef4faec 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -22,7 +22,8 @@ public: m_subcpu(*this, "sub"), m_tms34061(*this, "tms34061"), m_tlc34076(*this, "tlc34076"), - m_visarea(0, 0, 0, 0) { } + m_visarea(0, 0, 0, 0), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; @@ -30,6 +31,7 @@ public: required_device<tms34061_device> m_tms34061; required_device<tlc34076_device> m_tlc34076; rectangle m_visarea; + required_device<screen_device> m_screen; UINT8 m_grom_bank; UINT8 m_blitter_int; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index cfd15637f39..e405b8bdb04 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -15,7 +15,8 @@ public: m_scrollram(*this, "scrollram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* device- and memory pointers */ @@ -26,7 +27,8 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 3a33f370af3..38365876a1f 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -13,7 +13,8 @@ public: m_paletteram(*this, "paletteram"), m_mastercpu(*this, "master"), m_slavecpu(*this, "slave"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoctrl; @@ -32,6 +33,7 @@ public: required_device<cpu_device> m_mastercpu; required_device<cpu_device> m_slavecpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(jackalr_rotary_r); DECLARE_WRITE8_MEMBER(jackal_flipscreen_w); diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index c289076dce6..752c3c69633 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -61,7 +61,8 @@ public: m_eeprom_bit_count(0), m_protection_check(0) , m_eeprom(*this, "eeprom"), - m_ide(*this, "ide") + m_ide(*this, "ide"), + m_screen(*this, "screen") { } @@ -342,4 +343,5 @@ protected: void jaguar_nvram_save(); optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<vt83c461_device> m_ide; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 73cc0ed637a..d4c05328c1e 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -21,7 +21,8 @@ public: m_scroll_dir(*this, "scroll_dir"), m_maincpu(*this, "maincpu"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -34,6 +35,7 @@ public: required_device<cpu_device> m_maincpu; required_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 8b942927847..2bad6a28524 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -30,7 +30,8 @@ public: m_audio_comm_stat(*this, "audio_comm_stat"), m_speech_data(*this, "speech_data"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_nvram; @@ -88,6 +89,7 @@ public: void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<screen_device> m_screen; }; /*----------- defined in audio/jedi.c -----------*/ diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index fc6a5c518d1..20e210439cb 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -60,7 +60,8 @@ public: m_vfd(*this, "vfd"), m_vram(*this, "vram") , m_maincpu(*this, "maincpu"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_palette(*this, "palette") { } UINT8 m_tms_irq; UINT8 m_duart_1_irq; @@ -116,6 +117,7 @@ public: void update_irqs(); required_device<cpu_device> m_maincpu; required_device<upd7759_device> m_upd7759; + optional_device<palette_device> m_palette; }; diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index 58304b3a6d9..bc1d9007b57 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -24,7 +24,8 @@ public: m_upd7759(*this, "upd7759"), m_tms34061(*this, "tms34061"), m_vfd(*this, "vfd"), - m_direct_port(*this, "DIRECT") { } + m_direct_port(*this, "DIRECT"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<acia6850_device> m_acia6850_0; @@ -34,6 +35,7 @@ public: optional_device<tms34061_device> m_tms34061; optional_device<roc10937_t> m_vfd; required_ioport m_direct_port; + optional_device<palette_device> m_palette; UINT8 m_palette_val[16][3]; int m_pal_addr; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 74739979f9f..bbbd046f58f 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -19,7 +19,8 @@ public: m_ram(*this, "ram"), m_videoram(*this, "videoram"), m_pf_data(*this, "pf_data"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -33,6 +34,7 @@ public: required_shared_ptr<UINT16> m_pf_data; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ bitmap_ind16 *m_bitmap_f; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 609ccd48a7a..09dda8a0883 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -16,7 +16,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -64,4 +65,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 59f1e4b499e..3001c8ce2c5 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -21,7 +21,8 @@ public: m_eeprom(*this, "eeprom") , m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_fgram; @@ -84,4 +85,5 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index eca14cc0232..3f933004e65 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -19,7 +19,8 @@ public: m_sprite_cpu(*this, "sprite"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll_y; @@ -71,4 +72,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index e0a4f85cc01..acb32e3177a 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -14,7 +14,9 @@ public: m_spriteram(*this, "spriteram"), m_soundcpu(*this, "soundcpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -53,4 +55,6 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index fdabc4a22ba..edb5613b6d6 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -29,7 +29,9 @@ public: m_k056800(*this, "k056800"), m_k054539_1(*this,"k054539_1"), m_k054539_2(*this,"k054539_2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -51,6 +53,8 @@ public: optional_device<k054539_device> m_k054539_1; optional_device<k054539_device> m_k054539_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(esc_w); DECLARE_WRITE32_MEMBER(eeprom_w); diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index c24118b2fb3..9124498d3d5 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,4 +46,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index 7d255f36c1d..b100eaeafb0 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -17,7 +17,8 @@ public: m_shared_ram(*this, "shared_ram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgvideoram; @@ -41,6 +42,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(kyugo_nmi_mask_w); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 4b06e344a6a..b9f8781a9cc 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -19,7 +19,9 @@ public: m_spriteram(*this, "spriteram"), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices */ required_device<k007121_device> m_k007121; @@ -33,6 +35,8 @@ public: required_shared_ptr<UINT8> m_videoram2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_layer0; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 23f8dd5655f..8e9334877ae 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_grid_data(*this, "grid_data"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,6 +48,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(sraider_sound_low_r); DECLARE_READ8_MEMBER(sraider_sound_high_r); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 44c6e8f2d86..fa208d00176 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -16,7 +16,8 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -70,4 +71,5 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 1604baec462..bf5c1f113e3 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -22,7 +22,8 @@ public: m_s2636_2(*this, "s2636_2"), m_s2636_3(*this, "s2636_3"), m_sn(*this, "snsnd"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -35,6 +36,7 @@ public: required_device<s2636_device> m_s2636_3; optional_device<sn76477_device> m_sn; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 7d52ffd3a11..871d62b7bba 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -23,7 +23,8 @@ public: m_audiocpu(*this, "audiocpu"), m_sn_1(*this, "sn76489.1"), m_sn_2(*this, "sn76489.2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,6 +48,7 @@ public: optional_device<sn76489_device> m_sn_1; optional_device<sn76489_device> m_sn_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_READ8_MEMBER(sound_status_r); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 4cb63ab9cb4..4655421a0f2 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -18,7 +18,8 @@ public: m_scroll1(*this, "scroll1"), m_scroll2(*this, "scroll2"), m_paletteram(*this, "paletteram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* devices */ required_device<cpu_device> m_maincpu; @@ -31,7 +32,8 @@ public: required_shared_ptr<UINT16> m_paletteram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 2bce59d0909..a01107007f5 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -28,7 +28,8 @@ public: m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* device */ @@ -38,6 +39,7 @@ public: required_shared_ptr<UINT8> m_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ UINT8 m_marker_x; diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index b3e1c80fb56..e1a9cffe0fc 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_back_data; @@ -64,6 +65,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/legionna.c -----------*/ diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index 4f4ba172608..e799e99acc6 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -34,7 +34,9 @@ public: m_eeprom(*this, "eeprom"), m_sound(*this, "custom"), m_dac0(*this, "dac0"), - m_dac1(*this, "dac1") { } + m_dac1(*this, "dac1"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_master; required_device<cpu_device> m_slave; @@ -42,6 +44,8 @@ public: optional_device<leland_80186_sound_device> m_sound; optional_device<dac_device> m_dac0; optional_device<dac_device> m_dac1; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_dac_control; UINT8 *m_alleymas_kludge_mem; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 819468f54a1..04068f1adc2 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -20,7 +20,8 @@ public: m_sprgen(*this, "spritegen"), m_sprgen2(*this, "spritegen2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ bitmap_ind16 m_bitmap0; @@ -58,6 +59,7 @@ public: void lemmings_copy_bitmap(bitmap_rgb32& bitmap, bitmap_ind16& srcbitmap, int* xscroll, int* yscroll, const rectangle& cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER( lem_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( lem_protection_region_0_146_w ); diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index bff70da51cc..2e05c952d17 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -20,7 +20,8 @@ public: m_soundcpu(*this, "soundcpu"), m_bank4800(*this, "bank4800"), m_k056832(*this, "k056832"), - m_k053244(*this, "k053244") { } + m_k053244(*this, "k053244"), + m_palette(*this, "palette") { } /* video-related */ int m_layer_colorbase[4]; @@ -35,6 +36,7 @@ public: required_device<address_map_bank_device> m_bank4800; required_device<k056832_device> m_k056832; required_device<k05324x_device> m_k053244; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(control2_w); DECLARE_WRITE8_MEMBER(sound_cmd_w); diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 09b6e02d24c..53691e9e618 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -16,7 +16,8 @@ public: lethalj_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_screen(*this, "screen") { } UINT16 m_blitter_data[8]; UINT16 *m_screenram; @@ -39,6 +40,7 @@ public: virtual void video_start(); inline void get_crosshair_xy(int player, int *x, int *y); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index f994acb8706..cfb66011060 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -11,7 +11,8 @@ public: m_scratchram(*this, "scratchram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_paletteram; optional_shared_ptr<UINT8> m_bg_vram; /* prosport */ @@ -35,7 +36,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + DECLARE_READ8_MEMBER(deco16_bank_r); DECLARE_READ8_MEMBER(deco16_io_r); DECLARE_WRITE8_MEMBER(deco16_bank_w); diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index 9aea7efb847..c3503f8d0ad 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -11,7 +11,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_vreg; required_shared_ptr<UINT8> m_scroll; @@ -57,6 +58,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(lkage_sound_command_w); DECLARE_WRITE8_MEMBER(lkage_sh_nmi_disable_w); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 28ca4497483..25be0a76614 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -37,7 +37,9 @@ public: m_f2203_1r(*this, "f2203.1r"), m_f2203_2r(*this, "f2203.2r"), m_f2203_3r(*this, "f2203.3r"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_char_ram; @@ -88,6 +90,8 @@ public: required_device<filter_volume_device> m_f2203_2r; required_device<filter_volume_device> m_f2203_3r; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(lockon_crtc_r); DECLARE_WRITE16_MEMBER(lockon_crtc_w); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index c019d5b81d2..cbfdcdd785f 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -27,7 +27,9 @@ public: m_soundcpu(*this, "soundcpu"), m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_priority_ram; required_shared_ptr<UINT16> m_scrollram; @@ -86,6 +88,8 @@ public: required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 02b4301cedf..38994db6380 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -10,7 +10,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -41,6 +42,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w); DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w); diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index d0d6fbf1573..0d3d088d2a8 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -12,7 +12,8 @@ public: m_soundlatch2(*this, "soundlatch2"), m_maincpu(*this, "maincpu"), m_msm(*this, "5205"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -73,4 +74,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index f79039f1c61..d636bf23d35 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -45,7 +45,9 @@ public: m_chargen(*this, "chargen"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_memory; @@ -74,6 +76,8 @@ public: device_t *m_ic8j2; required_device<samples_device> m_samples; optional_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(m10_ctrl_w); DECLARE_WRITE8_MEMBER(m11_ctrl_w); diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 88077033607..fef19619426 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -21,14 +21,18 @@ public: m_vram_data(*this, "vram_data"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_vram_data; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_irq_vectorbase; int m_sound_status; UINT8 m_spritesystem; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index b0496171f98..c406ee2187b 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -7,7 +7,9 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -40,4 +42,6 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int xpos, int ypos, int image); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 06c73d13dad..e6177ea0efd 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -7,7 +7,8 @@ public: m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,4 +28,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 14b0236e31b..83b9d2a92f9 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -10,7 +10,9 @@ public: m_yard_scroll_y_low(*this, "scroll_y_low"), m_yard_score_panel_disabled(*this, "score_disable"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -37,4 +39,6 @@ public: void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index df7efc6cc5d..33cc0b1cb47 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -8,7 +8,8 @@ public: m_m62_textram(*this, "m62_textram"), m_scrollram(*this, "scrollram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -115,4 +116,5 @@ public: void m62_textlayer( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 89b0aff4138..1ebf48ba5ac 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -22,7 +22,9 @@ public: m_mcu(*this, "mcu"), m_dac(*this, "dac"), m_audio(*this, "m72"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram1; @@ -37,6 +39,8 @@ public: optional_device<dac_device> m_dac; optional_device<m72_audio_device> m_audio; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT16 *m_protection_ram; emu_timer *m_scanline_timer; diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 7bb0c3e7a90..9ac7d7d9505 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -10,7 +10,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_audio(*this, "m72"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_video_data; optional_shared_ptr<UINT16> m_spriteram; @@ -19,6 +20,7 @@ public: required_device<cpu_device> m_soundcpu; optional_device<m72_audio_device> m_audio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT16 m_video_control_data[8]; tilemap_t *m_pf1_layer; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 6a059fd0a54..ebe38bd575e 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -31,7 +31,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<buffered_spriteram16_device> m_spriteram; @@ -41,7 +43,9 @@ public: optional_device<cpu_device> m_soundcpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT16 m_sound_status; UINT8 m_irq_vectorbase; UINT32 m_raster_irq_position; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 095db36bcae..1a7b6879279 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -30,7 +30,8 @@ public: m_mainram(*this, "mainram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -69,6 +70,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(paletteram32_macrossp_w); DECLARE_READ32_MEMBER(macrossp_soundstatus_r); diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 6a071b5c920..4ce0ed486d2 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -30,7 +30,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -76,6 +77,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/madalien.c -----------*/ diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index f8f8d555355..a690727eaf9 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -10,7 +10,9 @@ public: m_scroll_y(*this, "scroll_y"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_spriteram; @@ -41,4 +43,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index cdde76db0be..40cffa04322 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -8,7 +8,8 @@ public: m_fgram(*this, "fgram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_tx_tilemap; tilemap_t *m_bg_tilemap; @@ -35,4 +36,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 51648bc8d47..48bbd1c5e97 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -17,7 +17,9 @@ public: m_s2636_1(*this, "s2636_1"), m_trom(*this, "saa5050"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<s2636_device> m_s2636_0; @@ -25,7 +27,8 @@ public: required_device<saa5050_device> m_trom; required_shared_ptr<UINT8> m_videoram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* misc */ // int playfield_x[256]; // int playfield_y[256]; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index f59d2714b59..6089bff0b62 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -37,7 +37,9 @@ public: m_subcpu2(*this, "sub2"), m_namco_15xx(*this, "namco"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -48,6 +50,8 @@ public: required_device<namco_15xx_device> m_namco_15xx; optional_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; namco56xx_device *m_namco56xx_1; namco56xx_device *m_namco56xx_2; diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index 37a45045bc2..b1e6970c65f 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -8,7 +8,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -27,6 +28,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(irq_mask_w); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 3b57216f99b..5c8a54c4240 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -42,7 +42,8 @@ public: m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -101,6 +102,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index da840971d90..8d0ad58cec6 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_xscroll(*this, "xscroll"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -32,4 +33,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 5bbce01e3f7..e9e2849e8de 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -17,7 +17,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -56,6 +58,8 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(matmania_sh_command_w); DECLARE_WRITE8_MEMBER(maniach_sh_command_w); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 888e8651fbe..59b6f28465f 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -12,7 +12,8 @@ public: m_vidregs(*this, "vidregs"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram1; @@ -35,6 +36,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(mcat_soundlatch_w); DECLARE_WRITE16_MEMBER(mcat_coin_w); diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 7a5bcd0f7a6..7576a733a4a 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -35,7 +35,8 @@ public: m_dpoker_coin_in_timer(*this, "dp_coinin"), m_dpoker_hopper_timer(*this, "dp_hopper"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } // these should be required but can't because mcr68 shares with us @@ -54,6 +55,7 @@ public: optional_device<timer_device> m_dpoker_hopper_timer; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(mcr_control_port_w); DECLARE_WRITE8_MEMBER(mcr_ipu_laserdisk_w); diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 90a3645adfc..f04c58b4e74 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -5,7 +5,8 @@ class mcr3_state : public mcr_state public: mcr3_state(const machine_config &mconfig, device_type type, const char *tag) : mcr_state(mconfig, type, tag), - m_spyhunt_alpharam(*this, "spyhunt_alpha") { } + m_spyhunt_alpharam(*this, "spyhunt_alpha"), + m_screen(*this, "screen") { } UINT8 m_input_mux; UINT8 m_latched_input; @@ -81,7 +82,5 @@ public: DECLARE_WRITE8_MEMBER(spyhuntpr_a900_w); DECLARE_WRITE8_MEMBER(spyhuntpr_port04_w); DECLARE_WRITE8_MEMBER(spyhuntpr_fd00_w); - - - + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index d7b207440ad..fa356593f79 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -26,7 +26,9 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_device<midway_chip_squeak_deluxe_device> m_chip_squeak_deluxe; optional_device<midway_sounds_good_device> m_sounds_good; @@ -124,4 +126,6 @@ public: void mcr68_common_init(int clip, int xoffset); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 2f8b5b6c5ea..ddae514e59d 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -19,7 +19,9 @@ public: m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -63,6 +65,8 @@ public: optional_device<dac_device> m_dac; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index ec50e6061f5..07d4da6d3ff 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -198,7 +198,9 @@ public: segac2_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_upd7759(*this, "upd") { } + m_upd7759(*this, "upd"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } // for Print Club only int m_cam_data; @@ -277,6 +279,9 @@ public: DECLARE_READ16_MEMBER(ichirjbl_prot_r); DECLARE_WRITE_LINE_MEMBER(segac2_irq2_interrupt); optional_device<upd7759_device> m_upd7759; + optional_device<screen_device> m_screen; + required_device<palette_device> m_palette; + }; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 3ec7570c18c..455cb5ffa08 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -37,7 +37,8 @@ public: m_io_dsw(*this, "DSW"), m_io_dsw1(*this, "DSW1"), m_io_dsw2(*this, "DSW2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_vregs; required_shared_ptr<UINT16> m_objectram; @@ -56,6 +57,7 @@ public: optional_ioport m_io_dsw1; optional_ioport m_io_dsw2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT16 *m_spriteram; UINT16 m_ip_select; diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 45fc97c957f..d48f124d9a3 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -19,7 +19,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_daccpu(*this, "daccpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_scrolly; @@ -42,6 +43,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_daccpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(megazone_i8039_irq_w); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index d0e3a6c6c4a..e9c724e0873 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -22,7 +22,9 @@ public: m_adpcm(*this, "adpcm"), m_ay1(*this, "ay1"), m_ay2(*this, "ay2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -63,6 +65,8 @@ public: required_device<ay8910_device> m_ay1; required_device<ay8910_device> m_ay2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(mermaid_ay8910_write_port_w); diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index f6c3fb7c4b3..97eb26ca5c8 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -15,7 +15,8 @@ public: m_scrollx(*this, "scrollx"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgram; @@ -36,6 +37,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(metlclsh_cause_irq); DECLARE_WRITE8_MEMBER(metlclsh_ack_nmi); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index c9bc8aa5b0c..a56218e67f0 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -45,7 +45,9 @@ public: m_input_sel(*this, "input_sel"), m_k053936_ram(*this, "k053936_ram"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* devices */ @@ -76,7 +78,8 @@ public: optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_flip_screen; diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index a0f71920aaf..08880887ba0 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -13,7 +13,8 @@ public: m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), m_ymsnd(*this, "ymsnd"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -47,6 +48,7 @@ public: optional_device<cpu_device> m_mcu; required_device<ym2203_device> m_ymsnd; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* queue */ UINT8 m_queue[64]; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index f310acee4ff..70f0516cd24 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -32,7 +32,8 @@ public: m_audiocpu(*this, "audiocpu"), m_upd7759(*this, "upd7759"), m_drmath(*this, "drmath"), - m_vgb(*this, "vgb") { } + m_vgb(*this, "vgb"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_shared_ram; device_t *m_duart68681; @@ -137,6 +138,7 @@ public: required_device<upd7759_device> m_upd7759; required_device<cpu_device> m_drmath; required_device<cpu_device> m_vgb; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 4748d74efa0..83c1a57413a 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -21,7 +21,8 @@ public: m_gfxrom(*this, "gfxrom"), m_cvsd_sound(*this, "cvsd"), m_adpcm_sound(*this, "adpcm") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_nvram; required_memory_region m_gfxrom; @@ -72,6 +73,7 @@ public: DECLARE_MACHINE_RESET(midtunit); DECLARE_VIDEO_START(midtunit); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; void register_state_saving(); void init_tunit_generic(int sound); void init_nbajam_common(int te_protection); diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index eb12c90d069..5320e194909 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -54,7 +54,9 @@ public: m_midvplus_misc(*this, "midvplus_misc"), m_videoram(*this, "videoram", 32), m_textureram(*this, "textureram") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT32> m_nvram; required_shared_ptr<UINT32> m_ram_base; @@ -131,6 +133,8 @@ public: UINT32 screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanline_timer_cb); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index f848c4591b2..b4a33e79694 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -46,7 +46,8 @@ public: m_gfx_rom(*this, "gfx_rom", 16) , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_oki(*this, "oki") { } + m_oki(*this, "oki"), + m_palette(*this, "palette") { } optional_device<williams_narc_sound_device> m_narc_sound; optional_device<williams_cvsd_sound_device> m_cvsd_sound; @@ -122,7 +123,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; optional_device<okim6295_device> m_oki; - + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 37bc08a6f37..813c1d3a13f 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -21,7 +21,9 @@ public: m_tms32031_control(*this, "tms32031_ctl"), m_zeusbase(*this, "zeusbase") , m_m48t35(*this, "m48t35"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_nvram; required_shared_ptr<UINT32> m_ram_base; @@ -29,6 +31,9 @@ public: required_shared_ptr<UINT32> m_tms32031_control; required_shared_ptr<UINT32> m_zeusbase; optional_device<timekeeper_device> m_m48t35; + required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(cmos_w); DECLARE_READ32_MEMBER(cmos_r); @@ -70,7 +75,6 @@ public: TIMER_CALLBACK_MEMBER(invasn_gun_callback); void exit_handler(); void exit_handler2(); - required_device<cpu_device> m_maincpu; }; /*----------- defined in video/midzeus2.c -----------*/ diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 05fa6e167c9..c8afaccb4cc 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -14,7 +14,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -32,6 +33,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_irq_mask; DECLARE_READ8_MEMBER(mikie_sh_timer_r); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index e9f0af4016e..07828420069 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -22,7 +22,8 @@ public: m_videoram(*this, "videoram"), m_eeprom(*this, "eeprom"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* devices */ required_device<cpu_device> m_maincpu; @@ -36,7 +37,8 @@ public: optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + /* video-related */ tilemap_t *m_bg_tilemap; dynamic_array<UINT8> m_objram; /* Sprite RAM */ diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index a3395f92bc7..4910237894c 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -14,7 +14,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_mjk_adpcm(*this, "adpcm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram1; @@ -25,6 +26,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mjkjidai_adpcm_device> m_mjk_adpcm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_keyb; int m_nvram_init_count; diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index bbe9715d6a7..65ed738437e 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -21,7 +21,8 @@ public: m_display_list0(*this, "display_list0"), m_display_list1(*this, "display_list1"), m_color_xlat(*this, "color_xlat"), - m_paletteram16(*this, "palette") { } + m_paletteram16(*this, "palette"), + m_palette(*this, "palette") { } required_device<v60_device> m_maincpu; // V60 required_device<segam1audio_device> m_m1audio; // Model 1 standard sound board @@ -97,6 +98,7 @@ public: int m_render_done; UINT16 *m_tgp_ram; optional_shared_ptr<UINT16> m_paletteram16; + required_device<palette_device> m_palette; UINT32 *m_poly_rom; UINT32 *m_poly_ram; UINT16 m_lamp_state; diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index b983c3d15a6..47a683498c3 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -29,7 +29,9 @@ public: m_tgp(*this, "tgp"), m_dsp(*this, "dsp"), m_drivecpu(*this, "drivecpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_workram; required_shared_ptr<UINT32> m_bufferram; @@ -49,6 +51,8 @@ public: optional_device<cpu_device> m_dsp; optional_device<cpu_device> m_drivecpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT32 m_intreq; UINT32 m_intena; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index dba663a754c..f0dae53c5c1 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -26,7 +26,8 @@ public: m_dsbz80(*this, DSBZ80_TAG), m_soundram(*this, "soundram"), m_audiocpu(*this, "audiocpu"), - m_eeprom(*this, "eeprom"){ } + m_eeprom(*this, "eeprom"), + m_screen(*this, "screen"){ } required_device<cpu_device> m_maincpu; optional_device<lsi53c810_device> m_lsi53c810; @@ -210,6 +211,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scsp_irq); required_device<cpu_device> m_audiocpu; required_device<eeprom_serial_93cxx_device> m_eeprom; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 6506927c221..e44a36aa53d 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -14,7 +14,8 @@ public: m_bg_scrolly(*this, "bg_scrolly"), m_bg_scrollx(*this, "bg_scrollx"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -51,4 +52,5 @@ public: void momoko_draw_bg_pri( bitmap_ind16 &bitmap, int chr, int col, int flipx, int flipy, int x, int y, int pri ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 9a7afbcad33..73e7773b3fd 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -29,6 +30,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(mouser_nmi_enable_w); DECLARE_WRITE8_MEMBER(mouser_sound_interrupt_w); diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index e4453e688ad..9f682196501 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -112,7 +112,8 @@ public: m_aux1_port(*this, "AUX1"), m_aux2_port(*this, "AUX2"), m_bank1(*this, "bank1"), - m_msm6376(*this, "msm6376") + m_msm6376(*this, "msm6376"), + m_palette(*this, "palette") {} UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -304,6 +305,7 @@ protected: UINT8 m_numbanks; mpu4_chr_table* m_current_chr_table; const bwb_chr_table* m_bwb_chr_table1; + optional_device<palette_device> m_palette; }; /* mpu4.c, used by mpu4vid.c */ diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index a0d5d464b78..df47f4c971d 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -13,7 +13,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -38,4 +39,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 9c8c1735cfb..6b04eeac27a 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -13,7 +13,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -33,6 +35,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(mrflea_main_w); DECLARE_WRITE8_MEMBER(mrflea_io_w); diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 83219d3f9ae..d885c3fc668 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,4 +32,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index a13057c0e3c..d0f88318242 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -18,7 +18,9 @@ public: m_f1superb_extraram(*this, "f1sb_extraram", 32), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_roz_ctrl; @@ -110,4 +112,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 9daafd96ad7..75d2987fd6a 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_bmcu(*this, "bmcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -54,6 +55,7 @@ public: optional_device<buggychl_mcu_device> m_bmcu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(nmi_disable_w); diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 741729ff56b..65670cc0794 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -11,7 +11,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } required_shared_ptr<UINT16> m_videoram1; required_shared_ptr<UINT16> m_videoram2; @@ -25,6 +26,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(mugsmash_reg2_w); DECLARE_READ16_MEMBER(mugsmash_input_ports_r); diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index 5601012b9ce..cccb5b0fc00 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -16,7 +16,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_m48t35(*this, "m48t35" ), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -85,6 +87,8 @@ public: required_device<cpu_device> m_maincpu; required_device<timekeeper_device> m_m48t35; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; #define mfish_parent mfish_13 diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index b9a508c0728..446ffda735e 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -17,7 +17,8 @@ public: m_vreg(*this, "vreg"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_sprite_xpos; @@ -39,6 +40,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(mnchmobl_nmi_enable_w); DECLARE_WRITE8_MEMBER(mnchmobl_soundlatch_w); diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index beccb063048..032ae100e28 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -9,7 +9,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_cpu_decrypt(*this, "seibu_sound"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -17,6 +19,8 @@ public: required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_cpu_decrypt; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; int m_control_byte; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index c2fa1516262..0766e44f7ac 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -48,7 +48,8 @@ public: m_samples2(*this, "samples2"), m_sn1(*this, "sn1"), m_sn2(*this, "sn2"), - m_sn(*this, "snsnd") + m_sn(*this, "snsnd"), + m_screen(*this, "screen") { } /* device/memory pointers */ @@ -89,6 +90,7 @@ public: optional_device<sn76477_device> m_sn1; optional_device<sn76477_device> m_sn2; optional_device<sn76477_device> m_sn; + required_device<screen_device> m_screen; DECLARE_READ8_MEMBER(mw8080bw_shift_result_rev_r); DECLARE_READ8_MEMBER(mw8080bw_reversable_shift_result_r); diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 8339e758199..2081001b431 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -24,7 +24,9 @@ public: m_scroll(*this, "scroll"), m_video_control(*this, "video_control") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* machine state */ required_shared_ptr<UINT8> m_ay8910_data; @@ -55,6 +57,8 @@ public: void mystston_on_scanline_interrupt(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in video/mystston.c -----------*/ diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index ad14c85db28..a043aa63090 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -12,7 +12,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dac(*this, "dac"), - m_sn(*this, "snsnd") { } + m_sn(*this, "snsnd"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -50,6 +52,9 @@ public: required_device<cpu_device> m_audiocpu; required_device<dac_device> m_dac; optional_device<sn76477_device> m_sn; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + DECLARE_WRITE8_MEMBER(n8080_shift_bits_w); DECLARE_WRITE8_MEMBER(n8080_shift_data_w); DECLARE_READ8_MEMBER(n8080_shift_r); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 07b96abc01c..fd4061cc18f 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -37,7 +37,9 @@ public: m_workram(*this,"workram"), m_vreg(*this,"vreg"), m_scroll(*this,"scroll"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -49,6 +51,8 @@ public: required_shared_ptr<UINT16> m_vreg; required_shared_ptr<UINT16> m_scroll; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT16 *m_mpBank0; UINT16 *m_mpBank1; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index b0995e7867e..d7a5a0990d9 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -23,7 +23,8 @@ public: m_mcu(*this, "mcu"), m_cus30(*this, "namco"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -32,6 +33,8 @@ public: required_device<namco_cus30_device> m_cus30; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; + int m_dac0_value; int m_dac1_value; int m_dac0_gain; diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 682a1864018..bc086e83759 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -108,7 +108,9 @@ public: m_audiocpu(*this, "audiocpu"), m_slave(*this, "slave"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_device<cpu_device> m_dspmaster; optional_device<cpu_device> m_dspslave; @@ -223,6 +225,8 @@ public: optional_device<cpu_device> m_slave; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + optional_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; class namcos2_state : public namcos2_shared_state diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index d2bd198681c..57fe600398d 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -197,7 +197,9 @@ public: m_czram(*this, "czram"), m_motor_timer(*this, "motor_timer"), m_pc_pedal_interrupt(*this, "pc_p_int"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -224,6 +226,9 @@ public: optional_device<timer_device> m_motor_timer; optional_device<timer_device> m_pc_pedal_interrupt; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_syscontrol[0x20]; bool m_dsp_irq_enabled; diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index ba955f7029c..7f041cd951f 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -11,7 +11,8 @@ public: m_cpu1(*this, "cpu1"), m_cpu2(*this, "cpu2"), m_cus30(*this, "namco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_spriteram; int m_wdog; @@ -22,6 +23,7 @@ public: required_device<cpu_device> m_cpu2; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_tilebank; int m_xscroll[4]; int m_yscroll[4]; diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 6a73350db04..8c37babd5db 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -11,7 +11,9 @@ public: m_maincpu(*this, "maincpu"), m_naughtyb_custom(*this, "naughtyb_custom"), m_popflame_custom(*this, "popflame_custom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram2; @@ -20,6 +22,9 @@ public: optional_device<naughtyb_sound_device> m_naughtyb_custom; optional_device<popflame_sound_device> m_popflame_custom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_popflame_prot_seed; int m_r_index; diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 74de22dd875..76345b42fb8 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -11,10 +11,14 @@ public: nbmj8891_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_nb1413m3(*this, "nb1413m3") { } + m_nb1413m3(*this, "nb1413m3"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<nb1413m3_device> m_nb1413m3; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_scrolly; int m_blitter_destx; diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 485eaecb2ca..02ffd431548 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -11,10 +11,14 @@ public: nbmj8900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_nb1413m3(*this, "nb1413m3") { } + m_nb1413m3(*this, "nb1413m3"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<nb1413m3_device> m_nb1413m3; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_scrolly; int m_blitter_destx; diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 37848296922..e751a3d18d2 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -7,11 +7,15 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_nb1413m3(*this, "nb1413m3") { } + m_nb1413m3(*this, "nb1413m3"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<nb1413m3_device> m_nb1413m3; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_scrollx; int m_scrolly; diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index df1886c9686..fa147f812b4 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -18,7 +18,9 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_dac1(*this, "dac1"), - m_dac2(*this, "dac2") { } + m_dac2(*this, "dac2"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_inputport; int m_dipswbitsel; @@ -137,6 +139,8 @@ public: required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac1; required_device<dac_device> m_dac2; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 3c18af5390b..d6c6098387c 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -30,7 +30,9 @@ public: m_k007232(*this, "k007232"), m_k005289(*this, "k005289"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_charram; @@ -76,6 +78,8 @@ public: optional_device<k005289_device> m_k005289; optional_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(gx400_irq1_enable_word_w); DECLARE_WRITE16_MEMBER(gx400_irq2_enable_word_w); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 8355656448e..11aa8e50692 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -38,7 +38,9 @@ public: m_bank_cartridge(*this, "cartridge"), m_bank_audio_main(*this, "audio_main"), m_upd4990a(*this, "upd4990a"), - m_save_ram(*this, "saveram") { } + m_save_ram(*this, "saveram"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } DECLARE_WRITE16_MEMBER(io_control_w); DECLARE_READ16_MEMBER(memcard_r); @@ -333,6 +335,9 @@ protected: optional_device<upd4990a_old_device> m_upd4990a; optional_shared_ptr<UINT16> m_save_ram; + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; + // configuration enum {NEOGEO_MVS, NEOGEO_AES, NEOGEO_CD} m_type; diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index cc130ca418e..4f18b79830f 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -14,7 +14,9 @@ public: m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -23,6 +25,8 @@ public: required_shared_ptr<UINT8> m_fg_videoram; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; const INT16* m_sampledata; UINT8 m_omegaf_io_protection[3]; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 0f1f277ca50..984a1797f3f 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -32,7 +32,8 @@ public: m_2610_1r(*this, "2610.1.r"), m_2610_2l(*this, "2610.2.l"), m_2610_2r(*this, "2610.2.r"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -59,6 +60,7 @@ public: required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index d00dda9e279..f7a0489581c 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -24,7 +24,8 @@ public: m_hvc(*this, "hvc"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -48,6 +49,7 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(nitedrvr_steering_reset_r); DECLARE_WRITE8_MEMBER(nitedrvr_steering_reset_w); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 64f845363da..cd89194ca86 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -15,7 +15,9 @@ public: m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), m_dac1(*this, "dac1"), - m_dac2(*this, "dac2") { } + m_dac2(*this, "dac2"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_musobana_inputport; int m_musobana_outcoin_flag; @@ -106,6 +108,8 @@ public: required_device<tmp68301_device> m_tmp68301; required_device<dac_device> m_dac1; required_device<dac_device> m_dac2; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index b3dbf6c369d..0d8fd5b39f9 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -23,7 +23,8 @@ public: m_nmk_bgvideoram3(*this, "nmk_bgvideoram3"), m_afega_scroll_0(*this, "afega_scroll_0"), m_afega_scroll_1(*this, "afega_scroll_1"), - m_gfxdecode(*this, "gfxdecode") {} + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") {} required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -43,6 +44,7 @@ public: optional_shared_ptr<UINT16> m_afega_scroll_0; optional_shared_ptr<UINT16> m_afega_scroll_1; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int mask[4*2]; int m_simple_scroll; int m_redraw_bitmap; diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index af904ea713e..4012649651a 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT16 *m_np_vram; UINT16 m_np_addr; @@ -34,6 +35,7 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/norautp.c -----------*/ diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 0ca8c76b3c4..e0a7203e74e 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -7,7 +7,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_ninjakun_io_a002_ctrl; optional_shared_ptr<UINT8> m_fg_videoram; @@ -51,4 +52,5 @@ public: void lineswap_gfx_roms(const char *region, const int bit); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 8d6ac767498..10edca6b253 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -14,7 +14,8 @@ public: m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -61,6 +62,7 @@ public: optional_device<cpu_device> m_mcu; required_device<msm5232_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sub_cpu_halt_w); DECLARE_READ8_MEMBER(from_snd_r); diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 0565ba1c720..1630c37b693 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -43,4 +44,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 7d1812df684..8ea66c65e75 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -15,7 +15,9 @@ public: m_paletteram(*this, "paletteram"), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT8> m_videoram; @@ -42,6 +44,8 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; optional_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(ojankohs_rombank_w); DECLARE_WRITE8_MEMBER(ojankoy_rombank_w); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 216144b0771..aa1f2df1a1e 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_sprites; @@ -61,4 +62,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 069e0fc7785..29524a483e7 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -24,7 +24,9 @@ public: m_sprite_ram(*this, "sprite_ram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -42,6 +44,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(orbit_misc_w); DECLARE_WRITE8_MEMBER(orbit_playfield_w); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index d92ba8afff9..1bdb06aaea9 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -47,7 +47,8 @@ public: m_2610_1r(*this, "2610.1r"), m_2610_2l(*this, "2610.2l"), m_2610_2r(*this, "2610.2r"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -76,6 +77,7 @@ public: required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(irq_ack_w); DECLARE_WRITE16_MEMBER(othunder_tc0220ioc_w); diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 27fa9d5bda9..76115bfcfc7 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -25,7 +25,8 @@ public: m_k053246(*this, "k053246"), m_k053251(*this, "k053251"), m_k053252(*this, "k053252"), - m_sprram(*this, "sprram") + m_sprram(*this, "sprram"), + m_screen(*this, "screen") { } /* memory pointers */ @@ -51,6 +52,7 @@ public: required_device<k053251_device> m_k053251; required_device<k053252_device> m_k053252; required_shared_ptr<UINT16> m_sprram; + required_device<screen_device> m_screen; DECLARE_WRITE16_MEMBER(eeprom_w); DECLARE_WRITE16_MEMBER(cpuA_ctrl_w); DECLARE_READ16_MEMBER(cpuB_ctrl_r); diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index f335823ffc1..689bc5ddbef 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -11,7 +11,9 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_cus30(*this, "namco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram2; @@ -20,6 +22,9 @@ public: required_device<cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT8 m_palette_bank; const UINT8 *m_color_prom; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index f8788e4a626..999a5222c22 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -20,7 +20,8 @@ public: m_colorram(*this, "colorram"), m_s2650games_tileram(*this, "s2650_tileram"), m_rocktrv2_prot_data(*this, "rocktrv2_prot"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -33,6 +34,7 @@ public: optional_shared_ptr<UINT8> m_s2650games_tileram; optional_shared_ptr<UINT8> m_rocktrv2_prot_data; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_cannonb_bit_to_read; int m_mystery; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index e814b6ca7c0..64fe6d09d86 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -16,7 +16,8 @@ public: m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -39,6 +40,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(pandoras_int_control_w); DECLARE_WRITE8_MEMBER(pandoras_cpua_irqtrigger_w); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 2d0ca852d9e..d0da0d1a501 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -13,7 +13,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_oki2(*this, "oki2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_vram_0; @@ -64,4 +66,6 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index b88857398ea..0bcc7bf012e 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -11,10 +11,12 @@ public: pastelg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_nb1413m3(*this, "nb1413m3") { } + m_nb1413m3(*this, "nb1413m3"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<nb1413m3_device> m_nb1413m3; + required_device<screen_device> m_screen; UINT8 m_mux_data; int m_blitter_destx; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index dc33f87bf05..ab815b38ff4 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -37,6 +38,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(pbaction_sh_command_w); diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index b1b2a2e5341..d5930e21634 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -11,7 +11,8 @@ public: m_msm(*this, "msm"), m_tilegen1(*this, "tilegen1"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -19,6 +20,7 @@ public: required_device<deco_bac06_device> m_tilegen1; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(pcktgal_bank_w); DECLARE_WRITE8_MEMBER(pcktgal_sound_bank_w); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index e012e794078..5decf899bf8 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -25,7 +25,8 @@ public: m_mainram(*this, "sram"), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_irq4_disabled = 0; } @@ -53,6 +54,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; device_t *m_ics; /* used by rendering */ diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 2f876a56cfb..21b24c74cef 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -7,7 +7,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_intenable; int m_question_addr_high; @@ -16,6 +17,7 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; DECLARE_WRITE8_MEMBER(cashquiz_question_bank_high_w); diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 6c67116540a..688868702a0 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -14,7 +14,8 @@ public: m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_scroll; @@ -46,4 +47,5 @@ public: required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index f940c98a0db..744149f8abb 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_nmi; @@ -65,4 +66,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index bbad21c0c80..f6d50aaa36a 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -25,7 +25,8 @@ public: m_oki2(*this, "oki2"), m_deco_tilegen1(*this, "tilegen1"), m_decocomn(*this, "deco_common"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_device<deco104_device> m_deco104; @@ -45,6 +46,7 @@ public: optional_device<deco16ic_device> m_deco_tilegen1; optional_device<decocomn_device> m_decocomn; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(pckgaldx_unknown_r); DECLARE_READ16_MEMBER(pckgaldx_protection_r); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index ca741499265..22b7a9f2d5e 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -17,7 +17,8 @@ public: m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT16> m_bgvideoram; @@ -110,4 +111,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<pic16c57_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 3e6fb3750f5..fac776ee797 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -21,7 +21,8 @@ public: m_shared_ram(*this, "shared_ram"), m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"), m_dsp56k_p_8000(*this, "dsp56k_p_8000"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -36,6 +37,7 @@ public: required_shared_ptr<UINT16> m_dsp56k_p_mirror; required_shared_ptr<UINT16> m_dsp56k_p_8000; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; ioport_port *m_inputs[4]; UINT8 m_sys0; UINT8 m_sys1; diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index f42e92c8738..9017c19530a 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -25,4 +26,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index ada9246c13f..4d0017c5f54 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -24,7 +24,9 @@ public: m_road16_memory(*this, "road16_memory"), m_alpha16_memory(*this, "alpha16_memory"), m_view16_memory(*this, "view16_memory"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -44,6 +46,9 @@ public: required_shared_ptr<UINT16> m_alpha16_memory; required_shared_ptr<UINT16> m_view16_memory; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + UINT16 m_vertical_position_modifier[256]; UINT16 m_road16_vscroll; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 6bd56519232..960ae46b336 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -18,7 +18,9 @@ public: : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_maincpu(*this, "maincpu"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT32 m_control_data; UINT32 m_bsmt_data_bank; @@ -60,7 +62,8 @@ public: void render_display_list(offs_t offset); required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 9a203e3bdf5..39d6d959b11 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -11,7 +11,8 @@ public: m_characterram(*this, "characterram"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_freq1; @@ -42,6 +43,7 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index eecde5e605b..c521dafc36f 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -18,7 +18,8 @@ public: m_vpos_ram(*this, "vpos_ram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_da_latch; required_shared_ptr<UINT8> m_playfield_ram; @@ -42,6 +43,7 @@ public: DECLARE_WRITE8_MEMBER(poolshrk_bump_sound_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index ea9c523f365..fb606a2c06c 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -26,6 +27,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(irq_enable_w); DECLARE_WRITE8_MEMBER(pooyan_videoram_w); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 447f6fe1213..4cb344dbfdb 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_prot0; UINT8 m_prot1; @@ -53,4 +54,5 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index e585c540326..bf15dbdb525 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -16,7 +16,9 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ol_videoram; @@ -62,4 +64,6 @@ public: void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index a0395ae367e..952e03b892d 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -10,7 +10,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<tms5200_device> m_tms; required_shared_ptr<UINT8> m_bgvideoram; @@ -31,6 +32,7 @@ public: UINT32 screen_update_portrait(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info( tile_data &tileinfo, int tile_index, const UINT8 *source ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index b8f8a11a2c2..ff2b9cc433a 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -12,7 +12,9 @@ public: m_vram_0(*this, "vram_0"), m_vram_1(*this, "vram_1"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -24,6 +26,8 @@ public: required_shared_ptr<UINT16> m_vram_1; required_shared_ptr<UINT16> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT16 *m_vctrl_1; tilemap_t *m_tilemap_0; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index f8c39ada891..73810aeaae8 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -11,7 +11,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_upd7759(*this, "upd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; @@ -40,4 +41,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<upd7759_device> m_upd7759; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 89deeedf83f..e02c21beba9 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -18,7 +18,9 @@ public: m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -108,6 +110,8 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in video/psikyo.c -----------*/ diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index e70d59d6a23..d1e94798878 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -23,7 +23,8 @@ public: m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "lpalette"), - m_palette2(*this, "rpalette") + m_palette2(*this, "rpalette"), + m_screen(*this, "screen") { } /* memory pointers */ @@ -70,4 +71,5 @@ public: required_device<palette_device> m_palette; required_device<palette_device> m_palette2; + optional_device<screen_device> m_screen; }; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 97c6f1c66c7..ee39e6b5153 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -31,7 +31,9 @@ public: m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_device<buffered_spriteram32_device> m_spriteram; @@ -52,6 +54,8 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(psikyosh_irqctrl_w); DECLARE_WRITE32_MEMBER(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index ed6adadb235..ed97cb56c3b 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_bank_latch; UINT8 m_ps5_vram_page; @@ -60,4 +61,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 2eedf1e58d5..2bfd57edc23 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_rp5c01_mode_sel; int m_rp5c01_mem[16*4]; @@ -33,6 +34,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_top_tilemap; tilemap_t *m_bg_bot_tilemap; diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index a9332cd0d84..2dcec88f23e 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -14,7 +14,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -35,6 +36,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(pushman_flipscreen_w); DECLARE_WRITE16_MEMBER(pushman_control_w); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index ba2102c7603..2863c5eacc2 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -17,7 +17,8 @@ public: m_k053252(*this, "k053252"), m_ata(*this, "ata"), m_inputs_port(*this, "INPUTS"), - m_dsw_port(*this, "DSW") + m_dsw_port(*this, "DSW"), + m_palette(*this, "palette") { } @@ -30,6 +31,7 @@ public: required_device<ata_interface_device> m_ata; required_ioport m_inputs_port; required_ioport m_dsw_port; + required_device<palette_device> m_palette; UINT8 *m_sndram; UINT16 m_control; diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index af9f3a35ab7..47aee496e10 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -46,7 +46,8 @@ public: m_videoram_mask(*this, "videoram_mask"), m_scanline_latch(*this, "scanline_latch"), m_bank0(*this, "bank0"), - m_bank1(*this, "bank1") { } + m_bank1(*this, "bank1"), + m_screen(*this, "screen") { } /* devices */ required_device<m6809_base_device> m_maincpu; @@ -82,6 +83,8 @@ public: optional_memory_bank m_bank0; optional_memory_bank m_bank1; + required_device<screen_device> m_screen; + pen_t m_pens[0x400]; DECLARE_WRITE8_MEMBER(zookeep_bankswitch_w); DECLARE_WRITE8_MEMBER(qix_data_firq_w); diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index f44977a2251..6ff9ece5519 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_bg_ram; UINT8 *m_fg_ram; @@ -30,4 +31,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 797c8167c0e..59e04362d4f 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -20,7 +20,8 @@ public: m_scroll_ram(*this, "scroll_ram"), m_back_data(*this, "back_data"), m_fore_data(*this, "fore_data"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -32,6 +33,7 @@ public: required_shared_ptr<UINT16> m_back_data; required_shared_ptr<UINT16> m_fore_data; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_layer; tilemap_t *m_fg_layer; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 372a4db5af1..906ff73de6b 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -12,12 +12,14 @@ public: sprites(*this, "sprites") , m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> back_data,fore_data,mid_data, text_data, sprites; required_device<cpu_device> m_maincpu; required_device<seibu_sound_device> m_seibu_sound; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER( cop_itoa_low_w ); DECLARE_WRITE16_MEMBER( cop_itoa_high_w ); diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index aa5c56c30b4..12f5add080f 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -17,7 +17,8 @@ public: m_audiocpu(*this, "audiocpu"), m_pc080sn(*this, "pc080sn"), m_pc090oj(*this, "pc090oj"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT16> m_spriteram; @@ -41,6 +42,7 @@ public: required_device<pc080sn_device> m_pc080sn; optional_device<pc090oj_device> m_pc090oj; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(jumping_sound_w); DECLARE_READ8_MEMBER(jumping_latch_r); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index a6d13867709..54ec9be394c 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -20,7 +20,8 @@ public: m_namco_sound(*this, "namco"), m_samples(*this, "samples"), m_timeplt_audio(*this, "timeplt_audio"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -48,6 +49,7 @@ public: optional_device<samples_device> m_samples; optional_device<timeplt_audio_device> m_timeplt_audio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_main_irq_mask; DECLARE_WRITE8_MEMBER(rallyx_interrupt_vector_w); diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index e90cd070b70..8b3ccec5cfd 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -16,7 +16,9 @@ public: m_vram_1ras(*this, "vram_1ras"), m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_vram_0; @@ -57,4 +59,6 @@ public: required_device<cpu_device> m_maincpu; required_device<tmp68301_device> m_tmp68301; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 34f9d88a1fd..7c624f8c2fa 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -20,7 +20,8 @@ public: m_bitmap_color(*this, "bitmap_color"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_cvsd(*this, "cvsd") { } + m_cvsd(*this, "cvsd"), + m_screen(*this, "screen") { } UINT8 m_ay8910_latch_1; UINT8 m_ay8910_latch_2; @@ -33,6 +34,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; optional_device<hc55516_device> m_cvsd; + required_device<screen_device> m_screen; UINT8 *m_bitmap_colorram; UINT8 m_control_xor; diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index 30fc96a42fb..ba567fb60a7 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -15,7 +15,8 @@ public: m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_bank; int m_mcu_sim; @@ -86,6 +87,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; class renegade_adpcm_device : public device_t, diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 2c00ad5a7a0..66310d14fa2 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -10,7 +10,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_68705(*this, "68705"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_cpu2_m6000; required_shared_ptr<UINT8> m_fg_videoram; @@ -75,4 +76,5 @@ public: required_device<cpu_device> m_subcpu; optional_device<cpu_device> m_68705; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index be910eb56b5..34e4b0ff044 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -19,7 +19,8 @@ public: m_k007342(*this, "k007342"), m_k007420(*this, "k007420"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -35,6 +36,7 @@ public: required_device<k007420_device> m_k007420; required_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w); DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index c1b4e870137..24ca273ef6c 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -8,7 +8,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -35,4 +36,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index d0d9cc25163..330d4cf25bb 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -33,7 +33,8 @@ public: m_pf3_rowscroll(*this, "pf3_rowscroll"), m_pf4_rowscroll(*this, "pf4_rowscroll"), m_sprgen1(*this, "spritegen1"), - m_sprgen2(*this, "spritegen2") + m_sprgen2(*this, "spritegen2"), + m_palette(*this, "palette") { } /* devices */ @@ -57,6 +58,8 @@ public: optional_device<decospr_device> m_sprgen1; optional_device<decospr_device> m_sprgen2; + + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(rohga_irq_ack_r); DECLARE_WRITE16_MEMBER(wizdfire_irq_ack_w); diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index 6acea3a0738..123ef1feb86 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -7,7 +7,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -41,4 +42,5 @@ public: INTERRUPT_GEN_MEMBER(sound_timer_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 822904f5a08..b7e7a80898a 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -13,7 +13,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_upd7759(*this, "upd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; UINT8 m_sound_data; @@ -57,4 +59,6 @@ public: required_device<cpu_device> m_audiocpu; required_device<upd7759_device> m_upd7759; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 5b8e85e8bbd..486775fac88 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -6,7 +6,9 @@ public: m_video_ram(*this, "video_ram"), m_sprite_ram(*this, "sprite_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } emu_timer *m_interrupt_timer; required_shared_ptr<UINT8> m_video_ram; @@ -31,4 +33,6 @@ public: TIMER_CALLBACK_MEMBER(interrupt_callback); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index ce9b75cd1eb..a19faa9c0da 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -23,7 +23,8 @@ public: m_k053252(*this, "k053252"), m_sysreg(*this, "sysreg"), m_936_videoram(*this, "936_videoram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* devices */ required_device<cpu_device> m_maincpu; @@ -39,6 +40,7 @@ public: required_shared_ptr<UINT16> m_936_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; // UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 1ed9c6b86d4..2335322e59f 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -14,7 +14,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_device<sp0256_device> m_sp0256; required_shared_ptr<UINT8> m_spriteram; @@ -51,4 +52,5 @@ public: void trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 5aa457ae242..5b991e63be5 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -17,7 +17,8 @@ public: m_audiocpu(*this, "audiocpu"), m_sn(*this, "snsnd"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -33,6 +34,7 @@ public: required_device<sn76489_device> m_sn; required_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index fb936f03e89..1e9eed82831 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -9,7 +9,8 @@ public: m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_irq_enable; required_shared_ptr<UINT8> m_colorram; @@ -34,4 +35,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 50633cdc6db..c2531e80d99 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -8,7 +8,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_md_videoram; @@ -41,4 +42,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int codeshift); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 3bb2262feab..4369a807d54 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -33,7 +33,9 @@ public: m_speech(*this, "segaspeech"), m_usbsnd(*this, "usbsnd"), m_005snd(*this, "005"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_videoram; @@ -47,6 +49,8 @@ public: optional_device<usb_sound_device> m_usbsnd; optional_device<sega005_sound_device> m_005snd; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_sound_state[2]; UINT8 m_sound_rate; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 56456a7b281..08828855406 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -21,7 +21,8 @@ public: m_samples(*this, "samples"), m_speech(*this, "segaspeech"), m_usb(*this, "usbsnd"), - m_vector(*this, "vector") { } + m_vector(*this, "vector"), + m_screen(*this, "screen"){ } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_vectorram; @@ -31,6 +32,8 @@ public: optional_device<speech_sound_device> m_speech; optional_device<usb_sound_device> m_usb; required_device<vector_device> m_vector; + required_device<screen_device> m_screen; + UINT8 m_mult_data[2]; UINT16 m_mult_result; diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 912fa54cfb9..4476eb630d8 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -8,7 +8,9 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } static const UINT8 mahmajn_mlt[8]; @@ -125,4 +127,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<dac_device> m_dac; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 329d86ad572..22316ade82b 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -25,7 +25,9 @@ public: m_soundcpu(*this, "soundcpu"), m_multipcm(*this, "sega"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_z80_shared_ram; optional_shared_ptr<UINT8> m_ga2_dpram; @@ -39,6 +41,8 @@ public: optional_device<multipcm_device> m_multipcm; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; typedef void (segas32_state::*sys32_output_callback)(int which, UINT16 data); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index d29e83786e4..3766bcfbe71 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -26,7 +26,8 @@ public: m_soundfifo2(*this, "soundfifo2"), m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -42,6 +43,7 @@ public: optional_device<okim6295_device> m_oki1; optional_device<okim6295_device> m_oki2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_z80_prg_transfer_pos; int m_z80_lastbank; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 986240b6d70..97415048056 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -11,7 +11,8 @@ public: m_nvram(*this, "nvram"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -19,7 +20,7 @@ public: required_shared_ptr<UINT8> m_spriteram2; required_shared_ptr<UINT8> m_colorram; optional_shared_ptr<UINT8> m_nvram; - + UINT8 m_portb; tilemap_t *m_bg_tilemap; @@ -38,4 +39,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index d77d59c2d6d..40425d18759 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -25,7 +25,8 @@ public: m_radarram(*this, "radarram"), m_bgstripesram(*this, "bgstripesram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_int_delay_kludge; UINT8 m_sound_cmd; @@ -91,6 +92,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int priority); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/senjyo.c -----------*/ diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index ab6817198d0..23a0c55d97e 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -47,7 +47,8 @@ public: m_kiwame_nvram(*this,"kiwame_nvram"), m_inttoote_key_select(*this,"inttoote_keysel"), m_inttoote_700000(*this,"inttoote_700000"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -69,6 +70,7 @@ public: optional_shared_ptr<UINT16> m_inttoote_700000; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_tiles_offset; tilemap_t *m_tilemap_0; diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 2b7d2961100..a2c2c5e92ae 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -18,7 +18,9 @@ public: m_x1(*this, "x1snd"), m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<tmp68301_device> m_tmp68301; @@ -34,6 +36,8 @@ public: optional_device<okim9810_device> m_oki; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_xoffset; int m_yoffset; diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index f3034a4e5d5..33929104666 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -16,7 +16,8 @@ public: m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -60,4 +61,5 @@ public: required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index e22b3013e78..9ac154bc107 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -12,7 +12,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } tilemap_t *m_fgtilemap; tilemap_t *m_bg0tilemap; @@ -56,4 +58,6 @@ public: required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 2e821273a89..699e84b021a 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -9,7 +9,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_prot_count; required_shared_ptr<UINT16> m_ram; @@ -39,4 +41,6 @@ public: optional_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 6528fabb377..f8ef89ac0ed 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -9,7 +9,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bbx(*this, "bbx"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_spriteram; @@ -44,4 +45,5 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_bbx; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 97a7d2b9a10..b7ae65c9bae 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -7,13 +7,15 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_palettebank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 0adeeba4f36..661eb7568fb 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audio (*this, "m72"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_paletteram; required_shared_ptr<UINT8> m_videoram; @@ -17,6 +18,7 @@ public: required_device<cpu_device> m_maincpu; required_device<m72_audio_device> m_audio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_gfxbank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 25bc9259189..181c839d8cc 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_background; tilemap_t *m_foreground; @@ -36,4 +37,5 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index b75d2966159..efb55b61019 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -12,7 +12,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_gameid; @@ -62,4 +63,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 6b6bafeb7f6..8656f513323 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -14,7 +14,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_bg_tilemap; @@ -24,6 +25,7 @@ public: required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; const UINT8* m_prot_table[3]; UINT8 m_i8751_return; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 5231473a0a7..52365252c83 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -12,7 +12,8 @@ public: m_regs(*this, "regs"), m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_vidram; required_shared_ptr<UINT32> m_vidram2; @@ -37,4 +38,5 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki1; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index ad37be0f229..42f32ff2b54 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -20,7 +20,8 @@ public: m_okimusic(*this, "okimusic") , m_mainram(*this, "mainram"), m_systemram(*this, "systemram"), - m_sprgen(*this, "spritegen") + m_sprgen(*this, "spritegen"), + m_palette(*this, "palette") { } /* devices */ @@ -34,6 +35,7 @@ public: required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_systemram; optional_device<decospr_device> m_sprgen; + required_device<palette_device> m_palette; UINT16 *m_spriteram; size_t m_spriteram_size; diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 64543f196d5..d706c078e80 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -27,7 +27,8 @@ public: m_videoram(*this, "videoram") , m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_nmion; @@ -59,6 +60,7 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/skydiver.c -----------*/ diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index e3bcc86b39b..9989b8ff8da 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -11,7 +11,9 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -27,6 +29,8 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(skyfox_vregs_r); DECLARE_WRITE8_MEMBER(skyfox_vregs_w); diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index e36e9f68838..ec963ec011a 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -11,7 +11,8 @@ public: m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_cus30(*this, "namco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_inputport_selected; required_shared_ptr<UINT8> m_videoram; @@ -21,6 +22,7 @@ public: required_device<cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; tilemap_t *m_tx_tilemap; UINT8 m_priority; diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 3810ade3615..7d41df5f62b 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -10,7 +10,8 @@ public: m_obj_ram(*this, "obj_ram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_analog_range; int m_analog_offset; @@ -37,6 +38,7 @@ public: void draw_trapezoid(bitmap_ind16& dst, bitmap_ind16& src); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/skyraid.c -----------*/ diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 6978613cccc..8ea1a4a3174 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -28,7 +28,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_getstar_id; required_shared_ptr<UINT8> m_slapfight_videoram; @@ -138,6 +139,7 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 1b842ebb1a3..d7815ce30c8 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -38,7 +38,8 @@ public: m_tc0480scp(*this, "tc0480scp"), m_tc0360pri(*this, "tc0360pri"), m_tc0640fio(*this, "tc0640fio"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_color_ram; @@ -71,6 +72,7 @@ public: required_device<tc0360pri_device> m_tc0360pri; required_device<tc0640fio_device> m_tc0640fio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(color_ram_word_r); DECLARE_WRITE16_MEMBER(color_ram_word_w); diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index a889cabb592..56648417931 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -574,7 +574,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_spc700(*this, "spc700"), - m_superfx(*this, "superfx") { } + m_superfx(*this, "superfx"), + m_screen(*this, "screen") { } /* misc */ UINT16 m_hblank_offset; @@ -638,6 +639,8 @@ public: required_device<spc700_device> m_soundcpu; required_device<snes_sound_device> m_spc700; optional_device<cpu_device> m_superfx; + required_device<screen_device> m_screen; + DECLARE_DIRECT_UPDATE_MEMBER(snes_spc_direct); DECLARE_DIRECT_UPDATE_MEMBER(snes_direct); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index b52fb3e8267..e0e38ca2327 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -16,7 +16,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_countryc_trackball; int m_last_value[2]; @@ -186,4 +188,6 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 44a7e1cf462..e9e57b2c93a 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -21,7 +21,8 @@ public: m_charram(*this, "charram"), m_maincpu(*this, "maincpu"), m_sound(*this, "snk6502"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_sasuke_counter; @@ -33,6 +34,7 @@ public: required_device<cpu_device> m_maincpu; required_device<snk6502_sound_device> m_sound; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_charbank; int m_backcolor; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index f1e0d4f47b7..aea796f81ad 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -11,7 +11,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_upd7759(*this, "upd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_invert_controls; int m_sound_status; @@ -57,4 +59,6 @@ public: required_device<cpu_device> m_soundcpu; required_device<upd7759_device> m_upd7759; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index cecc8c1a5a0..22f5ce99d0a 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -13,7 +13,8 @@ public: m_pandora(*this, "pandora"), m_hyperpac_ram(*this, "hyperpac_ram"), m_bootleg_spriteram16(*this, "spriteram16b"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -23,6 +24,8 @@ public: optional_shared_ptr<UINT16> m_hyperpac_ram; optional_shared_ptr<UINT16> m_bootleg_spriteram16; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; + int m_sb3_music_is_playing; int m_sb3_music; UINT8 m_semicom_prot_offset; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 20ca618b808..843be9b9e72 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -10,7 +10,8 @@ public: m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -39,4 +40,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index c9a21411dbe..0cea5f1cad3 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,4 +46,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 7e378735c5e..a9c99f73a04 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -32,7 +32,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_screen(*this, "screen") { } UINT8 m_sound_latch; emu_timer *m_interrupt_timer; @@ -66,6 +67,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<samples_device> m_samples; + required_device<screen_device> m_screen; }; /*----------- defined in audio/spacefb.c -----------*/ diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 90b7deccb40..e850e7affef 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -13,7 +13,9 @@ public: m_extraram2(*this, "extraram2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_bgvideoram; required_shared_ptr<UINT16> m_fgvideoram; @@ -69,4 +71,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index e2d4430b7d6..48f7d7026bd 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -13,7 +13,8 @@ public: m_sn3(*this, "sn3"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_scrollram; @@ -47,4 +48,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index c33b29f424d..8f995fc6f0b 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -11,7 +11,9 @@ public: m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_toggle; int m_adpcm_pos[2]; @@ -64,4 +66,6 @@ public: required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index c004581901a..67f3fc2364e 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -32,4 +33,5 @@ public: UINT8 iox_key_matrix_calc(UINT8 p_side); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index cbe7a641301..adee15704a8 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_background_videoram(*this, "bg_videoram"), m_foreground_videoram(*this, "fg_videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -15,6 +16,7 @@ public: required_shared_ptr<UINT8> m_background_videoram; required_shared_ptr<UINT8> m_foreground_videoram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; bool m_leds_start; UINT32 m_leds_shiftreg; diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 4a0819a4d18..230596275d6 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -9,7 +9,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_attram; tilemap_t *m_tilemap; @@ -33,4 +34,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 6dfde5a0e12..b6d42302341 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -16,7 +16,8 @@ public: m_msm(*this, "msm"), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_pixelram; required_shared_ptr<UINT16> m_videoram; @@ -87,4 +88,5 @@ public: optional_device<msm5205_device> m_msm1; optional_device<msm5205_device> m_msm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index 65b73f7ab6b..a860c22df7e 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_master(*this,"master"), m_slave(*this,"slave"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_s_port3; UINT8 m_port7; @@ -21,6 +22,7 @@ public: required_device<cpu_device> m_master; required_device<cpu_device> m_slave; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sprcros2_m_port7_w); DECLARE_WRITE8_MEMBER(sprcros2_s_port3_w); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 82a11214c18..93cf0df632a 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -29,7 +29,9 @@ public: m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_attract; int m_steering[2]; @@ -78,6 +80,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in audio/sprint2.c -----------*/ diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index c5a92031656..7f8e26454cd 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -11,7 +11,9 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_da_latch; @@ -52,6 +54,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 1210289d039..804d724bfd0 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -12,7 +12,9 @@ public: m_team(*this, "team"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_steer_dir[8]; int m_steer_flag[8]; @@ -52,6 +54,8 @@ public: void sprint8_set_collision(int n); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in drivers/sprint8.c -----------*/ diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 33db43a205d..9e197672d1c 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -19,7 +19,8 @@ public: m_k007232_1(*this, "k007232_1"), m_k007232_2(*this, "k007232_2"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -43,6 +44,7 @@ public: required_device<k007232_device> m_k007232_2; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(spy_bankedram1_r); DECLARE_WRITE8_MEMBER(spy_bankedram1_w); DECLARE_WRITE8_MEMBER(bankswitch_w); diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index adc5dd3710d..383717fca7b 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -9,13 +9,15 @@ public: m_spriteram(*this,"spriteram"), m_backgroundram(*this, "backgroundram"), m_foregroundram(*this, "foregroundram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"){ } required_device<cpu_device> m_maincpu; required_device<buffered_spriteram8_device> m_spriteram; required_shared_ptr<UINT8> m_backgroundram; required_shared_ptr<UINT8> m_foregroundram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; int m_scroll[4]; diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index 1513e568e59..b4dd2b4d973 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -22,7 +22,8 @@ public: m_sprgen1(*this, "spritegen1"), m_sprgen2(*this, "spritegen2"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_palette(*this, "palette") { } optional_device<deco146_device> m_deco146; required_device<deco16ic_device> m_deco_tilegen1; @@ -68,4 +69,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index f6bbb777967..16c0b055f93 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } emu_timer *m_music_timer; @@ -64,4 +65,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index a9949d6267f..4216cfb639e 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -11,7 +11,8 @@ public: m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_paletteram; @@ -44,4 +45,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 74a71466b7b..b14fc6ae698 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -4,7 +4,8 @@ public: sspeedr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_led_TIME[2]; UINT8 m_led_SCORE[24]; @@ -44,4 +45,5 @@ public: void draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index c931f8aca76..724f5800477 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -9,7 +9,8 @@ public: m_vram4(*this, "vram4"), m_scrollram(*this, "scrollram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_oldport; tilemap_t *m_tilemap1; @@ -36,4 +37,5 @@ public: void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index bb7bc21ed91..db7d32e99b7 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -34,7 +34,9 @@ public: m_io_paddle(*this, "PADDLE"), m_io_trackx(*this, "TRACKX"), m_io_tracky(*this, "TRACKY"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -178,4 +180,6 @@ protected: optional_ioport m_io_trackx; optional_ioport m_io_tracky; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index b0dc6b89877..965a78687c6 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -6,7 +6,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int mux_port; UINT32 m_st0016_rom_bank; @@ -46,6 +48,8 @@ public: void draw_bgmap(bitmap_ind16 &bitmap,const rectangle &cliprect, int priority); optional_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; #define ISMACS (st0016_game&0x80) diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index fbac6903a0e..d472a980825 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -6,7 +6,8 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } bitmap_ind16 *m_ship1_vid; bitmap_ind16 *m_ship2_vid; @@ -62,4 +63,5 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index b43b566ee21..f6c35c0872e 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -27,7 +27,8 @@ public: m_starfire_colorram(*this, "colorram"), m_starfire_videoram(*this, "videoram"), m_samples(*this, "samples"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } required_shared_ptr<UINT8> m_starfire_colorram; required_shared_ptr<UINT8> m_starfire_videoram; @@ -64,4 +65,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_int); void get_pens(pen_t *pens); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index b89bd6872f6..9b7622193de 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -41,7 +41,9 @@ public: m_obj_ram(*this, "obj_ram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_analog_in_select; int m_attract; @@ -102,6 +104,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; /*----------- defined in audio/starshp1.c -----------*/ diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 82b21045aa9..4a2d7e698f6 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -19,7 +19,8 @@ public: m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_text_char_ram; optional_shared_ptr<UINT8> m_text_attr_ram; @@ -31,6 +32,7 @@ public: required_device<cpu_device> m_mcu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 *m_decrypt; UINT8 m_fm_data; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index ca944e3cc2e..21efd8d6dc4 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_bg_tilemap; tilemap_t *m_mlow_tilemap; @@ -56,4 +57,5 @@ public: required_device<okim6295_device> m_oki; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 73e74e47777..35d9f3aa7c3 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_xscroll(*this, "xscroll"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -16,6 +17,7 @@ public: required_shared_ptr<UINT8> m_xscroll; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_scrl_ctrl; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index e4bc21eb0b9..010cc85d813 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -23,7 +23,8 @@ public: m_audiocpu(*this, "audiocpu"), m_scudsp(*this, "scudsp"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -150,6 +151,7 @@ public: required_device<scudsp_cpu_device> m_scudsp; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; bitmap_rgb32 m_tmpbitmap; DECLARE_VIDEO_START(stv_vdp2); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 86ba7d62bf5..72ca1adf0f1 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -25,7 +25,8 @@ public: m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -58,6 +59,7 @@ public: int subs_steering_2(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in audio/subs.c -----------*/ diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 7374cd5766e..54c6a75841e 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -12,7 +12,9 @@ public: m_dac2(*this, "dac2"), m_dac3(*this, "dac3"), m_dac4(*this, "dac4"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -23,6 +25,8 @@ public: optional_device<dac_device> m_dac3; optional_device<dac_device> m_dac4; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_prot; UINT16 *m_paletteram; int m_color_bank; diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 7cb42f64e09..db2dd60910d 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -14,7 +14,9 @@ public: m_banked_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_hardhead_ip; @@ -24,6 +26,8 @@ public: required_device<cpu_device> m_audiocpu; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_rombank; UINT8 m_rombank_latch; diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 5c8408b6b8b..6786c9b478b 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -24,7 +24,8 @@ public: m_subcpu(*this, "sub"), m_tc0480scp(*this, "tc0480scp"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT16 m_coin_word; required_shared_ptr<UINT32> m_ram; @@ -53,4 +54,5 @@ public: required_device<tc0480scp_device> m_tc0480scp; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index b1482ddd5c3..8e2553ff88c 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -12,7 +12,8 @@ public: m_bitmapram(*this, "bitmapram"), m_bitmapram2(*this, "bitmapram2"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_mcu; @@ -22,6 +23,7 @@ public: optional_shared_ptr<UINT8> m_bitmapram2; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; INT16 *m_samplebuf; UINT8 m_port1; diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index f57db399919..29864f42e88 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -31,7 +31,8 @@ public: m_v3t_ram(*this, "v3t_ram"), m_main_ram(*this, "main_ram"), m_cache_ram(*this, "cache_ram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT32> m_spriteram; @@ -48,6 +49,7 @@ public: required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT32> m_cache_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; hit_t m_hit; UINT32 m_timer_0_temp[4]; bitmap_ind16 m_sprite_bitmap; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 75a98a6f975..72049175ffc 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_nmi_enable; UINT8 m_sound_data; @@ -52,6 +53,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/suprridr.c -----------*/ diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 2582905d560..aa855a5dda0 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -21,7 +21,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k053936(*this, "k053936"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_screen_videoram; @@ -62,4 +63,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 92c9a5fe044..e1cd5d6b3df 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_k052109(*this, "k052109"), m_k053244(*this, "k053244"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -37,6 +38,7 @@ public: required_device<k052109_device> m_k052109; required_device<k05324x_device> m_k053244; required_device<k053251_device> m_k053251; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(bankedram_r); DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(surpratk_videobank_w); diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 5638abf1f5c..25b6e447240 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -14,7 +14,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_device<i8255_device> m_ppi8255; required_shared_ptr<UINT8> m_ram; @@ -129,4 +131,6 @@ public: required_device<cpu_device> m_soundcpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 7fa14433159..84ea9fb73de 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -7,7 +7,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -36,4 +37,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index c1a469cb424..7c49b55b654 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k051316(*this, "k051316"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_bgvideoram; @@ -35,6 +36,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<k051316_device> m_k051316; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index a6cbb41fd84..28e7e8d2c92 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -33,7 +33,9 @@ public: m_tc0220ioc(*this, "tc0220ioc"), m_tc0510nio(*this, "tc0510nio"), m_mb87078(*this, "mb87078"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -68,6 +70,8 @@ public: optional_device<tc0510nio_device> m_tc0510nio; optional_device<mb87078_device> m_mb87078; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(bankswitch_w); DECLARE_READ16_MEMBER(tracky1_hi_r); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 8ab88180810..102967dbcf0 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -41,7 +41,8 @@ public: m_tc0480scp(*this, "tc0480scp"), m_tc0220ioc(*this, "tc0220ioc"), m_tc0510nio(*this, "tc0510nio"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -109,6 +110,7 @@ public: optional_device<tc0220ioc_device> m_tc0220ioc; optional_device<tc0510nio_device> m_tc0510nio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(growl_coin_word_w); DECLARE_WRITE16_MEMBER(taitof2_4p_coin_word_w); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index db991e57bbb..7b206b66df4 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -56,7 +56,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT16 *m_videoram; UINT16 *m_spriteram; @@ -289,6 +291,8 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 055f9ff07b1..0c8afb397cc 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -17,7 +17,8 @@ public: m_audiocpu(*this, "audiocpu"), m_tc0080vco(*this, "tc0080vco"), m_tc0220ioc(*this, "tc0220ioc"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_m68000_mainram; @@ -32,6 +33,7 @@ public: required_device<tc0080vco_device> m_tc0080vco; required_device<tc0220ioc_device> m_tc0220ioc; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(syvalion_input_bypass_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index f46506c0c53..5d824c4285b 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -11,7 +11,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -64,6 +65,7 @@ public: optional_device<cpu_device> m_audiocpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* memory buffers */ UINT8 m_rambanks[0x1000 * 12]; diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 37e07395226..4e3a517fa33 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc0080vco(*this, "tc0080vco"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling @@ -22,6 +23,7 @@ public: required_device<cpu_device> m_maincpu; required_device<tc0080vco_device> m_tc0080vco; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(io_w); DECLARE_READ16_MEMBER(io_r); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 11f0a710ccc..9a1a8a782f9 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -37,7 +37,8 @@ public: m_tc0220ioc(*this, "tc0220ioc"), m_tc0510nio(*this, "tc0510nio"), m_tc0140syt(*this, "tc0140syt"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -66,6 +67,7 @@ public: optional_device<tc0510nio_device> m_tc0510nio; required_device<tc0140syt_device> m_tc0140syt; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE16_MEMBER(chasehq_cpua_ctrl_w); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index fda9c8e9bd6..1b68ee8e964 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -36,7 +36,9 @@ public: m_dsp(*this, "dsp"), m_tc0080vco(*this, "tc0080vco"), m_tc0220ioc(*this, "tc0220ioc"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -61,6 +63,8 @@ public: required_device<tc0080vco_device> m_tc0080vco; required_device<tc0220ioc_device> m_tc0220ioc; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; bitmap_ind16 *m_framebuffer[2]; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 643e3fc1206..4331d7d2c68 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -49,7 +49,9 @@ public: m_main_ram(*this, "main_ram"), m_dsp_shared_ram(*this, "dsp_shared"), m_palette_ram(*this, "palette_ram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { m_mcu_output = 0; m_speed_meter = 0; @@ -70,6 +72,8 @@ public: required_shared_ptr<UINT32> m_palette_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; taitojc_renderer *m_renderer; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 8ef43651494..3f3771649b1 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -23,7 +23,9 @@ public: m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), m_dac(*this, "dac"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &, const rectangle &, int, int *, rectangle *); @@ -126,4 +128,6 @@ public: optional_device<cpu_device> m_mcu; required_device<dac_device> m_dac; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index e2bb6b03e8f..7e862932504 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -40,7 +40,9 @@ public: m_team(*this, "team"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_collision_index; required_shared_ptr<UINT8> m_video_ram; @@ -78,6 +80,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index fd018d75aa0..772ea805472 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_bulletsram; required_shared_ptr<UINT8> m_videoram; @@ -39,4 +40,5 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index e8d6190659b..f811b343b54 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -9,7 +9,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_latch; UINT32 m_timer1; @@ -53,4 +54,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 32f4129281f..b709789ff51 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -7,13 +7,15 @@ public: m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_vregs; required_shared_ptr<UINT16> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_pant[2]; DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index d7d5f95acee..d957d6d262b 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -29,7 +29,8 @@ public: m_subcpu(*this, "sub"), m_subcpu2(*this, "sub2"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT16> m_videoram; optional_shared_ptr<UINT16> m_cyclwarr_cpua_ram; @@ -142,6 +143,7 @@ public: optional_device<cpu_device> m_subcpu2; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in machine/tatsumi.c -----------*/ diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index e1022e34048..63bd13d8bf4 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -13,7 +13,8 @@ public: m_vram7(*this, "vram7"), m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_s1; int m_s2; @@ -57,4 +58,5 @@ public: UINT32 screen_update_taxidriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index f767fa9d8a3..7c62d5b30f7 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -14,7 +14,8 @@ public: m_audiocpu(*this, "audiocpu"), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_adpcm_pos[2]; int m_adpcm_end[2]; @@ -69,4 +70,5 @@ public: required_device<msm5205_device> m_msm1; required_device<msm5205_device> m_msm2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 625b169e756..ae8fec3762d 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -17,7 +17,8 @@ public: m_sprite_ram(*this, "sprite_ram"), m_c45_road(*this, "c45_road"), m_2dscreen(*this, "2dscreen"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_m6809_irq_enable; UINT8 m_m68k_irq_enable; @@ -65,6 +66,7 @@ public: optional_device<namco_c45_road_device> m_c45_road; required_device<screen_device> m_2dscreen; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index d2d8f30f048..6e18ad3dce8 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_adpcm_pos; int m_adpcm_end; @@ -62,4 +63,5 @@ public: required_device<cpu_device> m_soundcpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 11188d0104a..1c482600ec7 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -13,7 +13,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_colorram; @@ -58,4 +60,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index fc95b32b926..7472d64830d 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -27,7 +27,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_tilemap_paletteram16; @@ -97,4 +99,6 @@ public: required_device<cpu_device> m_audiocpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 843e8b8a78a..9d6e1d1ce9b 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -18,7 +18,8 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_track0[2]; int m_track1[2]; @@ -67,6 +68,7 @@ public: required_device<cpu_device> m_subcpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 9d95f9b158c..ed105fb2209 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -7,7 +7,8 @@ public: m_amazon_videoram(*this, "amazon_videoram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_amazon_videoram; @@ -41,4 +42,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 16de1732c91..395b8fb9a33 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -21,7 +21,8 @@ public: m_rocknms_sub_scroll_fg(*this, "sub_scroll_fg"), m_rocknms_sub_scroll_bg(*this, "sub_scroll_bg"), m_rocknms_sub_rotregs(*this, "sub_rotregs"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -47,6 +48,7 @@ public: optional_shared_ptr<UINT16> m_rocknms_sub_scroll_bg; optional_shared_ptr<UINT16> m_rocknms_sub_rotregs; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT16 m_rocknms_sub_systemregs[0x10]; UINT16 m_rockn_protectdata; diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 305b2d9020b..aeab102935d 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -11,7 +11,8 @@ public: m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; int m_nmi_enable; @@ -32,6 +33,7 @@ public: required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(thedeep_nmi_w); DECLARE_WRITE8_MEMBER(thedeep_sound_w); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 16d63fc3384..f9b0c8ac0fb 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -8,7 +8,8 @@ public: m_attributesram(*this, "attributesram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_question_address; int m_question_rom; @@ -45,4 +46,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 6f56b42014b..780cf39b93c 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -15,7 +15,8 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_tms(*this, "tms") { } + m_tms(*this, "tms"), + m_palette(*this, "palette") { } UINT8 *m_videoram; UINT8 m_input_select; @@ -47,4 +48,5 @@ public: required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; required_device<tms9927_device> m_tms; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 9480e9740a3..7eb906e3bbb 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -7,7 +7,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_vregs; @@ -27,4 +28,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index adc67bb4beb..c16ba5774a6 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -23,7 +23,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -47,6 +48,8 @@ public: optional_device<k007232_device> m_k007232; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; + required_device<palette_device> m_palette; + DECLARE_READ8_MEMBER(scontra_bankedram_r); DECLARE_WRITE8_MEMBER(scontra_bankedram_w); DECLARE_READ8_MEMBER(thunderx_bankedram_r); diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index d8d780a1c0b..da71a658681 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -5,7 +5,8 @@ public: tiamc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_tileram; UINT8 *m_charram; @@ -38,6 +39,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 1b8fd995977..768a2b1975f 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -40,4 +41,5 @@ public: required_device<cpu_device> m_audiocpu; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 9e315805089..1ffb31b8be7 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_nmi_enabled; @@ -37,4 +38,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 48dfb86f44a..bd703acb045 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -17,7 +17,9 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -30,6 +32,8 @@ public: required_shared_ptr<UINT8> m_spriteram2; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index bd8680f5dcd..64d077f2a38 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -38,7 +38,8 @@ public: m_k054000(*this, "k054000"), m_upd7759(*this, "upd"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ optional_shared_ptr<UINT16> m_spriteram; @@ -87,6 +88,7 @@ public: optional_device<upd7759_device> m_upd7759; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* memory buffers */ INT16 m_sampledata[0x40000]; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 884148392ca..fb4692a318a 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -30,7 +30,8 @@ public: m_maincpu(*this, "maincpu"), m_seta001(*this, "spritegen"), m_dac(*this, "dac"), - m_samples(*this, "samples") { } + m_samples(*this, "samples"), + m_palette(*this, "palette") { } /* memory pointers */ // UINT8 * m_paletteram; // currently this uses generic palette handling @@ -119,4 +120,5 @@ public: optional_device<seta001_device> m_seta001; optional_device<dac_device> m_dac; optional_device<samples_device> m_samples; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 686109480b3..eb921eb00c0 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -18,7 +18,9 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_bgpaletteram; required_shared_ptr<UINT16> m_fgpaletteram; @@ -153,6 +155,8 @@ public: required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_dsp; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; class toaplan1_rallybik_state : public toaplan1_state diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index f7da603956c..2a22bcb6517 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -39,7 +39,9 @@ public: m_oki1(*this, "oki1"), m_eeprom(*this, "eeprom"), m_rtc(*this, "rtc"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_shared_ram; // 8 bit RAM shared between 68K and sound CPU optional_shared_ptr<UINT16> m_shared_ram16; // Really 8 bit RAM connected to Z180 @@ -60,6 +62,8 @@ public: optional_device<eeprom_serial_93cxx_device> m_eeprom; optional_device<upd4992_device> m_rtc; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT16 m_mcu_data; UINT16 m_video_status; diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 544ebdabb79..742b9c71082 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -16,7 +16,9 @@ public: m_audiocpu(*this, "audiocpu"), m_seibu_sound(*this, "seibu_sound"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_background1_videoram16; @@ -29,6 +31,8 @@ public: optional_device<seibu_sound_device> m_seibu_sound; optional_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_msm5205next; int m_toggle; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index b33b4164867..2f1d27de590 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -30,7 +30,8 @@ public: m_filter1r(*this, "filter1r"), m_filter2(*this, "filter2"), m_filter3(*this, "filter3"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_spritemap; required_shared_ptr<UINT16> m_raster_ctrl; @@ -50,7 +51,8 @@ public: required_device<filter_volume_device> m_filter2; required_device<filter_volume_device> m_filter3; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; + // Misc UINT16 m_cpua_ctrl; INT32 m_ioc220_port; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index f353b9d9a00..62e3b2b1f2d 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -22,7 +22,8 @@ public: m_namco58xx(*this, "58xx"), m_namco56xx_1(*this, "56xx_1"), m_namco56xx_2(*this, "56xx_2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -37,6 +38,7 @@ public: required_device<namco56xx_device> m_namco56xx_1; required_device<namco56xx_device> m_namco56xx_2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index c79136371a4..2a304800364 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -14,7 +14,9 @@ public: m_bg_colorram(*this, "bg_colorram"), m_fg_colorram(*this, "fg_colorram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_audiocpu; required_shared_ptr<UINT8> m_palette_bank; @@ -28,6 +30,8 @@ public: required_shared_ptr<UINT8> m_fg_colorram; required_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index af33eca9c90..a1604933cc9 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -21,7 +21,8 @@ public: m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -36,6 +37,7 @@ public: optional_device<sn76496_device> m_sn; optional_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 45259c738ab..72ea42e45ee 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,4 +32,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 19e53c505eb..62b868a89d2 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -34,7 +34,9 @@ public: m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT8 m_cmos[16]; UINT8 m_da_latch; @@ -67,6 +69,8 @@ public: required_device<discrete_device> m_discrete; required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 42f5cf8c1f6..709992f1283 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -9,7 +9,8 @@ public: m_gfx_control(*this, "gfx_control"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -42,4 +43,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 9f13288f164..d2317e0e092 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -11,7 +11,8 @@ public: m_audiocpu(*this, "audiocpu"), m_audio2(*this, "audio2"), m_audio3(*this, "audio3"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_nmi_enabled; int m_sound_command1; @@ -72,4 +73,5 @@ public: optional_device<cpu_device> m_audio2; optional_device<cpu_device> m_audio3; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 3050c288f56..672b7a78220 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -20,7 +20,8 @@ public: m_soundcpu(*this, "soundcpu"), m_slave(*this, "slave"), m_mcu(*this, "mcu"), - m_msm(*this, "msm") { } + m_msm(*this, "msm"), + m_screen(*this, "screen") { } UINT8 m_sound_latch; UINT8 m_ls74; @@ -104,6 +105,8 @@ public: required_device<cpu_device> m_slave; required_device<cpu_device> m_mcu; optional_device<msm5205_device> m_msm; + required_device<screen_device> m_screen; + protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 985c113a454..ad607e8b1ce 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ @@ -47,6 +48,7 @@ public: optional_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; UINT8 m_semicom_prot_offset; UINT16 m_protbase; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index d2cf6e60fb7..a86e637aab3 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -7,7 +7,9 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT8 m_control; required_shared_ptr<UINT8> m_workram; @@ -34,4 +36,6 @@ public: int hposition,int vstart,int vstop,int vstretch,int hstretch); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index c1a1a86eccb..07728d66057 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -30,7 +30,8 @@ public: m_spriteram(*this, "spriteram"), m_sprite_position(*this, "spritepos"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen") { } /* device/memory pointers */ @@ -49,6 +50,7 @@ public: required_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; UINT8 * m_buckrog_bitmap_ram; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 5c979b5b881..6aa39553b81 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -17,7 +17,9 @@ public: m_subcpu(*this, "sub"), m_k007232(*this, "k007232"), m_upd7759(*this, "upd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_text_ram; @@ -74,6 +76,8 @@ public: required_device<k007232_device> m_k007232; required_device<upd7759_device> m_upd7759; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; class cuebrickj_state : public twin16_state diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index debdbc06a5d..3573c450a15 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -19,7 +19,9 @@ public: m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), m_spritegen(*this, "toaplan_scu"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_sharedram; @@ -125,7 +127,8 @@ public: required_device<cpu_device> m_dsp; required_device<toaplan_scu_device> m_spritegen; required_device<gfxdecode_device> m_gfxdecode; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index ac98163bee0..6e5b057b4b4 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -106,7 +106,8 @@ public: m_vram(*this, "vram"), m_objram(*this, "objram"), m_rcram(*this, "rcram"), - m_z80_ram(*this, "z80_ram") { } + m_z80_ram(*this, "z80_ram"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mathcpu; @@ -116,6 +117,7 @@ public: required_shared_ptr<UINT16> m_objram; required_shared_ptr<UINT16> m_rcram; required_shared_ptr<UINT8> m_z80_ram; + required_device<screen_device> m_screen; emu_timer *m_interrupt_timer; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index ef7aec5f4db..1d0e786bb5a 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -19,7 +19,9 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_da_latch; @@ -54,6 +56,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 59feae0a224..5f2d6cb567f 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -30,7 +30,8 @@ public: m_ram(*this, "ram"), m_shared_ram(*this, "shared_ram"), m_spriteram(*this, "spriteram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_subcpu; @@ -47,6 +48,7 @@ public: UINT8 m_dislayer[6]; required_shared_ptr<UINT32> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE32_MEMBER(color_ram_w); DECLARE_READ32_MEMBER(undrfire_input_r); diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index aaec3a27b68..56fb606a09e 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -9,7 +9,9 @@ public: m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } UINT16* m_vram; UINT16* m_scroll; @@ -49,4 +51,6 @@ public: optional_device<okim6295_device> m_oki; optional_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 0afde2f1bb9..84e34425b8d 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -18,7 +18,8 @@ public: m_deco_tilegen1(*this, "tilegen1"), m_deco_tilegen2(*this, "tilegen2"), m_spritegen(*this, "spritegen"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram"), + m_palette(*this, "palette") { } /* memory pointers */ UINT16 * m_pf1_rowscroll; @@ -36,6 +37,8 @@ public: required_device<deco16ic_device> m_deco_tilegen2; required_device<deco_mxc06_device> m_spritegen; required_device<buffered_spriteram16_device> m_spriteram; + required_device<palette_device> m_palette; + DECLARE_WRITE16_MEMBER(vaportra_sound_w); DECLARE_READ16_MEMBER(vaportra_control_r); DECLARE_READ8_MEMBER(vaportra_soundlatch_r); diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 02c4ab31aab..11bd22ba958 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -10,7 +10,8 @@ public: m_sharedram(*this, "sharedram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_bg1videoram; required_shared_ptr<UINT8> m_bg2videoram; @@ -48,4 +49,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index b7e9c40319e..96866719728 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -9,7 +9,9 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette"){ } required_shared_ptr<UINT8> m_vb_attribram; required_shared_ptr<UINT8> m_vb_videoram; @@ -44,4 +46,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index bce7ba8275d..896afbb7589 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -28,7 +28,8 @@ public: m_k053246(*this, "k053246"), m_k053251(*this, "k053251"), m_k053252(*this, "k053252"), - m_k054000(*this, "k054000") { } + m_k054000(*this, "k054000"), + m_palette(*this, "palette") { } /* memory pointers */ UINT8 * m_ram; @@ -52,6 +53,7 @@ public: required_device<k053251_device> m_k053251; optional_device<k053252_device> m_k053252; optional_device<k054000_device> m_k054000; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(vendetta_eeprom_w); DECLARE_READ8_MEMBER(vendetta_K052109_r); DECLARE_WRITE8_MEMBER(vendetta_K052109_w); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index c4e6b76d949..e0c97451667 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -22,7 +22,8 @@ public: m_coinstate_timer(*this, "coinstate"), m_nsub_coinage_timer(*this, "nsub_coin"), m_videoram(*this, "videoram"), - m_characterram(*this, "characterram") + m_characterram(*this, "characterram"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; @@ -34,6 +35,7 @@ public: optional_device<timer_device> m_nsub_coinage_timer; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_characterram; + required_device<screen_device> m_screen; UINT8 m_coin_status; UINT8 m_palette_bank; diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index b88cafb03d6..b2a01ca8bd8 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -38,7 +38,9 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_charram(*this, "charram") , - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -78,4 +80,6 @@ public: void update_background(); void update_foreground(); required_device<cpu_device> m_maincpu; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 73fe699f7f9..1f5efd09832 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -28,7 +28,9 @@ public: m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } attotime m_time_pushed; attotime m_time_released; @@ -56,6 +58,8 @@ public: required_device<cpu_device> m_maincpu; required_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 71732bbe6a3..0e0fcb8fba9 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audio(*this, "m72"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -17,6 +18,7 @@ public: required_device<cpu_device> m_maincpu; required_device<m72_audio_device> m_audio; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; int m_horiz_scroll_low; int m_horiz_scroll_high; diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index cacb8b48788..952ec228abf 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -18,7 +18,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_pc090oj(*this, "pc090oj") { } + m_pc090oj(*this, "pc090oj"), + m_screen(*this, "screen") { } /* memory pointers */ UINT16 * m_video_ram; @@ -39,6 +40,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<pc090oj_device> m_pc090oj; + required_device<screen_device> m_screen; + DECLARE_WRITE16_MEMBER(volfied_cchip_ctrl_w); DECLARE_WRITE16_MEMBER(volfied_cchip_bank_w); DECLARE_WRITE16_MEMBER(volfied_cchip_ram_w); diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 44a5e22794b..6f8f4947da8 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -9,7 +9,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_scroll_low; required_shared_ptr<UINT8> m_scroll_high; @@ -32,4 +33,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 1d3ac3b1115..7b6e3647563 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -30,7 +30,8 @@ public: m_2610_1r(*this, "2610.1.r"), m_2610_2l(*this, "2610.2.l"), m_2610_2r(*this, "2610.2.r"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -54,6 +55,7 @@ public: required_device<filter_volume_device> m_2610_2l; required_device<filter_volume_device> m_2610_2r; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(warriorb_sound_w); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 79ff188887f..6443fe57167 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -21,7 +21,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } typedef void (wc90_state::*draw_sprites_func)(bitmap_ind16 &, const rectangle &, int, int, int, int, int ); @@ -73,4 +74,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 7cb441a4ea5..043dc7b362e 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -17,7 +17,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_msm5205next; int m_toggle; @@ -53,4 +54,5 @@ public: required_device<cpu_device> m_audiocpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index d0b85d66e08..ef6cbb9d360 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -22,7 +22,8 @@ public: m_k007232_1(*this, "k007232_1"), m_k007232_2(*this, "k007232_2"), m_k007232_3(*this, "k007232_3"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT16> m_videostatus; optional_shared_ptr<UINT16> m_protection_ram; @@ -107,6 +108,7 @@ public: optional_device<k007232_device> m_k007232_2; optional_device<k007232_device> m_k007232_3; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/wecleman.c -----------*/ diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 2acb5b23b0b..257ae9f5ce5 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -32,7 +32,8 @@ public: m_tc0100scn(*this, "tc0100scn"), m_tc0140syt(*this, "tc0140syt"), m_tc0220ioc(*this, "tc0220ioc"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_spritemap; @@ -66,6 +67,7 @@ public: required_device<tc0140syt_device> m_tc0140syt; required_device<tc0220ioc_device> m_tc0220ioc; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; DECLARE_READ16_MEMBER(sharedram_r); DECLARE_WRITE16_MEMBER(sharedram_w); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index fb31a38a546..bb3bb2c90ac 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -21,7 +21,9 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_soundcpu_b(*this, "soundcpu_b"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } enum { @@ -166,6 +168,8 @@ public: required_device<cpu_device> m_soundcpu; optional_device<cpu_device> m_soundcpu_b; optional_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + optional_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 6a764397392..dcb3e9ebdc8 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -30,4 +31,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 17b57b3ed19..cef5548a294 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -16,7 +16,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_discrete(*this, "discrete"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_dsc0; int m_dsc1; @@ -66,4 +67,5 @@ public: required_device<cpu_device> m_audiocpu; optional_device<discrete_device> m_discrete; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index ab143a33ce1..73dc821603b 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -13,13 +13,17 @@ public: m_alpha_num_ram(*this, "alpha_num_ram"), m_maincpu(*this, "maincpu"), m_s14001a(*this, "speech"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_alpha_num_ram; required_device<cpu_device> m_maincpu; required_device<s14001a_device> m_s14001a; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; int m_collision; unsigned m_current_index; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 7caeb61eabb..52e3a8daa57 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_shareram(*this, "shareram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tilemap_t *m_pant[2]; required_shared_ptr<UINT16> m_videoram; @@ -30,4 +31,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 7b966b1fd22..160b2b6a0fe 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -8,7 +8,9 @@ public: m_bg0_videoram(*this, "bg0_videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_vblank; int m_scrollx; @@ -35,4 +37,6 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 41741ac4b29..cc4d4bc1d79 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -11,7 +11,9 @@ public: m_audiocpu(*this, "audiocpu"), m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_vblank; int m_from_main; @@ -83,4 +85,6 @@ public: required_device<cpu_device> m_subcpu; optional_device<cpu_device> m_mcu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index c9ade6f34cf..5f7228fb865 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -33,7 +33,8 @@ public: m_k053250(*this, "k053250"), m_k053251(*this, "k053251"), m_k053252(*this, "k053252"), - m_k054338(*this, "k054338") { } + m_k054338(*this, "k054338"), + m_screen(*this, "screen") { } /* memory pointers */ required_shared_ptr<UINT16> m_workram; @@ -69,6 +70,7 @@ public: required_device<k053251_device> m_k053251; required_device<k053252_device> m_k053252; required_device<k054338_device> m_k054338; + required_device<screen_device> m_screen; DECLARE_READ16_MEMBER(K053247_scattered_word_r); DECLARE_WRITE16_MEMBER(K053247_scattered_word_w); DECLARE_READ16_MEMBER(spriteram_mirror_r); diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index 47d62ff1291..b2cdb4438c5 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -18,7 +18,8 @@ public: m_k054539(*this, "k054539"), m_k052109(*this, "k052109"), m_k053246(*this, "k053246"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251"), + m_screen(*this, "screen") { } /* memory pointers */ // UINT16 * m_paletteram; // currently this uses generic palette handling @@ -48,6 +49,7 @@ public: required_device<k052109_device> m_k052109; required_device<k053247_device> m_k053246; required_device<k053251_device> m_k053251; + required_device<screen_device> m_screen; DECLARE_WRITE16_MEMBER(eeprom_w); DECLARE_READ16_MEMBER(sound_status_r); DECLARE_WRITE16_MEMBER(sound_cmd_w); diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index b2ba5c48d98..76413f3077e 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -9,7 +9,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT16> m_videoram; tilemap_t *m_bg_tilemap; @@ -29,4 +30,5 @@ public: required_device<cpu_device> m_maincpu; required_device<eeprom_serial_93cxx_device> m_eeprom; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 0e4bc1a14ba..ae3e19aeea1 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_status; required_shared_ptr<UINT8> m_bgram; @@ -39,4 +40,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 5186455df58..3c8313f55b5 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -12,7 +12,8 @@ public: m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), m_vlm(*this, "vlm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -24,6 +25,7 @@ public: required_device<sn76489a_device> m_sn; required_device<vlm5030_device> m_vlm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index cdd4ba04053..0399ed7e3a0 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -17,7 +17,9 @@ public: m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_0; @@ -52,4 +54,6 @@ public: DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 87d9651fc84..9b9cc3dfc96 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -13,7 +13,8 @@ public: m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } /* video-related */ tilemap_t *m_tilemap_0; @@ -49,4 +50,5 @@ public: required_device<cpu_device> m_maincpu; required_device<msm5205_device> m_msm; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 6f8852eb97d..e55ba7896d4 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -9,7 +9,9 @@ public: m_s2636_0_ram(*this, "s2636_0_ram"), m_maincpu(*this, "maincpu"), m_s2636_sound(*this, "s2636snd"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_s2636_0_ram; @@ -17,6 +19,8 @@ public: required_device<cpu_device> m_maincpu; required_device<s2636_device> m_s2636_sound; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; bitmap_ind16 m_bitmap; bitmap_ind16 m_spritebitmap; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 4ee8040a53b..ea2ad1b6973 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -13,7 +13,8 @@ public: m_audiocpu(*this, "audiocpu"), m_audio2(*this, "audio2"), m_dac2(*this, "dac2"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_dsw; int m_active_8910; @@ -60,4 +61,5 @@ public: required_device<cpu_device> m_audio2; required_device<dac_device> m_dac2; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 5f8e11fe528..585ae64782b 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -15,7 +15,8 @@ public: m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_spriteram; @@ -91,6 +92,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<samples_device> m_samples; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index baf232d0572..393e41b17f6 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -13,7 +13,8 @@ public: m_attributeram(*this, "attributeram"), m_spriteram(*this, "spriteram"), m_bulletsram(*this, "bulletsram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } // in drivers/zodiack.c @@ -43,6 +44,7 @@ public: required_shared_ptr<UINT8> m_bulletsram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; // state tilemap_t *m_bg_tilemap; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 04e87fd94f7..6db4bdbc0a5 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -972,7 +972,9 @@ atarigen_state::atarigen_state(const machine_config &mconfig, device_type type, m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), m_soundcomm(*this, "soundcomm"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 664b7a9ab8b..3e953366ca5 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -427,6 +427,8 @@ public: optional_device<atari_sound_comm_device> m_soundcomm; optional_device<gfxdecode_device> m_gfxdecode; + optional_device<screen_device> m_screen; + optional_device<palette_device> m_palette; }; diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c index bc085e3e5ed..9c0c7e84d4f 100644 --- a/src/mame/machine/segaic16.c +++ b/src/mame/machine/segaic16.c @@ -47,6 +47,7 @@ sega_16bit_common_base::sega_16bit_common_base(const machine_config &mconfig, de m_paletteram(*this, "paletteram"), m_open_bus_recurse(false), m_palette_entries(0), + m_screen(*this, "screen"), m_palette(*this, "palette") { palette_init(); diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h index 3b16e99cb4b..2b5acf37e73 100644 --- a/src/mame/machine/segaic16.h +++ b/src/mame/machine/segaic16.h @@ -74,6 +74,7 @@ protected: UINT8 m_palette_normal[32]; // RGB translations for normal pixels UINT8 m_palette_shadow[32]; // RGB translations for shadowed pixels UINT8 m_palette_hilight[32]; // RGB translations for hilighted pixels + required_device<screen_device> m_screen; required_device<palette_device> m_palette; }; diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c index 2f9c9a21f9d..11acaf23530 100644 --- a/src/mame/video/atari.c +++ b/src/mame/video/atari.c @@ -708,7 +708,7 @@ static void cclk_init(void) ************************************************************************/ VIDEO_START( atari ) { - driver_device *state = machine.driver_data<driver_device>(); + palette_device *m_palette = machine.first_screen()->palette(); int i; LOG(("atari antic_vh_start\n")); @@ -745,7 +745,7 @@ VIDEO_START( atari ) /* reset the ANTIC color tables */ for( i = 0; i < 256; i ++ ) - antic.color_lookup[i] = (state->m_palette->pen(0) << 8) + state->m_palette->pen(0); + antic.color_lookup[i] = (m_palette->pen(0) << 8) + m_palette->pen(0); LOG(("atari cclk_init\n")); cclk_init(); diff --git a/src/mame/video/decocomn.c b/src/mame/video/decocomn.c index e4d7f5471b7..d6d1a980b5a 100644 --- a/src/mame/video/decocomn.c +++ b/src/mame/video/decocomn.c @@ -14,11 +14,22 @@ decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, DECOCOMN, "Data East Common Video Functions", tag, owner, clock, "decocomn", __FILE__), device_video_interface(mconfig, *this), m_dirty_palette(NULL), - m_priority(0) + m_priority(0), + m_palette(*this) { } //------------------------------------------------- +// static_set_palette_tag: Set the tag of the +// palette device +//------------------------------------------------- + +void decocomn_device::static_set_palette_tag(device_t &device, const char *tag) +{ + downcast<decocomn_device &>(device).m_palette.set_tag(tag); +} + +//------------------------------------------------- // device_config_complete - perform any // operations now that the configuration is // complete @@ -74,7 +85,7 @@ WRITE16_MEMBER( decocomn_device::nonbuffered_palette_w ) g = (state->m_generic_paletteram_16[offset + 1] >> 8) & 0xff; r = (state->m_generic_paletteram_16[offset + 1] >> 0) & 0xff; - state->m_palette->set_pen_color(offset / 2, rgb_t(r,g,b)); + m_palette->set_pen_color(offset / 2, rgb_t(r,g,b)); } WRITE16_MEMBER( decocomn_device::buffered_palette_w ) @@ -90,7 +101,7 @@ WRITE16_MEMBER( decocomn_device::palette_dma_w ) { driver_device *state = space.machine().driver_data(); - const int m = state->m_palette->entries(); + const int m = m_palette->entries(); int r, g, b, i; for (i = 0; i < m; i++) @@ -103,7 +114,7 @@ WRITE16_MEMBER( decocomn_device::palette_dma_w ) g = (state->m_generic_paletteram_16[i * 2 + 1] >> 8) & 0xff; r = (state->m_generic_paletteram_16[i * 2 + 1] >> 0) & 0xff; - state->m_palette->set_pen_color(i, rgb_t(r,g,b)); + m_palette->set_pen_color(i, rgb_t(r,g,b)); } } } diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h index 5b3d76ff300..911f06aa6cb 100644 --- a/src/mame/video/decocomn.h +++ b/src/mame/video/decocomn.h @@ -21,6 +21,9 @@ public: decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~decocomn_device() {} + // static configuration + static void static_set_palette_tag(device_t &device, const char *tag); + DECLARE_WRITE16_MEMBER( nonbuffered_palette_w ); DECLARE_WRITE16_MEMBER( buffered_palette_w ); DECLARE_WRITE16_MEMBER( palette_dma_w ); @@ -38,6 +41,7 @@ private: // internal state UINT8 *m_dirty_palette; UINT16 m_priority; + required_device<palette_device> m_palette; }; extern const device_type DECOCOMN; @@ -51,4 +55,7 @@ extern const device_type DECOCOMN; #define MCFG_DECOCOMN_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, DECOCOMN, 0) +#define MCFG_DECOCOMN_PALETTE(_palette_tag) \ + decocomn_device::static_set_palette_tag(*device, "^" _palette_tag); + #endif diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 2c982ca48f3..689307ff894 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -1576,13 +1576,13 @@ void K001005_draw(bitmap_rgb32 &bitmap, const rectangle &cliprect) void K001005_swap_buffers(running_machine &machine) { - driver_device *state = machine.driver_data<driver_device>(); + palette_device *m_palette = machine.first_screen()->palette(); K001005_bitmap_page ^= 1; //if (K001005_status == 2) { float zvalue = ZBUFFER_MAX; - K001005_bitmap[K001005_bitmap_page]->fill(state->m_palette->pen(0)&0x00ffffff, K001005_cliprect); + K001005_bitmap[K001005_bitmap_page]->fill(m_palette->pen(0)&0x00ffffff, K001005_cliprect); K001005_zbuffer->fill(*(int*)&zvalue, K001005_cliprect); } } diff --git a/src/mame/video/k053936.c b/src/mame/video/k053936.c index 7d0bb15a7e6..257d0329f33 100644 --- a/src/mame/video/k053936.c +++ b/src/mame/video/k053936.c @@ -460,7 +460,7 @@ INLINE void K053936GP_copyroz32clip( running_machine &machine, int tilebpp, int blend, int alpha, int clip, int pixeldouble_output ) { static const int colormask[8]={1,3,7,0xf,0x1f,0x3f,0x7f,0xff}; - driver_device *state = machine.driver_data<driver_device>(); + palette_device *m_palette = machine.first_screen()->palette(); int cy, cx; int ecx; int src_pitch, incxy, incxx; @@ -506,7 +506,7 @@ INLINE void K053936GP_copyroz32clip( running_machine &machine, ecx = tx = -tx; tilebpp = (tilebpp-1) & 7; - pal_base = state->m_palette->pens(); + pal_base = m_palette->pens(); cmask = colormask[tilebpp]; src_pitch = src_bitmap.rowpixels(); diff --git a/src/mame/video/k054338.c b/src/mame/video/k054338.c index eb08680c640..3fb29892972 100644 --- a/src/mame/video/k054338.c +++ b/src/mame/video/k054338.c @@ -58,7 +58,7 @@ int K054338_read_register(int reg) void K054338_update_all_shadows(running_machine &machine, int rushingheroes_hack) { - driver_device *state = machine.driver_data<driver_device>(); + palette_device *m_palette = machine.first_screen()->palette(); int i, d; int noclip = k54338_regs[K338_REG_CONTROL] & K338_CTL_CLIPSL; @@ -71,15 +71,15 @@ void K054338_update_all_shadows(running_machine &machine, int rushingheroes_hack if (!rushingheroes_hack) { - state->m_palette->set_shadow_dRGB32(0, K054338_shdRGB[0], K054338_shdRGB[1], K054338_shdRGB[2], noclip); - state->m_palette->set_shadow_dRGB32(1, K054338_shdRGB[3], K054338_shdRGB[4], K054338_shdRGB[5], noclip); - state->m_palette->set_shadow_dRGB32(2, K054338_shdRGB[6], K054338_shdRGB[7], K054338_shdRGB[8], noclip); + m_palette->set_shadow_dRGB32(0, K054338_shdRGB[0], K054338_shdRGB[1], K054338_shdRGB[2], noclip); + m_palette->set_shadow_dRGB32(1, K054338_shdRGB[3], K054338_shdRGB[4], K054338_shdRGB[5], noclip); + m_palette->set_shadow_dRGB32(2, K054338_shdRGB[6], K054338_shdRGB[7], K054338_shdRGB[8], noclip); } else // rushing heroes seems to specify shadows in another format, or it's not being interpreted properly. { - state->m_palette->set_shadow_dRGB32(0, -80, -80, -80, 0); - state->m_palette->set_shadow_dRGB32(1, -80, -80, -80, 0); - state->m_palette->set_shadow_dRGB32(2, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(0, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(1, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(2, -80, -80, -80, 0); } } @@ -311,7 +311,7 @@ int k054338_device::register_r( int reg ) void k054338_device::update_all_shadows( int rushingheroes_hack ) { - driver_device *state = machine().driver_data<driver_device>(); + palette_device *m_palette = machine().first_screen()->palette(); int i, d; int noclip = m_regs[K338_REG_CONTROL] & K338_CTL_CLIPSL; @@ -325,15 +325,15 @@ void k054338_device::update_all_shadows( int rushingheroes_hack ) if (!rushingheroes_hack) { - state->m_palette->set_shadow_dRGB32(0, m_shd_rgb[0], m_shd_rgb[1], m_shd_rgb[2], noclip); - state->m_palette->set_shadow_dRGB32(1, m_shd_rgb[3], m_shd_rgb[4], m_shd_rgb[5], noclip); - state->m_palette->set_shadow_dRGB32(2, m_shd_rgb[6], m_shd_rgb[7], m_shd_rgb[8], noclip); + m_palette->set_shadow_dRGB32(0, m_shd_rgb[0], m_shd_rgb[1], m_shd_rgb[2], noclip); + m_palette->set_shadow_dRGB32(1, m_shd_rgb[3], m_shd_rgb[4], m_shd_rgb[5], noclip); + m_palette->set_shadow_dRGB32(2, m_shd_rgb[6], m_shd_rgb[7], m_shd_rgb[8], noclip); } else // rushing heroes seems to specify shadows in another format, or it's not being interpreted properly. { - state->m_palette->set_shadow_dRGB32(0, -80, -80, -80, 0); - state->m_palette->set_shadow_dRGB32(1, -80, -80, -80, 0); - state->m_palette->set_shadow_dRGB32(2, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(0, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(1, -80, -80, -80, 0); + m_palette->set_shadow_dRGB32(2, -80, -80, -80, 0); } } diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c index 967018b4ca6..c1bdf7db7ee 100644 --- a/src/mame/video/vdc.c +++ b/src/mame/video/vdc.c @@ -440,14 +440,14 @@ SCREEN_UPDATE_IND16( pce ) static void draw_black_line(running_machine &machine, int line) { - driver_device *state = machine.driver_data<driver_device>(); + palette_device *m_palette=machine.first_screen()->palette(); int i; /* our line buffer */ UINT16 *line_buffer = &vce.bmp->pix16(line); for( i=0; i< VDC_WPF; i++ ) - line_buffer[i] = state->m_palette->black_pen(); + line_buffer[i] = m_palette->black_pen(); } static void draw_overscan_line(int line) diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c index a145ab87a3c..945d102f837 100644 --- a/src/mess/drivers/a7000.c +++ b/src/mess/drivers/a7000.c @@ -26,10 +26,12 @@ class a7000_state : public driver_device public: a7000_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_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; DECLARE_READ32_MEMBER(a7000_iomd_r); DECLARE_WRITE32_MEMBER(a7000_iomd_w); DECLARE_WRITE32_MEMBER(a7000_vidc20_w); diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index 5a4fc6dd69c..d2455f9291b 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -82,7 +82,8 @@ public: m_dmac(*this, "i8237"), m_pit(*this, "pit8253"), m_video_ram_1(*this, "video_ram_1"), - m_video_ram_2(*this, "video_ram_2") + m_video_ram_2(*this, "video_ram_2"), + m_palette(*this, "palette") { } // devices @@ -100,6 +101,8 @@ public: required_shared_ptr<UINT8> m_video_ram_1; required_shared_ptr<UINT8> m_video_ram_2; + + required_device<palette_device> m_palette; // screen updates UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c index 14038a8a858..32e1c3be1ed 100644 --- a/src/mess/drivers/apexc.c +++ b/src/mess/drivers/apexc.c @@ -18,7 +18,8 @@ public: apexc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT32 m_panel_data_reg; /* value of a data register on the control panel which can be edited - the existence of this register is a personnal @@ -47,6 +48,7 @@ public: void apexc_teletyper_putchar(int character); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void apexc_state::machine_start() diff --git a/src/mess/drivers/ax20.c b/src/mess/drivers/ax20.c index 4ade8f729a8..7576c1a78cd 100644 --- a/src/mess/drivers/ax20.c +++ b/src/mess/drivers/ax20.c @@ -28,7 +28,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_vram(*this, "p_vram"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -37,6 +38,7 @@ public: required_shared_ptr<UINT8> m_p_vram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c index d30d417aa76..bf2990237cf 100644 --- a/src/mess/drivers/b16.c +++ b/src/mess/drivers/b16.c @@ -28,7 +28,8 @@ public: m_vram(*this, "vram"), m_dma8237(*this, "8237dma"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_char_rom; required_shared_ptr<UINT16> m_vram; @@ -52,6 +53,7 @@ public: virtual void machine_reset(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #define mc6845_h_char_total (m_crtc_vreg[0]) diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index e17001ae6be..56aab0c00e0 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -161,7 +161,8 @@ public: m_bios_rom(*this, "bios_rom"), m_vregs(*this, "vregs"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT32> m_bios_rom; required_shared_ptr<UINT32> m_vregs; @@ -187,6 +188,7 @@ public: DECLARE_WRITE8_MEMBER(casloopy_bitmap_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c index 095c1e3d9e5..9a8bdc6aa92 100644 --- a/src/mess/drivers/fp6000.c +++ b/src/mess/drivers/fp6000.c @@ -32,7 +32,8 @@ public: m_vram(*this, "vram"), m_maincpu(*this, "maincpu") , m_crtc(*this, "crtc"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_char_rom; @@ -59,6 +60,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device>m_crtc; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void fp6000_state::video_start() diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c index 3012adab916..917f851b1f7 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -232,7 +232,8 @@ public: , m_keyrow15(*this, "ROW15") , m_keyrow16(*this, "ROW16") , m_vram(*this, "vram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } // devices @@ -280,6 +281,7 @@ private: UINT8 m_bank; UINT8 m_kbdrow, m_kbdcol, m_kbdclk, m_kbdread; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; void itt3030_state::video_start() diff --git a/src/mess/drivers/jr200.c b/src/mess/drivers/jr200.c index cd84eea4767..f8120b83b7a 100644 --- a/src/mess/drivers/jr200.c +++ b/src/mess/drivers/jr200.c @@ -45,7 +45,8 @@ public: m_row7(*this, "ROW7"), m_row8(*this, "ROW8"), m_row9(*this, "ROW9"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; @@ -90,6 +91,7 @@ protected: required_ioport m_row8; required_ioport m_row9; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index 4b3229caa8c..1c3d0fcbf5a 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -64,7 +64,8 @@ public: m_fd1797(*this, "fd1797"), m_floppy0(*this, "fd1797:0:5dd"), m_floppy1(*this, "fd1797:1:5dd"), - m_p_videoram(*this, "p_videoram") + m_p_videoram(*this, "p_videoram"), + m_palette(*this, "palette") { } @@ -79,6 +80,7 @@ public: required_device<floppy_image_device> m_floppy1; required_shared_ptr<UINT16> m_p_videoram; + required_device<palette_device> m_palette; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index 95f12ffb90f..e2d347fc1e5 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -42,9 +42,9 @@ public: m_ppi(*this, "ppi8255_2"), m_floppy0(*this, FLOPPY_0), m_floppy1(*this, FLOPPY_1), - m_vram(*this, "vram") - , - m_maincpu(*this, "maincpu") { } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { } virtual void machine_start(); @@ -65,6 +65,7 @@ public: virtual void video_start(); UINT32 screen_update_mbc200(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/multi16.c b/src/mess/drivers/multi16.c index 577c017f3a2..987c49ad2dd 100644 --- a/src/mess/drivers/multi16.c +++ b/src/mess/drivers/multi16.c @@ -17,13 +17,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic(*this, "pic8259"), - m_crtc(*this, "crtc") + m_crtc(*this, "crtc"), + m_palette(*this, "palette") , m_p_vram(*this, "p_vram"){ } required_device<cpu_device> m_maincpu; required_device<pic8259_device> m_pic; required_device<mc6845_device> m_crtc; + required_device<palette_device> m_palette; DECLARE_WRITE8_MEMBER(multi16_6845_address_w); DECLARE_WRITE8_MEMBER(multi16_6845_data_w); DECLARE_WRITE_LINE_MEMBER(multi16_set_int_line); diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index 98ec51e562e..3d0d0f4d8b6 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -27,7 +27,8 @@ public: m_maincpu(*this, "maincpu"), m_fdc(*this, "fdc"), m_crtc(*this, "crtc"), - m_p_vram(*this, "p_vram"){ } + m_p_vram(*this, "p_vram"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<mb8877_device> m_fdc; @@ -37,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(myb3k_video_mode_w); DECLARE_WRITE8_MEMBER(myb3k_fdc_output_w); required_shared_ptr<UINT8> m_p_vram; + required_device<palette_device> m_palette; UINT8 m_crtc_vreg[0x100],m_crtc_index; UINT8 m_vmode; virtual void machine_start(); diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index 0333ab4e6ae..1f09ec7ef6f 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -66,7 +66,8 @@ public: m_io_keyc(*this, "KEYC"), m_io_keyd(*this, "KEYD"), m_io_unused(*this, "UNUSED"), - m_io_config(*this, "CONFIG") { } + m_io_config(*this, "CONFIG"), + m_palette(*this, "palette") { } required_device<cassette_image_device> m_cass; @@ -143,6 +144,7 @@ protected: required_ioport m_io_keyd; required_ioport m_io_unused; required_ioport m_io_config; + required_device<palette_device> m_palette; }; void mz2000_state::video_start() diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index 2519adc3c0b..6801a91c3df 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -70,7 +70,8 @@ public: m_rtc(*this, RP5C15_TAG), m_pit(*this, "pit"), m_beeper(*this, "beeper"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -216,6 +217,7 @@ public: void mz2500_reconfigure_screen(); UINT8 pal_256_param(int index, int param); void mz2500_reset(mz2500_state *state, UINT8 type); + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c index 44e4b5e9b12..17ebde12a1a 100644 --- a/src/mess/drivers/mz3500.c +++ b/src/mess/drivers/mz3500.c @@ -49,7 +49,8 @@ public: m_hgdc2(*this, "upd7220_gfx"), m_fdc(*this, "upd765a"), m_video_ram(*this, "video_ram"), - m_beeper(*this, "beeper") + m_beeper(*this, "beeper"), + m_palette(*this, "palette") { } // devices @@ -60,6 +61,7 @@ public: required_device<upd765a_device> m_fdc; required_shared_ptr<UINT8> m_video_ram; required_device<beep_device> m_beeper; + required_device<palette_device> m_palette; UINT8 *m_ipl_rom; UINT8 *m_basic_rom; diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c index 43419bb255d..ec1546cb3f2 100644 --- a/src/mess/drivers/paso1600.c +++ b/src/mess/drivers/paso1600.c @@ -26,7 +26,8 @@ public: m_crtc(*this, "crtc"), m_p_vram(*this, "vram"), m_p_gvram(*this, "gvram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<pic8259_device> m_pic; @@ -49,7 +50,7 @@ public: required_shared_ptr<UINT16> m_p_vram; required_shared_ptr<UINT16> m_p_gvram; required_device<gfxdecode_device> m_gfxdecode; - + required_device<palette_device> m_palette; struct{ UINT8 portb; }m_keyb; diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index 23ce3d4dae1..78fc2b5a9d2 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -44,7 +44,8 @@ public: m_fdc(*this, "fdc"), m_floppy(*this, "fdc:0:525hd"), m_sn1(*this, "sn1"), - m_sn2(*this, "sn2") + m_sn2(*this, "sn2"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -58,6 +59,8 @@ public: required_device<floppy_image_device> m_floppy; required_device<sn76489a_device> m_sn1; required_device<sn76489a_device> m_sn2; + required_device<palette_device> m_palette; + DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); DECLARE_WRITE8_MEMBER(pasopia7_memory_ctrl_w); diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c index e66545ef6ec..196b42521d0 100644 --- a/src/mess/drivers/pc100.c +++ b/src/mess/drivers/pc100.c @@ -72,7 +72,8 @@ public: m_palram(*this, "palram"), m_maincpu(*this, "maincpu"), m_beeper(*this, "beeper"), - m_rtc_portc(0) + m_rtc_portc(0), + m_palette(*this, "palette") { } @@ -132,6 +133,7 @@ public: WRITE_LINE_MEMBER(rtc_portc_2_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 2)) | ((state & 1) << 2); } WRITE_LINE_MEMBER(rtc_portc_3_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 3)) | ((state & 1) << 3); } UINT8 m_rtc_portc; + required_device<palette_device> m_palette; }; void pc100_state::video_start() diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c index b318707d3b2..6e44fd126d5 100644 --- a/src/mess/drivers/pc6001.c +++ b/src/mess/drivers/pc6001.c @@ -165,7 +165,8 @@ public: m_bank5(*this, "bank5"), m_bank6(*this, "bank6"), m_bank7(*this, "bank7"), - m_bank8(*this, "bank8") { } + m_bank8(*this, "bank8"), + m_palette(*this, "palette") { } required_device<i8255_device> m_ppi; @@ -289,6 +290,7 @@ protected: optional_memory_bank m_bank6; optional_memory_bank m_bank7; optional_memory_bank m_bank8; + required_device<palette_device> m_palette; void draw_gfx_mode4(bitmap_ind16 &bitmap,const rectangle &cliprect,int attr); void draw_bitmap_2bpp(bitmap_ind16 &bitmap,const rectangle &cliprect, int attr); diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index 664109e2829..91c5380f5c4 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -309,7 +309,8 @@ public: m_cassette(*this, "cassette"), m_beeper(*this, "beeper"), m_opna(*this, "opna"), - m_opn(*this, "opn") + m_opn(*this, "opn"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -320,6 +321,8 @@ public: required_device<beep_device> m_beeper; required_device<ym2608_device> m_opna; required_device<ym2203_device> m_opn; + required_device<palette_device> m_palette; + UINT8 *m_work_ram; UINT8 *m_hi_work_ram; UINT8 *m_ext_work_ram; diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index b713e444d85..2572440abe8 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -74,7 +74,8 @@ public: m_fdc(*this, "upd765"), m_dmac(*this, "dmac"), m_palram(*this, "palram"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<upd765a_device> m_fdc; @@ -183,6 +184,7 @@ public: protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index adcf61d67e5..64a60cd68ee 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -451,7 +451,8 @@ public: m_video_ram_2(*this, "video_ram_2"), m_beeper(*this, "beeper"), m_ram(*this, RAM_TAG), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -473,6 +474,8 @@ public: required_shared_ptr<UINT8> m_video_ram_2; required_device<beep_device> m_beeper; optional_device<ram_device> m_ram; + required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; virtual void video_start(); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -753,7 +756,6 @@ public: DECLARE_DRIVER_INIT(pc9801_kanji); IRQ_CALLBACK_MEMBER(irq_callback); inline void set_dma_channel(int channel, int state); - required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index 36252a2f146..76bb47c619a 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -144,7 +144,9 @@ public: m_maincpu(*this, "maincpu"), m_sound(*this, "pv1000_sound"), m_p_videoram(*this, "p_videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } DECLARE_WRITE8_MEMBER(pv1000_io_w); @@ -174,6 +176,8 @@ public: TIMER_CALLBACK_MEMBER(d65010_irq_off_cb); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( pv1000_cart ); required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index c5525ace07a..449520da713 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -69,7 +69,8 @@ public: m_kbd(*this, "kbd"), m_vram_bank(0), m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG) + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } @@ -147,6 +148,7 @@ public: IRQ_CALLBACK_MEMBER(irq_callback); required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; }; static UPD7220_DISPLAY_PIXELS( hgdc_display_pixels ) diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c index 92d04dd10ec..496feb1cf59 100644 --- a/src/mess/drivers/rx78.c +++ b/src/mess/drivers/rx78.c @@ -56,7 +56,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), - m_ram(*this, RAM_TAG) + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } DECLARE_READ8_MEMBER( key_r ); @@ -82,6 +83,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; DECLARE_DEVICE_IMAGE_LOAD_MEMBER( rx78_cart ); }; diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index b8cd1304633..a9b4990a847 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -56,7 +56,8 @@ public: m_fdc(*this, "fdc"), m_sn(*this, "sn1"), m_beeper(*this, "beeper"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -127,6 +128,7 @@ public: DECLARE_WRITE_LINE_MEMBER(smc777_fdc_drq_w); void check_floppy_inserted(); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c index b7d9a060cee..cc24bef9423 100644 --- a/src/mess/drivers/socrates.c +++ b/src/mess/drivers/socrates.c @@ -121,11 +121,13 @@ public: socrates_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_sound(*this, "soc_snd") + m_sound(*this, "soc_snd"), + m_screen(*this, "screen") { } required_device<cpu_device> m_maincpu; required_device<socrates_snd_device> m_sound; - + required_device<screen_device> m_screen; + rgb_t m_palette_val[256]; UINT8 m_data[8]; diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index 7025e0cee46..0f40a073f67 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -120,7 +120,8 @@ public: m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_soundram(*this, "soundram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { m_m6502_reset = 0; } @@ -227,6 +228,7 @@ public: void mark_active_tilemap_all_dirty(int layer); void supracan_suprnova_draw_roz(bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound/*, int columnscroll, UINT32* scrollram*/, int transmask); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c index c3bac2da158..0d4efc4a693 100644 --- a/src/mess/drivers/ti99_2.c +++ b/src/mess/drivers/ti99_2.c @@ -89,7 +89,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_videoram; int m_ROM_paged; @@ -106,6 +107,7 @@ public: INTERRUPT_GEN_MEMBER(ti99_2_vblank_interrupt); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/tim100.c b/src/mess/drivers/tim100.c index da5a635c622..47d19cdc2f8 100644 --- a/src/mess/drivers/tim100.c +++ b/src/mess/drivers/tim100.c @@ -17,10 +17,12 @@ class tim100_state : public driver_device public: tim100_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_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; virtual void machine_reset(); }; diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c index e3286b2915e..20310b72232 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -37,7 +37,8 @@ public: m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_ppi(*this, "ppi"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -53,6 +54,7 @@ private: required_device<cpu_device> m_maincpu; required_device<i8255_device> m_ppi; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c index 2379174c904..8684caca2ea 100644 --- a/src/mess/drivers/vboy.c +++ b/src/mess/drivers/vboy.c @@ -105,7 +105,8 @@ public: vboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maintimer(*this, "timer_main"), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu"), + m_palette(*this, "palette") { m_vip_regs.INTPND = 0; m_vip_regs.INTENB = 0; @@ -152,6 +153,7 @@ public: required_device<timer_device> m_maintimer; required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; DECLARE_READ32_MEMBER(io_r); DECLARE_WRITE32_MEMBER(io_w); diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index 52bee796881..8746ce1912c 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -156,13 +156,14 @@ class z100_state : public driver_device public: z100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_pia0(*this, "pia0"), - m_pia1(*this, "pia1"), - m_picm(*this, "pic8259_master"), - m_pics(*this, "pic8259_slave"), - m_fdc(*this, "z207_fdc"), - m_crtc(*this, "crtc") + m_maincpu(*this, "maincpu"), + m_pia0(*this, "pia0"), + m_pia1(*this, "pia1"), + m_picm(*this, "pic8259_master"), + m_pics(*this, "pic8259_slave"), + m_fdc(*this, "z207_fdc"), + m_crtc(*this, "crtc"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -172,6 +173,8 @@ public: required_device<pic8259_device> m_pics; required_device<fd1797_device> m_fdc; required_device<mc6845_device> m_crtc; + required_device<palette_device> m_palette; + DECLARE_READ8_MEMBER(z100_vram_r); DECLARE_WRITE8_MEMBER(z100_vram_w); DECLARE_READ8_MEMBER(keyb_data_r); diff --git a/src/mess/includes/a7800.h b/src/mess/includes/a7800.h index 10c6e648c98..c08e895f4fa 100644 --- a/src/mess/includes/a7800.h +++ b/src/mess/includes/a7800.h @@ -34,7 +34,8 @@ public: m_io_vblank(*this, "vblank"), m_io_console_buttons(*this, "console_buttons"), m_bank10(NULL), - m_bank11(NULL) { } + m_bank11(NULL), + m_screen(*this, "screen") { } int m_lines; int m_ispal; @@ -113,6 +114,7 @@ protected: required_ioport m_io_console_buttons; memory_bank *m_bank10; memory_bank *m_bank11; + required_device<screen_device> m_screen; void maria_draw_scanline(); int is_holey(unsigned int addr); diff --git a/src/mess/includes/ac1.h b/src/mess/includes/ac1.h index 06ccd0d702f..714287377a6 100644 --- a/src/mess/includes/ac1.h +++ b/src/mess/includes/ac1.h @@ -17,7 +17,8 @@ public: : driver_device(mconfig, type, tag), m_cassette(*this, "cassette"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cassette_image_device> m_cassette; DECLARE_DRIVER_INIT(ac1); @@ -31,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(ac1_port_b_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/includes/advision.h b/src/mess/includes/advision.h index e8a8833aadf..eed7605f69c 100644 --- a/src/mess/includes/advision.h +++ b/src/mess/includes/advision.h @@ -20,12 +20,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, I8048_TAG), m_soundcpu(*this, COP411_TAG), - m_dac(*this, "dac") + m_dac(*this, "dac"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<dac_device> m_dac; + required_device<palette_device> m_palette; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index 443c7f97e05..d64e61d49ac 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -151,7 +151,9 @@ public: m_io_analog1(*this, "analog1"), m_io_analog2(*this, "analog2"), m_io_analog3(*this, "analog3"), - m_io_analog4(*this, "analog4") { } + m_io_analog4(*this, "analog4"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<z80_device> m_maincpu; required_device<ay8910_device> m_ay; @@ -286,7 +288,9 @@ protected: optional_ioport m_io_analog2; optional_ioport m_io_analog3; optional_ioport m_io_analog4; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + void amstrad_init_lookups(); void amstrad_vh_update_mode(); void amstrad_plus_dma_parse(int channel); diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h index dac1eaa8988..63e2ae0bf11 100644 --- a/src/mess/includes/apple2gs.h +++ b/src/mess/includes/apple2gs.h @@ -98,7 +98,8 @@ public: m_adbmicro(*this, ADBMICRO_TAG), #endif m_adb_mousex(*this, "adb_mouse_x"), - m_adb_mousey(*this, "adb_mouse_y") + m_adb_mousey(*this, "adb_mouse_y"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -109,6 +110,7 @@ public: #endif required_ioport m_adb_mousex, m_adb_mousey; + required_device<palette_device> m_palette; UINT8 *m_slowmem; UINT8 m_newvideo; diff --git a/src/mess/includes/apple3.h b/src/mess/includes/apple3.h index 925beca8d7e..691e63ecf95 100644 --- a/src/mess/includes/apple3.h +++ b/src/mess/includes/apple3.h @@ -49,7 +49,8 @@ public: m_rtc(*this, "rtc"), m_speaker(*this, SPEAKER_TAG), m_dac(*this, DAC_TAG), - m_kbspecial(*this, "keyb_special") + m_kbspecial(*this, "keyb_special"), + m_palette(*this, "palette") { } @@ -65,6 +66,7 @@ public: required_device<speaker_sound_device> m_speaker; required_device<dac_device> m_dac; required_ioport m_kbspecial; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(apple3_memory_r); DECLARE_WRITE8_MEMBER(apple3_memory_w); diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h index 26d7c5711c5..eb7ebaca06c 100644 --- a/src/mess/includes/apricotf.h +++ b/src/mess/includes/apricotf.h @@ -54,7 +54,8 @@ public: m_ctc_int(CLEAR_LINE), m_sio_int(CLEAR_LINE), m_p_scrollram(*this, "p_scrollram"), - m_p_paletteram(*this, "p_paletteram") + m_p_paletteram(*this, "p_paletteram"), + m_palette(*this, "palette") { } virtual void machine_start(); @@ -71,6 +72,7 @@ public: int m_sio_int; required_shared_ptr<UINT16> m_p_scrollram; required_shared_ptr<UINT16> m_p_paletteram; + required_device<palette_device> m_palette; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h index d179aa1c3df..685e5c424da 100644 --- a/src/mess/includes/aquarius.h +++ b/src/mess/includes/aquarius.h @@ -35,7 +35,9 @@ public: m_y5(*this, "Y5"), m_y6(*this, "Y6"), m_y7(*this, "Y7"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -54,6 +56,8 @@ public: required_ioport m_y6; required_ioport m_y7; required_device<gfxdecode_device> m_gfxdecode; + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; UINT8 m_scrambler; tilemap_t *m_tilemap; diff --git a/src/mess/includes/arcadia.h b/src/mess/includes/arcadia.h index d1497b0d763..3e45c049b63 100644 --- a/src/mess/includes/arcadia.h +++ b/src/mess/includes/arcadia.h @@ -40,7 +40,8 @@ public: m_controller2_extra(*this, "controller2_extra"), m_joysticks(*this, "joysticks") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } DECLARE_READ8_MEMBER(arcadia_vsync_r); DECLARE_READ8_MEMBER(arcadia_video_r); @@ -115,5 +116,6 @@ protected: void arcadia_draw_sprites(); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #endif /* ARCADIA_H_ */ diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index 1a2dcfcaaa2..cecaeae8ad6 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -117,7 +117,8 @@ public: m_ikbd_mouse_py(IKBD_MOUSE_PHASE_STATIC), m_ikbd_mouse_pc(0), m_ikbd_joy(1), - m_monochrome(1) + m_monochrome(1), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -328,6 +329,7 @@ public: IRQ_CALLBACK_MEMBER(atarist_int_ack); int m_monochrome; + required_device<palette_device> m_palette; virtual DECLARE_WRITE_LINE_MEMBER( write_monochrome ); protected: diff --git a/src/mess/includes/avigo.h b/src/mess/includes/avigo.h index de7e5a78205..4099a72bdfe 100644 --- a/src/mess/includes/avigo.h +++ b/src/mess/includes/avigo.h @@ -35,7 +35,8 @@ public: m_ram(*this, RAM_TAG), m_speaker(*this, "speaker"), m_uart(*this, "ns16550"), - m_serport(*this, "serport") + m_serport(*this, "serport"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -43,6 +44,7 @@ public: required_device<speaker_sound_device> m_speaker; required_device<ns16550_device> m_uart; required_device<rs232_port_device> m_serport; + required_device<palette_device> m_palette; // defined in drivers/avigo.c virtual void machine_start(); diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h index 3e94c6341b1..40f18be5533 100644 --- a/src/mess/includes/b2m.h +++ b/src/mess/includes/b2m.h @@ -23,7 +23,8 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_pit(*this, "pit8253"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } UINT8 m_b2m_8255_porta; UINT8 m_b2m_video_scroll; @@ -43,7 +44,8 @@ public: required_device<speaker_sound_device> m_speaker; required_device<pit8253_device> m_pit; required_device<ram_device> m_ram; - + required_device<palette_device> m_palette; + /* devices */ fd1793_t *m_fdc; pic8259_device *m_pic; diff --git a/src/mess/includes/busicom.h b/src/mess/includes/busicom.h index b7eb0a8c945..f182c044554 100644 --- a/src/mess/includes/busicom.h +++ b/src/mess/includes/busicom.h @@ -14,7 +14,8 @@ class busicom_state : public driver_device public: busicom_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_palette(*this, "palette") { } UINT8 m_drum_index; UINT16 m_keyboard_shifter; @@ -35,6 +36,7 @@ public: UINT32 screen_update_busicom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); required_device<i4004_cpu_device> m_maincpu; + required_device<palette_device> m_palette; UINT8 get_bit_selected(UINT32 val,int num); }; diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h index a6a96beeb91..bd5eb283aeb 100644 --- a/src/mess/includes/cgenie.h +++ b/src/mess/includes/cgenie.h @@ -48,7 +48,8 @@ public: m_cassette(*this, "cassette"), m_ram(*this, RAM_TAG), m_ay8910(*this, "ay8910"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } @@ -92,6 +93,7 @@ public: required_device<ram_device> m_ram; required_device<ay8910_device> m_ay8910; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; void cgenie_offset_xy(); int cgenie_get_register(int indx); diff --git a/src/mess/includes/dai.h b/src/mess/includes/dai.h index 26db8bb5dc8..ddf7e1536ac 100644 --- a/src/mess/includes/dai.h +++ b/src/mess/includes/dai.h @@ -64,7 +64,8 @@ public: m_tms5501(*this, "tms5501"), m_sound(*this, "custom"), m_cassette(*this, "cassette"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<pit8253_device> m_pit; @@ -72,6 +73,7 @@ public: required_device<dai_sound_device> m_sound; required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; UINT8 m_paddle_select; UINT8 m_paddle_enable; diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h index c43a65a790d..a68e5691e7a 100644 --- a/src/mess/includes/einstein.h +++ b/src/mess/includes/einstein.h @@ -77,7 +77,8 @@ public: m_extra(*this, "EXTRA"), m_buttons(*this, "BUTTONS"), m_config(*this, "config"), - m_80column_dips(*this, "80column_dips") { } + m_80column_dips(*this, "80column_dips"), + m_palette(*this, "palette") { } required_device<wd1770_t> m_fdc; required_device<screen_device> m_color_screen; @@ -150,6 +151,7 @@ protected: required_ioport m_buttons; required_ioport m_config; optional_ioport m_80column_dips; + optional_device<palette_device> m_palette; void einstein_scan_keyboard(); void einstein_page_rom(); diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h index 72a7ebc98c6..f26279e1f03 100644 --- a/src/mess/includes/fm7.h +++ b/src/mess/includes/fm7.h @@ -138,7 +138,8 @@ public: m_keymod(*this, "key_modifiers"), m_joy1(*this, "joy1"), m_joy2(*this, "joy2"), - m_dsw(*this, "DSW") + m_dsw(*this, "DSW"), + m_palette(*this, "palette") { } @@ -336,6 +337,7 @@ public: required_ioport m_joy1; required_ioport m_joy2; required_ioport m_dsw; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/includes/galeb.h b/src/mess/includes/galeb.h index 674e6c47a6e..900f7610f5a 100644 --- a/src/mess/includes/galeb.h +++ b/src/mess/includes/galeb.h @@ -15,7 +15,8 @@ public: : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_shared_ptr<UINT8> m_video_ram; DECLARE_READ8_MEMBER(galeb_keyboard_r); @@ -23,6 +24,7 @@ public: UINT32 screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in video/galeb.c -----------*/ diff --git a/src/mess/includes/gp32.h b/src/mess/includes/gp32.h index ee0e0cf1195..aa71afce168 100644 --- a/src/mess/includes/gp32.h +++ b/src/mess/includes/gp32.h @@ -99,7 +99,8 @@ public: m_dac2(*this, "dac2"), m_nvram(*this, "nvram"), m_io_in0(*this, "IN0"), - m_io_in1(*this, "IN1") { } + m_io_in1(*this, "IN1"), + m_palette(*this, "palette") { } virtual void video_start(); @@ -189,6 +190,7 @@ protected: required_device<nvram_device> m_nvram; required_ioport m_io_in0; required_ioport m_io_in1; + required_device<palette_device> m_palette; UINT32 s3c240x_get_fclk(int reg); UINT32 s3c240x_get_hclk(int reg); diff --git a/src/mess/includes/hec2hrp.h b/src/mess/includes/hec2hrp.h index 25df2fb9e29..521a3debd71 100644 --- a/src/mess/includes/hec2hrp.h +++ b/src/mess/includes/hec2hrp.h @@ -79,7 +79,8 @@ public: m_maincpu(*this, "maincpu"), m_disc2cpu(*this, "disc2cpu"), m_cassette(*this, "cassette"), - m_sn(*this, "sn76477") { } + m_sn(*this, "sn76477"), + m_palette(*this, "palette") { } optional_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_hector_videoram; @@ -151,6 +152,7 @@ public: optional_device<cpu_device> m_disc2cpu; required_device<cassette_image_device> m_cassette; required_device<sn76477_device> m_sn; + required_device<palette_device> m_palette; int isHectorWithDisc2(); int isHectorWithMiniDisc(); int isHectorHR(); diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h index 10b9c8106f3..109b86b8a32 100644 --- a/src/mess/includes/hp48.h +++ b/src/mess/includes/hp48.h @@ -46,7 +46,8 @@ public: hp48_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + m_dac(*this, "dac"), + m_palette(*this, "palette") { } UINT8 *m_videoram; UINT8 m_io[64]; @@ -90,6 +91,7 @@ public: void hp48_apply_modules(); required_device<cpu_device> m_maincpu; required_device<dac_device> m_dac; + required_device<palette_device> m_palette; void hp48_pulse_irq( int irq_line); void hp48_rs232_start_recv_byte( UINT8 data ); void hp48_rs232_send_byte( ); diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h index 70ed7a37f4a..bb8800cd9a4 100644 --- a/src/mess/includes/intv.h +++ b/src/mess/includes/intv.h @@ -41,7 +41,8 @@ public: m_io_options(*this, "OPTIONS"), m_io_ecs_cntrlsel(*this, "ECS_CNTRLSEL"), m_io_test(*this, "TEST"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<sp0256_device> m_intellivoice; @@ -143,6 +144,7 @@ protected: optional_ioport m_io_test; optional_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; ioport_port *m_keypad[4]; ioport_port *m_disc[4]; diff --git a/src/mess/includes/kramermc.h b/src/mess/includes/kramermc.h index d058d3707f8..abde8e8a8a1 100644 --- a/src/mess/includes/kramermc.h +++ b/src/mess/includes/kramermc.h @@ -15,7 +15,8 @@ public: kramermc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_key_row; DECLARE_DRIVER_INIT(kramermc); @@ -27,6 +28,7 @@ public: DECLARE_WRITE8_MEMBER(kramermc_port_a_w); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h index d6fda7bb2ec..96899ba3279 100644 --- a/src/mess/includes/lisa.h +++ b/src/mess/includes/lisa.h @@ -117,7 +117,8 @@ public: m_io_line6(*this, "LINE6"), m_io_line7(*this, "LINE7"), m_io_mouse_x(*this, "MOUSE_X"), - m_io_mouse_y(*this, "MOUSE_Y") + m_io_mouse_y(*this, "MOUSE_Y"), + m_palette(*this, "palette") { } required_device<m68000_base_device> m_maincpu; @@ -140,6 +141,8 @@ public: required_ioport m_io_line7; required_ioport m_io_mouse_x; required_ioport m_io_mouse_y; + + required_device<palette_device> m_palette; UINT8 *m_ram_ptr; UINT8 *m_rom_ptr; diff --git a/src/mess/includes/lviv.h b/src/mess/includes/lviv.h index 447c3b7e6f7..fe68871f799 100644 --- a/src/mess/includes/lviv.h +++ b/src/mess/includes/lviv.h @@ -21,7 +21,8 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_cassette(*this, "cassette"), - m_ram(*this, RAM_TAG) { } + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } unsigned char * m_video_ram; unsigned short m_colortable[1][4]; @@ -49,6 +50,7 @@ public: required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; void lviv_update_palette(UINT8 pal); void lviv_update_memory (); void lviv_setup_snapshot (UINT8 * data); diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h index 1dd4d377487..56d2738be28 100644 --- a/src/mess/includes/lynx.h +++ b/src/mess/includes/lynx.h @@ -111,7 +111,8 @@ public: m_mem_fe00(*this, "mem_fe00"), m_mem_fffa(*this, "mem_fffa"), m_maincpu(*this, "maincpu"), - m_sound(*this, "custom") { } + m_sound(*this, "custom"), + m_palette(*this, "palette") { } virtual void video_start(); @@ -124,7 +125,7 @@ public: required_shared_ptr<UINT8> m_mem_fffa; required_device<cpu_device> m_maincpu; required_device<lynx_sound_device> m_sound; - + required_device<palette_device> m_palette; UINT16 m_granularity; int m_sign_AB; int m_sign_CD; diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h index 0e23397be00..c6aae19eeba 100644 --- a/src/mess/includes/mac.h +++ b/src/mess/includes/mac.h @@ -216,7 +216,9 @@ public: m_montype(*this, "MONTYPE"), m_vram(*this,"vram"), m_vram16(*this,"vram16"), - m_via2_ca1_hack(0) + m_via2_ca1_hack(0), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } @@ -445,7 +447,8 @@ private: UINT64 m_hmc_reg, m_hmc_shiftout; int m_via2_ca1_hack; - + optional_device<screen_device> m_screen; + optional_device<palette_device> m_palette; public: emu_timer *m_scanline_timer; emu_timer *m_adb_timer; diff --git a/src/mess/includes/mz700.h b/src/mess/includes/mz700.h index b89571eb870..1949d9a7cce 100644 --- a/src/mess/includes/mz700.h +++ b/src/mess/includes/mz700.h @@ -31,7 +31,8 @@ public: m_cassette(*this, "cassette"), m_centronics(*this, "centronics"), m_ram(*this, RAM_TAG), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } int m_mz700; /* 1 if running on an mz700 */ @@ -112,6 +113,7 @@ public: optional_device<centronics_device> m_centronics; required_device<ram_device> m_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index 8440837aa46..9b5d80066bb 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -40,7 +40,8 @@ public: m_cassette(*this, "cassette"), m_ram(*this, RAM_TAG), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -73,6 +74,7 @@ public: DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette ); DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 ); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h index 9ed8463b60c..3c8e13c9985 100644 --- a/src/mess/includes/p2000t.h +++ b/src/mess/includes/p2000t.h @@ -21,7 +21,8 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_videoram(*this, "videoram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -47,6 +48,7 @@ public: UINT32 screen_update_p2000m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(p2000_interrupt); optional_device<gfxdecode_device> m_gfxdecode; + optional_device<palette_device> m_palette; }; #endif /* P2000T_H_ */ diff --git a/src/mess/includes/pc1251.h b/src/mess/includes/pc1251.h index 687384cbd2a..98b40714732 100644 --- a/src/mess/includes/pc1251.h +++ b/src/mess/includes/pc1251.h @@ -26,7 +26,8 @@ public: pc1251_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_outa; UINT8 m_outb; @@ -49,6 +50,7 @@ public: DECLARE_MACHINE_START(pc1260); required_device<sc61860_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h index dff36c09a10..5950a3e3438 100644 --- a/src/mess/includes/pc1401.h +++ b/src/mess/includes/pc1401.h @@ -26,7 +26,8 @@ public: pc1401_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_portc; UINT8 m_outa; @@ -48,6 +49,7 @@ public: virtual void machine_start(); required_device<sc61860_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h index 9fb2a73d3e7..46fbf35af9b 100644 --- a/src/mess/includes/pc1403.h +++ b/src/mess/includes/pc1403.h @@ -26,7 +26,8 @@ public: pc1403_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 m_portc; UINT8 m_outa; @@ -52,6 +53,7 @@ public: virtual void machine_start(); required_device<sc61860_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h index 76f279d4160..3edce4378de 100644 --- a/src/mess/includes/pcw.h +++ b/src/mess/includes/pcw.h @@ -31,7 +31,9 @@ public: m_maincpu(*this, "maincpu"), m_fdc(*this, "upd765"), m_ram(*this, RAM_TAG), - m_beeper(*this, "beeper") + m_beeper(*this, "beeper"), + m_screen(*this, "screen"), + m_palette(*this, "palette") { } int m_boot; @@ -120,7 +122,9 @@ public: required_device<upd765a_device> m_fdc; required_device<ram_device> m_ram; required_device<beep_device> m_beeper; - + required_device<screen_device> m_screen; + required_device<palette_device> m_palette; + inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color); void pcw_update_interrupt_counter(); void pcw_update_irqs(); diff --git a/src/mess/includes/pdp1.h b/src/mess/includes/pdp1.h index f1503600646..0607de727bd 100644 --- a/src/mess/includes/pdp1.h +++ b/src/mess/includes/pdp1.h @@ -236,7 +236,8 @@ public: pdp1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } pdp1_reset_param_t m_reset_param; int m_io_status; @@ -300,5 +301,6 @@ public: void pdp1_keyboard(); void pdp1_lightpen(); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; #endif /* PDP1_H_ */ diff --git a/src/mess/includes/pk8020.h b/src/mess/includes/pk8020.h index 332d4e5e941..9a9c63960ee 100644 --- a/src/mess/includes/pk8020.h +++ b/src/mess/includes/pk8020.h @@ -34,7 +34,8 @@ public: m_pic8259(*this, "pic8259"), m_speaker(*this, "speaker"), m_region_maincpu(*this, "maincpu"), - m_region_gfx1(*this, "gfx1") { } + m_region_gfx1(*this, "gfx1"), + m_palette(*this, "palette") { } UINT8 m_color; UINT8 m_video_page; @@ -87,7 +88,7 @@ protected: required_memory_region m_region_maincpu; required_memory_region m_region_gfx1; ioport_port *m_io_port[16]; - + required_device<palette_device> m_palette; void pk8020_set_bank(UINT8 data); }; diff --git a/src/mess/includes/pmd85.h b/src/mess/includes/pmd85.h index 02fb5b749af..4fa6830b96b 100644 --- a/src/mess/includes/pmd85.h +++ b/src/mess/includes/pmd85.h @@ -50,7 +50,8 @@ public: m_bank14(*this, "bank14"), m_bank15(*this, "bank15"), m_bank16(*this, "bank16"), - m_io_dsw0(*this, "DSW0") { } + m_io_dsw0(*this, "DSW0"), + m_palette(*this, "palette") { } UINT8 m_rom_module_present; UINT8 m_ppi_port_outputs[4][3]; @@ -136,6 +137,7 @@ protected: optional_memory_bank m_bank16; optional_ioport m_io_dsw0; ioport_port *m_io_port[16]; + required_device<palette_device> m_palette; void pmd851_update_memory(); void pmd852a_update_memory(); diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h index aea2488cba3..850ab4a260d 100644 --- a/src/mess/includes/rmnimbus.h +++ b/src/mess/includes/rmnimbus.h @@ -399,7 +399,8 @@ public: m_ram(*this, RAM_TAG), m_eeprom(*this, ER59256_TAG), m_via(*this, VIA_TAG), - m_centronics(*this, CENTRONICS_TAG) + m_centronics(*this, CENTRONICS_TAG), + m_palette(*this, "palette") { } @@ -411,6 +412,7 @@ public: required_device<er59256_device> m_eeprom; required_device<via6522_device> m_via; required_device<centronics_device> m_centronics; + required_device<palette_device> m_palette; UINT32 m_debug_machine; // i186_state m_i186; diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h index 5d05b597433..5d6c7fa167b 100644 --- a/src/mess/includes/special.h +++ b/src/mess/includes/special.h @@ -61,7 +61,8 @@ public: m_io_line9(*this, "LINE9"), m_io_line10(*this, "LINE10"), m_io_line11(*this, "LINE11"), - m_io_line12(*this, "LINE12") { } + m_io_line12(*this, "LINE12"), + m_palette(*this, "palette") { } DECLARE_WRITE8_MEMBER(specimx_select_bank); DECLARE_WRITE8_MEMBER(video_memory_w); @@ -148,6 +149,7 @@ protected: required_ioport m_io_line11; required_ioport m_io_line12; + required_device<palette_device> m_palette; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/ssystem3.h b/src/mess/includes/ssystem3.h index 174e37eba48..f88835d2e26 100644 --- a/src/mess/includes/ssystem3.h +++ b/src/mess/includes/ssystem3.h @@ -39,7 +39,8 @@ class ssystem3_state : public driver_device public: ssystem3_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_palette(*this, "palette") { } UINT8 m_porta; UINT8 *m_videoram; @@ -54,6 +55,7 @@ public: DECLARE_READ8_MEMBER(ssystem3_via_read_b); DECLARE_WRITE8_MEMBER(ssystem3_via_write_b); required_device<cpu_device> m_maincpu; + required_device<palette_device> m_palette; void ssystem3_lcd_reset(); void ssystem3_lcd_write(int clock, int data); void ssystem3_draw_7segment(bitmap_ind16 &bitmap,int value, int x, int y); diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h index b51b258817c..f2e003d6710 100644 --- a/src/mess/includes/studio2.h +++ b/src/mess/includes/studio2.h @@ -34,7 +34,8 @@ public: m_vdc(*this, CDP1861_TAG), m_clear(*this, "CLEAR"), m_a(*this, "A"), - m_b(*this, "B") + m_b(*this, "B"), + m_screen(*this, "screen") { } required_device<cosmac_device> m_maincpu; @@ -43,7 +44,8 @@ public: required_ioport m_clear; required_ioport m_a; required_ioport m_b; - + required_device<screen_device> m_screen; + virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h index ee603d2b61d..09774f43e5b 100644 --- a/src/mess/includes/super80.h +++ b/src/mess/includes/super80.h @@ -41,7 +41,8 @@ public: m_io_x5(*this, "X5"), m_io_x6(*this, "X6"), m_io_x7(*this, "X7"), - m_io_config(*this, "CONFIG") + m_io_config(*this, "CONFIG"), + m_palette(*this, "palette") { } DECLARE_READ8_MEMBER( super80v_low_r ); @@ -114,6 +115,7 @@ public: required_ioport m_io_x6; required_ioport m_io_x7; required_ioport m_io_config; + required_device<palette_device> m_palette; void palette_set_colors_rgb(const UINT8 *colors); void super80_cassette_motor( UINT8 data ); void driver_init_common( ); diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index e7eebd71710..073eeb95734 100644 --- a/src/mess/includes/svi318.h +++ b/src/mess/includes/svi318.h @@ -81,7 +81,8 @@ public: m_line9(*this, "LINE9"), m_line10(*this, "LINE10"), m_joysticks(*this, "JOYSTICKS"), - m_buttons(*this, "BUTTONS") { } + m_buttons(*this, "BUTTONS"), + m_palette(*this, "palette") { } SVI_318 m_svi; UINT8 *m_pcart; @@ -141,6 +142,7 @@ protected: required_ioport m_line10; required_ioport m_joysticks; required_ioport m_buttons; + optional_device<palette_device> m_palette; void svi318_set_banks(); void svi318_80col_init(); diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h index ab936742a72..ef2e000dcf8 100644 --- a/src/mess/includes/svision.h +++ b/src/mess/includes/svision.h @@ -38,7 +38,8 @@ public: m_reg(*this, "reg"), m_videoram(*this, "videoram"), m_joy(*this, "JOY"), - m_joy2(*this, "JOY2") { } + m_joy2(*this, "JOY2"), + m_palette(*this, "palette") { } svision_sound_device *m_sound; int *m_dma_finished; @@ -72,6 +73,7 @@ protected: required_shared_ptr<UINT8> m_videoram; required_ioport m_joy; optional_ioport m_joy2; + required_device<palette_device> m_palette; memory_region *m_user1; memory_bank *m_bank1; diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h index 12d50ee9770..7e036058528 100644 --- a/src/mess/includes/tiki100.h +++ b/src/mess/includes/tiki100.h @@ -66,7 +66,8 @@ public: m_y9(*this, "Y9"), m_y10(*this, "Y10"), m_y11(*this, "Y11"), - m_y12(*this, "Y12") + m_y12(*this, "Y12"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -93,6 +94,7 @@ public: required_ioport m_y10; required_ioport m_y11; required_ioport m_y12; + required_device<palette_device> m_palette; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/tx0.h b/src/mess/includes/tx0.h index dbaa23d50cb..9c526fef33d 100644 --- a/src/mess/includes/tx0.h +++ b/src/mess/includes/tx0.h @@ -133,7 +133,8 @@ public: tx0_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } tape_reader_t m_tape_reader; tape_puncher_t m_tape_puncher; @@ -196,6 +197,7 @@ public: DECLARE_WRITE_LINE_MEMBER(tx0_io_reset_callback); void magtape_callback(); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /* defines for each bit and mask in input port "CSW" */ diff --git a/src/mess/includes/ut88.h b/src/mess/includes/ut88.h index a22900205b2..e9d312f6789 100644 --- a/src/mess/includes/ut88.h +++ b/src/mess/includes/ut88.h @@ -43,7 +43,8 @@ public: m_io_line7(*this, "LINE7"), m_io_line8(*this, "LINE8") , m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cassette_image_device> m_cassette; optional_device<i8255_device> m_ppi; @@ -85,6 +86,7 @@ protected: optional_ioport m_io_line8; required_device<cpu_device> m_maincpu; optional_device<gfxdecode_device> m_gfxdecode; + optional_device<palette_device> m_palette; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/vector06.h b/src/mess/includes/vector06.h index bfd61ca98aa..07d00508a17 100644 --- a/src/mess/includes/vector06.h +++ b/src/mess/includes/vector06.h @@ -30,7 +30,8 @@ public: m_fdc(*this, "wd1793"), m_ppi(*this, "ppi8255"), m_ppi2(*this, "ppi8255_2"), - m_ram(*this, RAM_TAG) + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -39,6 +40,7 @@ public: required_device<i8255_device> m_ppi; required_device<i8255_device> m_ppi2; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; DECLARE_READ8_MEMBER(vector06_8255_portb_r); DECLARE_READ8_MEMBER(vector06_8255_portc_r); DECLARE_WRITE8_MEMBER(vector06_8255_porta_w); diff --git a/src/mess/includes/vtech2.h b/src/mess/includes/vtech2.h index 738d52fa650..253d23cacfb 100644 --- a/src/mess/includes/vtech2.h +++ b/src/mess/includes/vtech2.h @@ -19,7 +19,8 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_cassette(*this, "cassette"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } UINT8 *m_videoram; int m_laser_latch; @@ -83,6 +84,7 @@ public: void laser_put_track(); device_t *laser_file(); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h index 8ce105965c0..cae1c02849d 100644 --- a/src/mess/includes/x1.h +++ b/src/mess/includes/x1.h @@ -80,7 +80,8 @@ public: m_fdc(*this, "fdc"), m_crtc(*this, "crtc"), m_ctc(*this, "ctc"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; @@ -230,6 +231,7 @@ public: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; }; /*----------- defined in machine/x1.c -----------*/ diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h index 4c246bc4381..ef7656474bc 100644 --- a/src/mess/includes/x68k.h +++ b/src/mess/includes/x68k.h @@ -53,7 +53,8 @@ public: m_maincpu(*this, "maincpu"), m_okim6258(*this, "okim6258"), m_ram(*this, RAM_TAG), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette") { } required_device<mc68901_device> m_mfpdev; required_device<rp5c15_device> m_rtc; @@ -312,6 +313,7 @@ public: required_device<okim6258_device> m_okim6258; required_device<ram_device> m_ram; required_device<gfxdecode_device> m_gfxdecode; + required_device<palette_device> m_palette; bitmap_ind16* x68k_get_gfx_page(int pri,int type); attotime prescale(int val); void mfp_trigger_irq(int irq); diff --git a/src/mess/includes/z88.h b/src/mess/includes/z88.h index 833a053ce78..f51cca800f8 100644 --- a/src/mess/includes/z88.h +++ b/src/mess/includes/z88.h @@ -48,11 +48,13 @@ public: z88_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG) + m_ram(*this, RAM_TAG), + m_palette(*this, "palette") { } required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; + required_device<palette_device> m_palette; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/zx.h b/src/mess/includes/zx.h index 56cc53da180..7d58d0632ba 100644 --- a/src/mess/includes/zx.h +++ b/src/mess/includes/zx.h @@ -42,7 +42,8 @@ public: m_io_row5(*this, "ROW5"), m_io_row6(*this, "ROW6"), m_io_row7(*this, "ROW7"), - m_io_config(*this, "CONFIG") { } + m_io_config(*this, "CONFIG"), + m_screen(*this, "screen") { } UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -100,7 +101,8 @@ protected: required_ioport m_io_row6; required_ioport m_io_row7; optional_ioport m_io_config; - + required_device<screen_device> m_screen; + void zx_ula_r(int offs, memory_region *region, const UINT8 param); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; |