From 856a4c71191c4a4e69c2c85f417b7a6e2bfea36c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 23 Apr 2014 13:56:01 +0000 Subject: [PATCH] Moved m_generic_paletteram_* into drivers/device state objects so they are not global anymore (nw) --- src/emu/driver.c | 6 ------ src/emu/driver.h | 10 ---------- src/mame/drivers/backfire.c | 4 +++- src/mame/drivers/cobra.c | 4 +++- src/mame/drivers/cshooter.c | 7 +++++-- src/mame/drivers/cubeqst.c | 4 +++- src/mame/drivers/deco156.c | 4 +++- src/mame/drivers/expro02.c | 4 +++- src/mame/drivers/gal3.c | 4 +++- src/mame/drivers/galpani3.c | 5 +++-- src/mame/drivers/gticlub.c | 4 +++- src/mame/drivers/highvdeo.c | 4 +++- src/mame/drivers/igs011.c | 4 +++- src/mame/drivers/igs017.c | 7 ++++++- src/mame/drivers/igs_m027.c | 4 +++- src/mame/drivers/magic10.c | 4 +++- src/mame/drivers/majorpkr.c | 6 +++++- src/mame/drivers/namcos23.c | 5 +++-- src/mame/drivers/neoprint.c | 4 +++- src/mame/drivers/nwk-tr.c | 4 +++- src/mame/drivers/skylncr.c | 6 +++++- src/mame/drivers/trvmadns.c | 4 +++- src/mame/drivers/vegaeo.c | 6 ++++-- src/mame/drivers/vroulet.c | 4 +++- src/mame/drivers/zr107.c | 4 +++- src/mame/includes/88games.h | 4 +++- src/mame/includes/atarisy2.h | 4 +++- src/mame/includes/balsente.h | 4 +++- src/mame/includes/battlera.h | 4 +++- src/mame/includes/blockhl.h | 4 +++- src/mame/includes/btime.h | 4 +++- src/mame/includes/cbuster.h | 6 +++++- src/mame/includes/centiped.h | 4 +++- src/mame/includes/chqflag.h | 5 ++++- src/mame/includes/darkseal.h | 6 +++++- src/mame/includes/dec0.h | 6 +++++- src/mame/includes/deco32.h | 4 +++- src/mame/includes/deco_mlc.h | 4 +++- src/mame/includes/djmain.h | 4 +++- src/mame/includes/dynduke.h | 4 +++- src/mame/includes/gaelco2.h | 4 +++- src/mame/includes/gaelco3d.h | 6 +++++- src/mame/includes/galaxian.h | 4 +++- src/mame/includes/galpanic.h | 4 +++- src/mame/includes/gladiatr.h | 4 +++- src/mame/includes/gottlieb.h | 4 +++- src/mame/includes/groundfx.h | 4 +++- src/mame/includes/gunbustr.h | 4 +++- src/mame/includes/hng64.h | 4 +++- src/mame/includes/iqblock.h | 7 ++++++- src/mame/includes/itech32.h | 6 +++++- src/mame/includes/konamigx.h | 4 +++- src/mame/includes/lordgun.h | 4 +++- src/mame/includes/m72.h | 6 +++++- src/mame/includes/mcr.h | 4 +++- src/mame/includes/mcr68.h | 4 +++- src/mame/includes/micro3d.h | 4 +++- src/mame/includes/midtunit.h | 5 ++++- src/mame/includes/midvunit.h | 4 +++- src/mame/includes/midyunit.h | 4 +++- src/mame/includes/namcofl.h | 4 +++- src/mame/includes/namconb1.h | 4 +++- src/mame/includes/namcos21.h | 4 +++- src/mame/includes/nbmj8991.h | 4 +++- src/mame/includes/playmark.h | 4 +++- src/mame/includes/plygonet.h | 5 ++++- src/mame/includes/quizdna.h | 4 +++- src/mame/includes/segag80r.h | 4 +++- src/mame/includes/segas24.h | 4 +++- src/mame/includes/senjyo.h | 4 +++- src/mame/includes/silkroad.h | 4 +++- src/mame/includes/simpl156.h | 4 +++- src/mame/includes/superchs.h | 4 +++- src/mame/includes/system1.h | 4 +++- src/mame/includes/taito_f3.h | 4 +++- src/mame/includes/tatsumi.h | 4 +++- src/mame/includes/tetrisp2.h | 6 +++++- src/mame/includes/tmnt.h | 4 +++- src/mame/includes/tnzs.h | 4 +++- src/mame/includes/tunhunt.h | 4 +++- src/mame/includes/twin16.h | 4 +++- src/mame/includes/undrfire.h | 4 +++- src/mame/includes/unico.h | 6 +++++- src/mame/includes/vaportra.h | 6 +++++- src/mame/includes/vigilant.h | 4 +++- src/mame/includes/wecleman.h | 4 +++- src/mame/includes/williams.h | 4 +++- src/mame/machine/atarigen.c | 4 +++- src/mame/machine/atarigen.h | 2 ++ src/mame/video/decocomn.c | 25 ++++++++++--------------- src/mame/video/decocomn.h | 1 + src/mame/video/k054338.c | 5 +++-- src/mame/video/k054338.h | 1 + 93 files changed, 309 insertions(+), 123 deletions(-) diff --git a/src/emu/driver.c b/src/emu/driver.c index 81af29444b1..901f4587cc3 100644 --- a/src/emu/driver.c +++ b/src/emu/driver.c @@ -34,12 +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_generic_paletteram_8(*this, "paletteram"), - m_generic_paletteram2_8(*this, "paletteram2"), - m_generic_paletteram_16(*this, "paletteram"), - m_generic_paletteram2_16(*this, "paletteram2"), - m_generic_paletteram_32(*this, "paletteram"), - m_generic_paletteram2_32(*this, "paletteram2"), m_space_config("generic", ENDIANNESS_LITTLE, 8, 32, 0, NULL, *ADDRESS_MAP_NAME(generic)), m_system(NULL), m_latch_clear_value(0), diff --git a/src/emu/driver.h b/src/emu/driver.h index 17f0dcbeec5..d5a6dc4f694 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -254,16 +254,6 @@ protected: // device_memory_interface overrides virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - -public: - // generic pointers - optional_shared_ptr m_generic_paletteram_8; - optional_shared_ptr m_generic_paletteram2_8; - optional_shared_ptr m_generic_paletteram_16; - optional_shared_ptr m_generic_paletteram2_16; - optional_shared_ptr m_generic_paletteram_32; - optional_shared_ptr m_generic_paletteram2_32; - private: // helpers void irq_pulse_clear(void *ptr, INT32 param); diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 2caab928601..9f5264d828e 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -40,7 +40,8 @@ public: m_io_in1(*this, "IN1"), m_io_in2(*this, "IN2"), m_io_in3(*this, "IN3"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } /* memory pointers */ @@ -104,6 +105,7 @@ public: required_ioport m_io_in2; required_ioport m_io_in3; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); }; diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c index f08e72ef9fa..54b13f603ac 100644 --- a/src/mame/drivers/cobra.c +++ b/src/mame/drivers/cobra.c @@ -612,7 +612,8 @@ public: m_k001604(*this, "k001604"), m_ata(*this, "ata"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } @@ -624,6 +625,7 @@ public: required_device m_ata; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; DECLARE_READ64_MEMBER(main_comram_r); DECLARE_WRITE64_MEMBER(main_comram_w); diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 29e996fb127..10da79c6216 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -101,8 +101,9 @@ public: m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") - { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram"), + m_generic_paletteram2_8(*this, "paletteram2") { } required_device m_maincpu; optional_device m_seibu_sound; @@ -111,6 +112,8 @@ public: optional_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; + required_shared_ptr m_generic_paletteram2_8; tilemap_t *m_txtilemap; int m_coin_stat; diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index 86cfcb3c9af..efa11c23ebf 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -34,7 +34,8 @@ public: m_rotatecpu(*this, "rotate_cpu"), m_linecpu(*this, "line_cpu"), m_soundcpu(*this, "sound_cpu"), - m_screen(*this, "screen") { } + m_screen(*this, "screen"), + m_generic_paletteram_16(*this, "paletteram") { } UINT8 *m_depth_buffer; int m_video_field; @@ -45,6 +46,7 @@ public: required_device m_linecpu; required_device m_soundcpu; required_device m_screen; + required_shared_ptr m_generic_paletteram_16; rgb_t *m_colormap; DECLARE_WRITE16_MEMBER(palette_w); DECLARE_READ16_MEMBER(line_r); diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index f1afc304757..f565a3cd01e 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -33,7 +33,8 @@ public: m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), m_sprgen(*this, "spritegen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } /* devices */ @@ -43,6 +44,7 @@ public: optional_device m_oki2; optional_device m_sprgen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; /* memory */ UINT16 m_pf1_rowscroll[0x800/2]; diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 75cb387731c..58fa648d677 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -165,7 +165,8 @@ public: m_kaneko_spr(*this, "kan_spr"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_galsnew_bg_pixram; optional_shared_ptr m_galsnew_fg_pixram; @@ -187,6 +188,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(expro02_scanline); required_device m_maincpu; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c index a2d3f507ba3..8022b5ba80b 100644 --- a/src/mame/drivers/gal3.c +++ b/src/mame/drivers/gal3.c @@ -139,12 +139,14 @@ class gal3_state : public namcos2_shared_state public: gal3_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag) , - m_rso_shared_ram(*this, "rso_shared_ram"){ } + m_rso_shared_ram(*this, "rso_shared_ram"), + m_generic_paletteram_16(*this, "paletteram") { } UINT32 *m_mpSharedRAM0; //UINT32 *m_mpSharedRAM1; UINT16 m_namcos21_video_enable; required_shared_ptr m_rso_shared_ram; + required_shared_ptr m_generic_paletteram_16; UINT32 m_led_mst; UINT32 m_led_slv; DECLARE_READ32_MEMBER(led_mst_r); diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 37eae2e0521..bf1703276dd 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -82,8 +82,8 @@ public: m_grap2_0(*this,"grap2_0"), m_grap2_1(*this,"grap2_1"), m_grap2_2(*this,"grap2_2"), - m_palette(*this, "palette") - + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_spriteram; @@ -95,6 +95,7 @@ public: required_device m_grap2_1; required_device m_grap2_2; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; UINT16 m_priority_buffer_scrollx; UINT16 m_priority_buffer_scrolly; diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index f3493d388f1..d6156f8d4d0 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -253,7 +253,8 @@ public: m_analog2(*this, "AN2"), m_analog3(*this, "AN3"), m_eeprom(*this, "eeprom"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2400; @@ -268,6 +269,7 @@ public: optional_ioport m_analog0, m_analog1, m_analog2, m_analog3; required_device m_eeprom; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; DECLARE_WRITE32_MEMBER(paletteram32_w); DECLARE_READ32_MEMBER(gticlub_k001604_tile_r); diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 92a399284bc..f2e048074bc 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -112,7 +112,8 @@ public: m_blit_ram(*this, "blit_ram"), m_maincpu(*this, "maincpu"), m_okim6376(*this, "oki"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_blit_ram; UINT16 m_vblank_bit; @@ -156,6 +157,7 @@ public: required_device m_maincpu; required_device m_okim6376; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index 31056aebd6f..c9a4424ce29 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -89,7 +89,8 @@ public: m_vbowl_trackball(*this, "vbowl_trackball"), m_oki(*this, "oki"), m_screen(*this, "screen"), - m_palette(*this, "palette"){ } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_maincpu; required_shared_ptr m_priority_ram; @@ -227,6 +228,7 @@ public: optional_device m_oki; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 33878f03d76..05db3ce13a9 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -66,7 +66,9 @@ public: m_igs022(*this,"igs022"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram"), + m_generic_paletteram_16(*this, "paletteram") { } int m_input_addr; @@ -80,6 +82,9 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; + required_shared_ptr m_generic_paletteram_16; + 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 b480d8ac77c..46865a98748 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -39,7 +39,8 @@ public: m_igs_bg_videoram(*this, "igs_bg_videoram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_igs_mainram; optional_shared_ptr m_igs_cg_videoram; @@ -78,6 +79,7 @@ public: required_device m_maincpu; optional_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 9ebf77ee60c..f593d706db7 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -97,7 +97,8 @@ public: m_vregs(*this, "vregs"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } tilemap_t *m_layer0_tilemap; tilemap_t *m_layer1_tilemap; @@ -129,6 +130,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index d91ba87001d..15ab82d6a19 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -465,7 +465,9 @@ public: oki(*this, "oki") , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram"), + m_generic_paletteram_16(*this, "paletteram") { } int m_mux_data; int m_palette_bank; @@ -500,6 +502,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index cb47292bd7b..a04183a6040 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1375,7 +1375,8 @@ public: m_p1(*this, "P1"), m_p2(*this, "P2"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; @@ -1399,7 +1400,7 @@ public: required_ioport m_p2; required_device m_screen; required_device m_palette; - + required_shared_ptr m_generic_paletteram_32; c404_t m_c404; c361_t m_c361; diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 637e4b913ec..5df9d3eaa04 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -40,7 +40,8 @@ public: m_upd4990a(*this, "upd4990a"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_npvidram; required_shared_ptr m_npvidregs; @@ -50,6 +51,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; UINT8 m_audio_result; UINT8 m_bank_val; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 6aaacb701a3..db460e4d2ff 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -247,7 +247,8 @@ public: m_analog3(*this, "ANALOG3"), m_analog4(*this, "ANALOG4"), m_analog5(*this, "ANALOG5"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2400; @@ -263,6 +264,7 @@ public: required_device m_adc12138; required_ioport m_in0, m_in1, m_in2, m_dsw, m_analog1, m_analog2, m_analog3, m_analog4, m_analog5; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; emu_timer *m_sound_irq_timer; int m_fpga_uploaded; int m_lanc2_ram_r; diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 64982e491f8..4f5ba1340a7 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -113,7 +113,9 @@ public: m_reelscroll4(*this, "reelscroll4"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram"), + m_generic_paletteram2_8(*this, "paletteram2") { } tilemap_t *m_tmap; required_shared_ptr m_videoram; @@ -169,6 +171,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; + required_shared_ptr m_generic_paletteram2_8; }; diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 569d583ddf7..a69e6012faa 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -99,7 +99,8 @@ public: m_tileram(*this, "tileram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } tilemap_t *m_bg_tilemap; required_shared_ptr m_gfxram; @@ -118,6 +119,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index ae92912981e..899d661733b 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -23,9 +23,11 @@ class vegaeo_state : public eolith_state { public: vegaeo_state(const machine_config &mconfig, device_type type, const char *tag) - : eolith_state(mconfig, type, tag) { } + : eolith_state(mconfig, type, tag), + m_generic_paletteram_32(*this, "paletteram") { } - UINT32 *m_vega_vram; + required_shared_ptr m_generic_paletteram_32; + UINT32 *m_vega_vram; UINT8 m_vega_vbuffer; DECLARE_WRITE32_MEMBER(vega_vram_w); DECLARE_READ32_MEMBER(vega_vram_r); diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 1c16bd66d0c..0c1d2e89b43 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -51,7 +51,8 @@ public: m_ball(*this, "ball"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -69,6 +70,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index c9b37b02664..34cddaf680d 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -201,7 +201,8 @@ public: m_analog1(*this, "ANALOG1"), m_analog2(*this, "ANALOG2"), m_analog3(*this, "ANALOG3"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; required_device m_audiocpu; @@ -212,6 +213,7 @@ public: optional_shared_ptr m_workram; required_ioport m_in0, m_in1, m_in2, m_in3, m_in4, m_out4, m_eepromout, m_analog1, m_analog2, m_analog3; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; UINT32 *m_sharc_dataram; UINT8 m_led_reg0; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index 547594a23fa..e82f261cfbc 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -23,7 +23,8 @@ public: m_k051316(*this, "k051316"), m_upd7759_1(*this, "upd1"), m_upd7759_2(*this, "upd2"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_generic_paletteram_8(*this, "paletteram") { } /* memory pointers */ required_shared_ptr m_banked_rom; @@ -61,6 +62,7 @@ public: UINT32 screen_update_88games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(k88games_interrupt); required_device m_maincpu; + required_shared_ptr m_generic_paletteram_8; }; /*----------- defined in video/88games.c -----------*/ diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 45a0564e67a..f350e5d9d23 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -24,7 +24,8 @@ public: m_playfield_tilemap(*this, "playfield"), m_alpha_tilemap(*this, "alpha"), m_rombank1(*this, "rombank1"), - m_rombank2(*this, "rombank2") { } + m_rombank2(*this, "rombank2"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_maincpu; required_device m_audiocpu; @@ -48,6 +49,7 @@ public: required_shared_ptr m_rombank1; required_shared_ptr m_rombank2; + required_shared_ptr m_generic_paletteram_16; UINT8 m_sound_reset_state; diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 6e0b9dbefd0..7982b6dc71b 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -49,7 +49,8 @@ public: m_audiocpu(*this, "audiocpu"), m_68k(*this, "68k"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_device m_scanline_timer; @@ -227,6 +228,7 @@ public: optional_device m_68k; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 225e5368cef..4c429e12798 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -10,7 +10,8 @@ public: m_msm(*this, "msm"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } int m_control_port_select; int m_msm5205next; @@ -55,4 +56,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index 9d7d0f0fe2e..5421d85d17c 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -18,7 +18,8 @@ public: m_audiocpu(*this, "audiocpu"), m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } /* memory pointers */ required_shared_ptr m_ram; @@ -38,6 +39,7 @@ public: required_device m_k052109; required_device m_k051960; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; DECLARE_READ8_MEMBER(bankedram_r); DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(blockhl_sh_irqtrigger_w); diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 7886a6b39b2..334c09ce44d 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -23,7 +23,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } /* memory pointers */ @@ -63,6 +64,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; DECLARE_WRITE8_MEMBER(audio_nmi_enable_w); DECLARE_WRITE8_MEMBER(lnc_w); diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 1c295561594..1d0786b050a 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -23,7 +23,9 @@ public: m_audiocpu(*this, "audiocpu"), m_deco_tilegen1(*this, "tilegen1"), m_deco_tilegen2(*this, "tilegen2"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } /* memory pointers */ @@ -47,6 +49,8 @@ public: required_device m_deco_tilegen1; required_device m_deco_tilegen2; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; 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/centiped.h b/src/mame/includes/centiped.h index 89cd6c47a94..37daaf8ba78 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -19,7 +19,8 @@ public: m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } optional_shared_ptr m_rambase; required_shared_ptr m_videoram; @@ -95,4 +96,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 928afa2c24c..c3d6a73e710 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -21,7 +21,8 @@ public: m_k051960(*this, "k051960"), m_k051316_1(*this, "k051316_1"), m_k051316_2(*this, "k051316_2"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } /* memory pointers */ UINT8 * m_ram; @@ -47,6 +48,8 @@ public: required_device m_k051316_1; required_device m_k051316_2; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; + 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/darkseal.h b/src/mame/includes/darkseal.h index 96c7f055d34..ef76bf98a98 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -16,7 +16,9 @@ public: m_sprgen(*this, "spritegen"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } required_device m_deco_tilegen1; required_device m_deco_tilegen2; @@ -41,4 +43,6 @@ public: required_device m_maincpu; required_device m_audiocpu; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; }; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 7f9284e0e37..e4e6b4b1eb6 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -20,7 +20,9 @@ public: m_subcpu(*this, "sub"), m_mcu(*this, "mcu"), m_msm(*this, "msm"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } required_shared_ptr m_ram; required_shared_ptr m_spriteram; @@ -103,6 +105,8 @@ public: optional_device m_mcu; optional_device m_msm; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; }; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 5be8e5904e8..f8ab51260f8 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -34,7 +34,8 @@ public: m_deco_tilegen2(*this, "tilegen2"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; @@ -95,6 +96,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; 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 36696f89cda..84f58699fcc 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -18,7 +18,8 @@ public: m_ymz(*this, "ymz"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } optional_device m_deco146; @@ -74,6 +75,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index da7080ae958..d657ebd3846 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -14,7 +14,8 @@ public: m_k055555(*this, "k055555"), m_ata(*this, "ata"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } @@ -73,6 +74,7 @@ public: required_device m_ata; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; }; /*----------- defined in video/djmain.c -----------*/ diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index fa40533d6b6..110f9f98baf 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -14,7 +14,8 @@ public: m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_spriteram; required_shared_ptr m_scroll_ram; @@ -26,6 +27,7 @@ public: required_device m_seibu_sound; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; tilemap_t *m_bg_layer; tilemap_t *m_fg_layer; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index e56ed26679b..055e9b24df9 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -13,7 +13,8 @@ public: m_snowboar_protection(*this, "snowboar_prot"), m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_maincpu; required_device m_spriteram; @@ -22,6 +23,7 @@ public: optional_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; 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 7c7f2b6aefc..4ebdff0f709 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -67,7 +67,9 @@ public: m_eeprom(*this, "eeprom"), m_tms(*this, "tms"), m_serial(*this, "serial"), - m_screen(*this, "screen") { } + m_screen(*this, "screen"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram_32(*this, "paletteram") { } required_shared_ptr m_adsp_ram_base; required_shared_ptr m_m68k_ram_base; @@ -80,6 +82,8 @@ public: required_device m_tms; required_device m_serial; required_device m_screen; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram_32; UINT16 m_sound_data; UINT8 m_sound_status; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 1d7731951cd..bd92b0e269f 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -54,7 +54,8 @@ public: m_videoram(*this, "videoram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_maincpu; optional_device m_audiocpu; @@ -73,6 +74,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; int m_bullets_base; int m_sprites_base; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 4c2c823b3df..a252ac7b779 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -10,7 +10,8 @@ public: m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_bgvideoram; required_shared_ptr m_fgvideoram; @@ -20,6 +21,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; DECLARE_WRITE16_MEMBER(galpanic_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_6295_bankswitch_w); diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 7ab8c54dc84..ab430cce19d 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -15,7 +15,8 @@ public: m_subcpu(*this, "sub"), m_msm(*this, "msm"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_shared_ptr m_nvram; required_shared_ptr m_spriteram; @@ -88,4 +89,5 @@ public: required_device m_msm; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 70f91b34bf2..86269ea3f22 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -220,7 +220,8 @@ public: m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } // devices @@ -237,6 +238,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; UINT8 m_knocker_prev; UINT8 m_joystick_select; diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index 9dcdfc5bec1..940ef274d69 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -27,7 +27,8 @@ public: m_tc0100scn(*this, "tc0100scn"), m_tc0480scp(*this, "tc0480scp"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_shared_ptr m_ram; required_shared_ptr m_spriteram; @@ -37,6 +38,7 @@ public: required_device m_tc0480scp; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; UINT16 m_coin_word; UINT16 m_frame_counter; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index cbcd33d1a5d..cef126aa855 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -27,7 +27,8 @@ public: m_spriteram(*this,"spriteram"), m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { m_coin_lockout = true; } @@ -39,6 +40,7 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; bool m_coin_lockout; UINT16 m_coin_word; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index e3e3c9615c7..f9610f8d3bc 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -37,7 +37,8 @@ public: m_com_ram(*this, "com_ram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; @@ -66,6 +67,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; int m_mcu_type; diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 7365baaf3c8..26b95e39b34 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -5,11 +5,16 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_rambase(*this, "rambase"), - m_gfxdecode(*this, "gfxdecode"){ } + m_gfxdecode(*this, "gfxdecode"), + m_generic_paletteram_8(*this, "paletteram"), + m_generic_paletteram2_8(*this, "paletteram2") { } required_device m_maincpu; required_shared_ptr m_rambase; required_device m_gfxdecode; + required_shared_ptr m_generic_paletteram_8; + required_shared_ptr m_generic_paletteram2_8; + UINT8 *m_bgvideoram; UINT8 *m_fgvideoram; int m_videoenable; diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index c166af08123..a4a983aebd2 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -34,7 +34,9 @@ public: m_dsp1(*this, "dsp1"), m_dsp2(*this, "dsp2"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram_32(*this, "paletteram") { } optional_shared_ptr m_main_ram; optional_shared_ptr m_nvram; @@ -197,4 +199,6 @@ public: optional_device m_dsp2; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram_32; }; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 50145c26e95..b7c6841ec9c 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -40,7 +40,8 @@ public: m_eepromout(*this, "EEPROMOUT"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; @@ -66,6 +67,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; DECLARE_WRITE32_MEMBER(esc_w); DECLARE_WRITE32_MEMBER(eeprom_w); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index cbfdcdd785f..4cefa3d8bd6 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -29,7 +29,8 @@ public: m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_priority_ram; required_shared_ptr m_scrollram; @@ -90,6 +91,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 434e7100540..bed734be189 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -24,7 +24,9 @@ public: m_audio(*this, "m72"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } required_shared_ptr m_spriteram; required_shared_ptr m_videoram1; @@ -41,6 +43,8 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; UINT16 *m_protection_ram; emu_timer *m_scanline_timer; diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 7576a733a4a..030faa0c560 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -36,7 +36,8 @@ public: m_dpoker_hopper_timer(*this, "dp_hopper"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } // these should be required but can't because mcr68 shares with us @@ -56,6 +57,7 @@ public: optional_device m_samples; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; DECLARE_WRITE8_MEMBER(mcr_control_port_w); DECLARE_WRITE8_MEMBER(mcr_ipu_laserdisk_w); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 4bf7e625a58..2115cbd2df1 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -28,7 +28,8 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_device m_chip_squeak_deluxe; optional_device m_sounds_good; @@ -128,4 +129,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index f8948e1adbe..e161ff4539d 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -35,7 +35,8 @@ public: m_drmath(*this, "drmath"), m_vgb(*this, "vgb"), m_palette(*this, "palette"), - m_duart68681(*this, "duart68681") { } + m_duart68681(*this, "duart68681"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_shared_ram; UINT8 m_m68681_tx0; @@ -144,6 +145,7 @@ public: required_device m_vgb; required_device m_palette; required_device m_duart68681; + required_shared_ptr m_generic_paletteram_16; 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 b0b5113e147..1fcf248336e 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -23,7 +23,8 @@ public: m_adpcm_sound(*this, "adpcm") , m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), - m_dcs(*this, "dcs") { } + m_dcs(*this, "dcs"), + m_generic_paletteram_16(*this, "paletteram") { } required_shared_ptr m_nvram; required_memory_region m_gfxrom; @@ -76,6 +77,8 @@ public: required_device m_maincpu; required_device m_palette; optional_device m_dcs; + required_shared_ptr m_generic_paletteram_16; + 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 95b8a226e94..087c6c1ed62 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -62,7 +62,8 @@ public: m_midway_serial_pic(*this, "serial_pic"), m_midway_serial_pic2(*this, "serial_pic2"), m_midway_ioasic(*this, "ioasic"), - m_dcs(*this, "dcs") { } + m_dcs(*this, "dcs"), + m_generic_paletteram_32(*this, "paletteram") { } optional_shared_ptr m_nvram; required_shared_ptr m_ram_base; @@ -145,6 +146,7 @@ public: optional_device m_midway_serial_pic2; optional_device m_midway_ioasic; required_device m_dcs; + required_shared_ptr m_generic_paletteram_32; 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 b4a33e79694..a72dfe7e8dc 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -47,7 +47,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_device m_narc_sound; optional_device m_cvsd_sound; @@ -124,6 +125,7 @@ public: optional_device m_audiocpu; optional_device m_oki; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index 54514f08326..ab31ebfb256 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -22,13 +22,15 @@ public: : namcos2_shared_state(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_mcu(*this,"mcu"), - m_shareram(*this, "shareram"){ } + m_shareram(*this, "shareram"), + m_generic_paletteram_32(*this, "paletteram"){ } required_device m_maincpu; required_device m_mcu; emu_timer *m_raster_interrupt_timer; UINT32 *m_workram; required_shared_ptr m_shareram; + required_shared_ptr m_generic_paletteram_32; UINT8 m_mcu_port6; UINT32 m_sprbank; diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 1e48f2b6beb..3337c906a5d 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -32,7 +32,8 @@ public: m_eeprom(*this, "eeprom"), m_spritebank32(*this, "spritebank32"), m_tilebank32(*this, "tilebank32"), - m_namconb_shareram(*this, "namconb_share"){ } + m_namconb_shareram(*this, "namconb_share"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; required_device m_mcu; @@ -40,6 +41,7 @@ public: required_shared_ptr m_spritebank32; optional_shared_ptr m_tilebank32; required_shared_ptr m_namconb_shareram; + required_shared_ptr m_generic_paletteram_32; UINT8 m_namconb_cpureg[32]; int m_vblank_irq_active; diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index de7cd56ab6c..f6db20f6233 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -37,7 +37,8 @@ public: m_mpSharedRAM1(*this,"mpsharedram1"), m_mpDualPortRAM(*this,"mpdualportram"), m_master_dsp_code(*this,"master_dsp_code"), - m_dsp(*this, "dsp") { } + m_dsp(*this, "dsp"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_winrun_dspbios; optional_shared_ptr m_winrun_polydata; @@ -48,6 +49,7 @@ public: optional_shared_ptr m_master_dsp_code; optional_device m_dsp; + required_shared_ptr m_generic_paletteram_16; UINT8 *m_videoram; UINT16 *m_winrun_dspcomram; diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index e751a3d18d2..86f7ad9a7ad 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -9,13 +9,15 @@ public: m_audiocpu(*this, "audiocpu"), m_nb1413m3(*this, "nb1413m3"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_device m_maincpu; optional_device m_audiocpu; required_device m_nb1413m3; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; int m_scrollx; int m_scrolly; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 22b7a9f2d5e..71470fdb78b 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -18,7 +18,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } /* memory pointers */ optional_shared_ptr m_bgvideoram; @@ -112,4 +113,5 @@ public: optional_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index fac776ee797..fb34b91b4bf 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -22,7 +22,8 @@ public: m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"), m_dsp56k_p_8000(*this, "dsp56k_p_8000"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; @@ -38,6 +39,8 @@ public: required_shared_ptr m_dsp56k_p_8000; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; + ioport_port *m_inputs[4]; UINT8 m_sys0; UINT8 m_sys1; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 6ff9ece5519..bccf65bfd55 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } UINT8 *m_bg_ram; UINT8 *m_fg_ram; @@ -32,4 +33,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 4369a807d54..0282f52feb0 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -35,7 +35,8 @@ public: m_005snd(*this, "005"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_shared_ptr m_mainram; required_shared_ptr m_videoram; @@ -51,6 +52,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; UINT8 m_sound_state[2]; UINT8 m_sound_rate; diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 4476eb630d8..f0bf66844da 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -10,7 +10,8 @@ public: m_subcpu(*this, "subcpu"), m_dac(*this, "dac"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } static const UINT8 mahmajn_mlt[8]; @@ -129,4 +130,5 @@ public: required_device m_dac; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index 40425d18759..2db0b9d94e6 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -26,7 +26,8 @@ public: m_bgstripesram(*this, "bgstripesram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } int m_int_delay_kludge; UINT8 m_sound_cmd; @@ -93,6 +94,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; /*----------- defined in audio/senjyo.c -----------*/ diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 52365252c83..368cb8786a8 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -13,7 +13,8 @@ public: m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_shared_ptr m_vidram; required_shared_ptr m_vidram2; @@ -39,4 +40,5 @@ public: required_device m_oki1; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; }; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 1dae6b9ee85..ed05255add5 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -21,7 +21,8 @@ public: m_mainram(*this, "mainram"), m_systemram(*this, "systemram"), m_sprgen(*this, "spritegen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } /* devices */ @@ -36,6 +37,7 @@ public: required_shared_ptr m_systemram; optional_device m_sprgen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; UINT16 *m_spriteram; size_t m_spriteram_size; DECO16IC_BANK_CB_MEMBER(bank_callback); diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 6786c9b478b..b1c274d7b2b 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -25,7 +25,8 @@ public: m_tc0480scp(*this, "tc0480scp"), m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } UINT16 m_coin_word; required_shared_ptr m_ram; @@ -55,4 +56,5 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; }; diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 25b6e447240..28e55ce1166 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -16,7 +16,8 @@ public: m_mcu(*this, "mcu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } optional_device m_ppi8255; required_shared_ptr m_ram; @@ -133,4 +134,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index a91ea49a56e..e9dcb6f73fa 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -58,7 +58,8 @@ public: m_oki(*this, "oki"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } UINT16 *m_videoram; UINT16 *m_spriteram; @@ -293,6 +294,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 15b49c14886..2c22b16f447 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -30,7 +30,8 @@ public: m_subcpu2(*this, "sub2"), m_oki(*this, "oki"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_videoram; optional_shared_ptr m_cyclwarr_cpua_ram; @@ -145,6 +146,7 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; /*----------- defined in machine/tatsumi.c -----------*/ diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 395b8fb9a33..01b1cc4d08b 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -22,7 +22,9 @@ public: m_rocknms_sub_scroll_bg(*this, "sub_scroll_bg"), m_rocknms_sub_rotregs(*this, "sub_rotregs"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } required_device m_maincpu; @@ -49,6 +51,8 @@ public: optional_shared_ptr m_rocknms_sub_rotregs; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; UINT16 m_rocknms_sub_systemregs[0x10]; UINT16 m_rockn_protectdata; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 64d077f2a38..1d18cf5b5ad 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -39,7 +39,8 @@ public: m_upd7759(*this, "upd"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } /* memory pointers */ optional_shared_ptr m_spriteram; @@ -89,6 +90,7 @@ public: optional_device m_samples; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; /* memory buffers */ INT16 m_sampledata[0x40000]; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index fb4692a318a..30795b915e6 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -31,7 +31,8 @@ public: m_seta001(*this, "spritegen"), m_dac(*this, "dac"), m_samples(*this, "samples"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } /* memory pointers */ // UINT8 * m_paletteram; // currently this uses generic palette handling @@ -121,4 +122,5 @@ public: optional_device m_dac; optional_device m_samples; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 279e8710a8a..c63c925a817 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -9,7 +9,8 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } UINT8 m_control; required_shared_ptr m_workram; @@ -38,4 +39,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 0de5c71a971..5bc2d1d73a7 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -19,7 +19,8 @@ public: m_upd7759(*this, "upd"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram") { } required_device m_spriteram; required_shared_ptr m_text_ram; @@ -78,6 +79,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; class cuebrickj_state : public twin16_state diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 2763e235b39..fdb66046ef3 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -31,7 +31,8 @@ public: m_shared_ram(*this, "shared_ram"), m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_32(*this, "paletteram") { } required_device m_maincpu; optional_device m_subcpu; @@ -49,6 +50,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_32; 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 56fb606a09e..3156882b054 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -11,7 +11,9 @@ public: m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram_32(*this, "paletteram") { } UINT16* m_vram; UINT16* m_scroll; @@ -53,4 +55,6 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram_32; }; diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index c32a9461c27..90befb577a1 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -19,7 +19,9 @@ public: m_deco_tilegen2(*this, "tilegen2"), m_spritegen(*this, "spritegen"), m_spriteram(*this, "spriteram"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram2_16(*this, "paletteram2") { } /* memory pointers */ UINT16 * m_pf1_rowscroll; @@ -38,6 +40,8 @@ public: required_device m_spritegen; required_device m_spriteram; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram2_16; DECLARE_WRITE16_MEMBER(vaportra_sound_w); DECLARE_READ16_MEMBER(vaportra_control_r); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 0e0fcb8fba9..e7d8b78278f 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -10,7 +10,8 @@ public: m_maincpu(*this, "maincpu"), m_audio(*this, "m72"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } required_shared_ptr m_spriteram; required_shared_ptr m_videoram; @@ -19,6 +20,7 @@ public: required_device m_audio; required_device m_gfxdecode; required_device m_palette; + required_shared_ptr m_generic_paletteram_8; int m_horiz_scroll_low; int m_horiz_scroll_high; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 3e399252d33..086d99ff932 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -24,7 +24,8 @@ public: m_k007232_3(*this, "k007232_3"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_screen(*this, "screen") { } + m_screen(*this, "screen"), + m_generic_paletteram_16(*this, "paletteram") { } optional_shared_ptr m_videostatus; optional_shared_ptr m_protection_ram; @@ -119,6 +120,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_screen; + required_shared_ptr m_generic_paletteram_16; }; /*----------- defined in video/wecleman.c -----------*/ diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index bb3bb2c90ac..3b33640ae08 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -23,7 +23,8 @@ public: m_soundcpu_b(*this, "soundcpu_b"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_generic_paletteram_8(*this, "paletteram") { } enum { @@ -170,6 +171,7 @@ public: optional_device m_gfxdecode; required_device m_screen; optional_device m_palette; + required_shared_ptr m_generic_paletteram_8; }; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 7123f30869c..38e93b3b98e 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -974,7 +974,9 @@ atarigen_state::atarigen_state(const machine_config &mconfig, device_type type, m_soundcomm(*this, "soundcomm"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_generic_paletteram_16(*this, "paletteram"), + m_generic_paletteram_32(*this, "paletteram") { } diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index fbffdad9e10..f58ddb6ab79 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -433,6 +433,8 @@ public: optional_device m_gfxdecode; optional_device m_screen; optional_device m_palette; + required_shared_ptr m_generic_paletteram_16; + required_shared_ptr m_generic_paletteram_32; }; diff --git a/src/mame/video/decocomn.c b/src/mame/video/decocomn.c index d6d1a980b5a..a629f27f40c 100644 --- a/src/mame/video/decocomn.c +++ b/src/mame/video/decocomn.c @@ -15,7 +15,8 @@ decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, device_video_interface(mconfig, *this), m_dirty_palette(NULL), m_priority(0), - m_palette(*this) + m_palette(*this), + m_generic_paletteram_16(*this, "^paletteram") { } @@ -74,33 +75,27 @@ only updated on a DMA call */ WRITE16_MEMBER( decocomn_device::nonbuffered_palette_w ) { - driver_device *state = space.machine().driver_data(); - int r,g,b; - COMBINE_DATA(&state->m_generic_paletteram_16[offset]); + COMBINE_DATA(&m_generic_paletteram_16[offset]); if (offset&1) offset--; - b = (state->m_generic_paletteram_16[offset] >> 0) & 0xff; - g = (state->m_generic_paletteram_16[offset + 1] >> 8) & 0xff; - r = (state->m_generic_paletteram_16[offset + 1] >> 0) & 0xff; + b = (m_generic_paletteram_16[offset] >> 0) & 0xff; + g = (m_generic_paletteram_16[offset + 1] >> 8) & 0xff; + r = (m_generic_paletteram_16[offset + 1] >> 0) & 0xff; m_palette->set_pen_color(offset / 2, rgb_t(r,g,b)); } WRITE16_MEMBER( decocomn_device::buffered_palette_w ) { - driver_device *state = space.machine().driver_data(); - - COMBINE_DATA(&state->m_generic_paletteram_16[offset]); + COMBINE_DATA(&m_generic_paletteram_16[offset]); m_dirty_palette[offset / 2] = 1; } WRITE16_MEMBER( decocomn_device::palette_dma_w ) { - driver_device *state = space.machine().driver_data(); - const int m = m_palette->entries(); int r, g, b, i; @@ -110,9 +105,9 @@ WRITE16_MEMBER( decocomn_device::palette_dma_w ) { m_dirty_palette[i] = 0; - b = (state->m_generic_paletteram_16[i * 2] >> 0) & 0xff; - g = (state->m_generic_paletteram_16[i * 2 + 1] >> 8) & 0xff; - r = (state->m_generic_paletteram_16[i * 2 + 1] >> 0) & 0xff; + b = (m_generic_paletteram_16[i * 2] >> 0) & 0xff; + g = (m_generic_paletteram_16[i * 2 + 1] >> 8) & 0xff; + r = (m_generic_paletteram_16[i * 2 + 1] >> 0) & 0xff; 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 47770b06714..aa614b05e39 100644 --- a/src/mame/video/decocomn.h +++ b/src/mame/video/decocomn.h @@ -42,6 +42,7 @@ private: UINT8 *m_dirty_palette; UINT16 m_priority; required_device m_palette; + required_shared_ptr m_generic_paletteram_16; }; extern const device_type DECOCOMN; diff --git a/src/mame/video/k054338.c b/src/mame/video/k054338.c index e76d4dfe673..937e76651a6 100644 --- a/src/mame/video/k054338.c +++ b/src/mame/video/k054338.c @@ -22,7 +22,8 @@ k054338_device::k054338_device(const machine_config &mconfig, const char *tag, d : device_t(mconfig, K054338, "K054338 Mixer Device", tag, owner, clock, "k054338", __FILE__), device_video_interface(mconfig, *this), m_alpha_inv(0), - m_k055555_tag(NULL) + m_k055555_tag(NULL), + m_generic_paletteram_32(*this, "^paletteram") //m_regs[32], //m_shd_rgb[9], { @@ -137,7 +138,7 @@ void k054338_device::fill_backcolor( bitmap_rgb32 &bitmap, int mode ) // (see p. dst_ptr += clipx; BGC_SET = 0; - pal_ptr = machine().driver_data()->m_generic_paletteram_32; + pal_ptr = m_generic_paletteram_32; if (!mode || m_k055555 == NULL) { diff --git a/src/mame/video/k054338.h b/src/mame/video/k054338.h index a23f79326f5..d14dc8f2dd1 100644 --- a/src/mame/video/k054338.h +++ b/src/mame/video/k054338.h @@ -56,6 +56,7 @@ private: const char *m_k055555_tag; k055555_device *m_k055555; /* used to fill BG color */ + optional_shared_ptr m_generic_paletteram_32; }; extern const device_type K054338;