diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-04-23 13:56:01 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-04-23 13:56:01 +0000 |
commit | 856a4c71191c4a4e69c2c85f417b7a6e2bfea36c (patch) | |
tree | f2cc36925bc104c3e86c7267e0af7a9572afe119 /src/mame/drivers | |
parent | 248c2ced08e1657b0014761f405bbfeb8308cea1 (diff) |
Moved m_generic_paletteram_* into drivers/device state objects so they are not global anymore (nw)
Diffstat (limited to 'src/mame/drivers')
-rw-r--r-- | src/mame/drivers/backfire.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/cobra.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/cshooter.c | 7 | ||||
-rw-r--r-- | src/mame/drivers/cubeqst.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/deco156.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/expro02.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/gal3.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/galpani3.c | 5 | ||||
-rw-r--r-- | src/mame/drivers/gticlub.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/highvdeo.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/igs011.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/igs017.c | 7 | ||||
-rw-r--r-- | src/mame/drivers/igs_m027.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/magic10.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/majorpkr.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/namcos23.c | 5 | ||||
-rw-r--r-- | src/mame/drivers/neoprint.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/nwk-tr.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/skylncr.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/trvmadns.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/vegaeo.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/vroulet.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/zr107.c | 4 |
23 files changed, 79 insertions, 27 deletions
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<palette_device> m_palette; + required_shared_ptr<UINT32> 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<ata_interface_device> m_ata; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + required_shared_ptr<UINT32> 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<cpu_device> m_maincpu; optional_device<seibu_sound_device> m_seibu_sound; @@ -111,6 +112,8 @@ public: optional_shared_ptr<UINT8> m_spriteram; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> m_generic_paletteram_8; + required_shared_ptr<UINT8> 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<cquestlin_cpu_device> m_linecpu; required_device<cquestsnd_cpu_device> m_soundcpu; required_device<screen_device> m_screen; + required_shared_ptr<UINT16> 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<okim6295_device> m_oki2; optional_device<decospr_device> m_sprgen; required_device<palette_device> m_palette; + required_shared_ptr<UINT32> 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<UINT16> m_galsnew_bg_pixram; optional_shared_ptr<UINT16> m_galsnew_fg_pixram; @@ -187,6 +188,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(expro02_scanline); required_device<cpu_device> m_maincpu; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<UINT16> m_rso_shared_ram; + required_shared_ptr<UINT16> 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<UINT16> m_spriteram; @@ -95,6 +95,7 @@ public: required_device<kaneko_grap2_device> m_grap2_1; required_device<kaneko_grap2_device> m_grap2_2; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<eeprom_serial_93cxx_device> m_eeprom; required_device<palette_device> m_palette; + required_shared_ptr<UINT32> 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<UINT16> m_blit_ram; UINT16 m_vblank_bit; @@ -156,6 +157,7 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6376_device> m_okim6376; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<cpu_device> m_maincpu; required_shared_ptr<UINT16> m_priority_ram; @@ -227,6 +228,7 @@ public: optional_device<okim6295_device> m_oki; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> m_generic_paletteram_8; + required_shared_ptr<UINT16> 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<UINT32> m_igs_mainram; optional_shared_ptr<UINT32> m_igs_cg_videoram; @@ -78,6 +79,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> m_generic_paletteram_8; + required_shared_ptr<UINT16> 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<cpu_device> m_maincpu; @@ -1399,7 +1400,7 @@ public: required_ioport m_p2; required_device<screen_device> m_screen; required_device<palette_device> m_palette; - + required_shared_ptr<UINT32> 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<UINT16> m_npvidram; required_shared_ptr<UINT16> m_npvidregs; @@ -50,6 +51,7 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + required_shared_ptr<UINT16> 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<adc12138_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<palette_device> m_palette; + required_shared_ptr<UINT32> 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<UINT8> m_videoram; @@ -169,6 +171,8 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> m_generic_paletteram_8; + required_shared_ptr<UINT8> 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<UINT8> m_gfxram; @@ -118,6 +119,7 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> 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<UINT32> 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<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -69,6 +70,7 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + required_shared_ptr<UINT8> 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<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; @@ -212,6 +213,7 @@ public: optional_shared_ptr<UINT32> 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<palette_device> m_palette; + required_shared_ptr<UINT32> m_generic_paletteram_32; UINT32 *m_sharc_dataram; UINT8 m_led_reg0; |