From 78494b79461536be37f79ca084fb3d485895f5ac Mon Sep 17 00:00:00 2001 From: cam900 Date: Sun, 14 Oct 2018 17:11:08 +0900 Subject: [PATCH] ramdac.cpp : Remove MCFGs blitz68k.cpp : Reduce duplicates, Use private: --- src/devices/video/ramdac.h | 23 +++-------- src/mame/drivers/adp.cpp | 3 +- src/mame/drivers/bfcobra.cpp | 5 ++- src/mame/drivers/blitz68k.cpp | 75 +++++++++++++++++----------------- src/mame/drivers/bmcbowl.cpp | 3 +- src/mame/drivers/bmcpokr.cpp | 3 +- src/mame/drivers/chsuper.cpp | 3 +- src/mame/drivers/clpoker.cpp | 3 +- src/mame/drivers/coinmvga.cpp | 6 ++- src/mame/drivers/dunhuang.cpp | 3 +- src/mame/drivers/gkigt.cpp | 3 +- src/mame/drivers/highvdeo.cpp | 3 +- src/mame/drivers/koftball.cpp | 3 +- src/mame/drivers/lastfght.cpp | 3 +- src/mame/drivers/magicard.cpp | 3 +- src/mame/drivers/mediagx.cpp | 3 +- src/mame/drivers/nibble.cpp | 10 +++-- src/mame/drivers/pinball2k.cpp | 3 +- src/mame/drivers/rltennis.cpp | 5 ++- src/mame/drivers/segajw.cpp | 3 +- src/mame/drivers/sfbonus.cpp | 3 +- src/mame/drivers/skylncr.cpp | 10 +++-- src/mame/drivers/sliver.cpp | 4 +- src/mame/drivers/subsino.cpp | 3 +- src/mame/drivers/subsino2.cpp | 12 ++++-- src/mame/drivers/tr175.cpp | 3 +- src/mame/drivers/twins.cpp | 5 ++- src/mame/drivers/wheelfir.cpp | 3 +- src/mame/drivers/wildpkr.cpp | 3 +- src/mame/machine/inder_vid.cpp | 5 ++- 30 files changed, 118 insertions(+), 99 deletions(-) diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h index be8e885b54a..04db99ab945 100644 --- a/src/devices/video/ramdac.h +++ b/src/devices/video/ramdac.h @@ -14,22 +14,6 @@ #include "emupal.h" -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_RAMDAC_ADD(_tag, _map, _palette) \ - MCFG_DEVICE_ADD(_tag, RAMDAC, 0) \ - MCFG_DEVICE_ADDRESS_MAP(0, _map) \ - downcast(*device).set_palette(_palette); - -#define MCFG_RAMDAC_COLOR_BASE(_color_base) \ - downcast(*device).set_color_base(_color_base); - -#define MCFG_RAMDAC_SPLIT_READ(_split) \ - downcast(*device).set_split_read(_split); - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -41,10 +25,15 @@ class ramdac_device : public device_t, { public: // construction/destruction + template + ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&tag) + : ramdac_device(mconfig, tag, owner, clock) + { + m_palette.set_tag(std::forward(tag)); + } ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // configuration - template void set_palette(T &&tag) { m_palette.set_tag(std::forward(tag)); } void set_color_base(uint32_t color_base) { m_color_base = color_base; } void set_split_read(int split) { m_split_read_reg = split; } diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index c5a3c9f4687..cd926cf31aa 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -629,7 +629,8 @@ MACHINE_CONFIG_START(adp_state::funland) MCFG_DEVICE_REMOVE("palette") MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &adp_state::ramdac_map); MCFG_DEVICE_MODIFY("acrtc") MCFG_HD63484_ADDRESS_MAP(fstation_hd63484_map) diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 039292fa44b..9bd0b24055f 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -1661,8 +1661,9 @@ MACHINE_CONFIG_START(bfcobra_state::bfcobra) MCFG_PALETTE_ADD("palette", 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // MUSIC Semiconductor TR9C1710 RAMDAC or equivalent - MCFG_RAMDAC_SPLIT_READ(1) + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // MUSIC Semiconductor TR9C1710 RAMDAC or equivalent + ramdac.set_addrmap(0, &bfcobra_state::ramdac_map); + ramdac.set_split_read(1); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 8ad214c4749..3316322b91e 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -79,6 +79,29 @@ public: , m_leds(*this, "led%u", 0U) { } + void init_bankrob(); + void init_cjffruit(); + void init_deucesw2(); + void init_megadble(); + void init_bankroba(); + void init_maxidbl(); + void init_cj3play(); + void init_megadblj(); + void init_hermit(); + void init_dualgame(); + + void hermit(machine_config &config); + void bankrob(machine_config &config); + void cjffruit(machine_config &config); + void steaser(machine_config &config); + void deucesw2(machine_config &config); + void ilpag(machine_config &config); + void maxidbl(machine_config &config); + void dualgame(machine_config &config); + void bankroba(machine_config &config); + void ramdac_config(machine_config &config); +private: + DECLARE_WRITE16_MEMBER(blit_copy_w); DECLARE_READ8_MEMBER(blit_status_r); DECLARE_WRITE8_MEMBER(blit_x_w); @@ -157,31 +180,12 @@ public: DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq1); DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq3); DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq5); - void init_bankrob(); - void init_cjffruit(); - void init_deucesw2(); - void init_megadble(); - void init_bankroba(); - void init_maxidbl(); - void init_cj3play(); - void init_megadblj(); - void init_hermit(); - void init_dualgame(); DECLARE_VIDEO_START(blitz68k); DECLARE_VIDEO_START(blitz68k_addr_factor1); uint32_t screen_update_blitz68k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_blitz68k_noblit(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(steaser_mcu_sim); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); - void hermit(machine_config &config); - void bankrob(machine_config &config); - void cjffruit(machine_config &config); - void steaser(machine_config &config); - void deucesw2(machine_config &config); - void ilpag(machine_config &config); - void maxidbl(machine_config &config); - void dualgame(machine_config &config); - void bankroba(machine_config &config); void bankrob_map(address_map &map); void bankroba_map(address_map &map); void cjffruit_map(address_map &map); @@ -193,7 +197,6 @@ public: void ramdac_map(address_map &map); void steaser_map(address_map &map); -protected: virtual void machine_start() override { m_leds.resolve(); } optional_shared_ptr m_nvram; @@ -1710,6 +1713,13 @@ void blitz68k_state::ramdac_map(address_map &map) map(0x000, 0x3ff).rw("ramdac", FUNC(ramdac_device::ramdac_pal_r), FUNC(ramdac_device::ramdac_rgb666_w)); } +void blitz68k_state::ramdac_config(machine_config &config) +{ + PALETTE(config, m_palette, 0x100); + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &blitz68k_state::ramdac_map); +} + MACHINE_CONFIG_START(blitz68k_state::ilpag) MCFG_DEVICE_ADD(m_maincpu, M68000, 11059200 ) // ? MCFG_DEVICE_PROGRAM_MAP(ilpag_map) @@ -1724,11 +1734,9 @@ MACHINE_CONFIG_START(blitz68k_state::ilpag) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END /* @@ -1799,10 +1807,9 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1831,10 +1838,9 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1861,10 +1867,9 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq5)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k_addr_factor1) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1890,10 +1895,9 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1921,10 +1925,9 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1950,10 +1953,9 @@ MACHINE_CONFIG_START(blitz68k_state::hermit) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1)) - MCFG_PALETTE_ADD(m_palette, 0x100) + ramdac_config(config); MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1984,8 +1986,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl) MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3)) - MCFG_PALETTE_ADD(m_palette, 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_config(config); SPEAKER(config, "mono").front_center(); MCFG_SAA1099_ADD("saa", XTAL(8'000'000)/2) diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp index 2ca7256b8bf..3d5eb818798 100644 --- a/src/mame/drivers/bmcbowl.cpp +++ b/src/mame/drivers/bmcbowl.cpp @@ -477,8 +477,7 @@ void bmcbowl_state::bmcbowl(machine_config &config) screen.screen_vblank().set_inputline(m_maincpu, M68K_IRQ_2, HOLD_LINE); PALETTE(config, m_palette, 256); - ramdac_device &ramdac(RAMDAC(config, "ramdac", 0)); - ramdac.set_palette(m_palette); + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); ramdac.set_addrmap(0, &bmcbowl_state::ramdac_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index ff27925690c..674b405b95f 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -823,7 +823,8 @@ MACHINE_CONFIG_START(bmcpokr_state::bmcpokr) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &bmcpokr_state::ramdac_map); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bmcpokr) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index 28e8b6aa44f..786db5fe8ab 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -386,7 +386,8 @@ MACHINE_CONFIG_START(chsuper_state::chsuper) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chsuper) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &chsuper_state::ramdac_map); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp index d06d490b615..eaedb21383f 100644 --- a/src/mame/drivers/clpoker.cpp +++ b/src/mame/drivers/clpoker.cpp @@ -283,7 +283,8 @@ MACHINE_CONFIG_START(clpoker_state::clpoker) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, clpoker_state, vblank_w)) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HM86171 + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); // HM86171 + ramdac.set_addrmap(0, &clpoker_state::ramdac_map); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_clpoker) diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp index c74de251f78..dc340e2f41b 100644 --- a/src/mame/drivers/coinmvga.cpp +++ b/src/mame/drivers/coinmvga.cpp @@ -659,10 +659,12 @@ MACHINE_CONFIG_START(coinmvga_state::coinmvga) MCFG_DEVICE_ADD("gfxdecode2", GFXDECODE, "palette2", gfx_coinmvga2) MCFG_PALETTE_ADD("palette", 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &coinmvga_state::ramdac_map); MCFG_PALETTE_ADD("palette2", 16) - MCFG_RAMDAC_ADD("ramdac2", ramdac2_map, "palette2") + ramdac_device &ramdac2(RAMDAC(config, "ramdac2", 0, m_palette2)); + ramdac2.set_addrmap(0, &coinmvga_state::ramdac2_map); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 85d0608546a..63365fbbb81 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -826,7 +826,8 @@ MACHINE_CONFIG_START(dunhuang_state::dunhuang) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dunhuang) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &dunhuang_state::ramdac_map); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index ead0439482b..690d5bd7226 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -637,7 +637,8 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &igt_gameking_state::ramdac_map); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 1812972e332..d98aa4f0c43 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -1223,7 +1223,8 @@ MACHINE_CONFIG_START(highvdeo_state::tv_vcf) MCFG_SCREEN_UPDATE_DRIVER(highvdeo_state, screen_update_tourvisn) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &highvdeo_state::ramdac_map); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index e8a7ca4acde..05b82ee4fa7 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -252,7 +252,8 @@ MACHINE_CONFIG_START(koftball_state::koftball) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &koftball_state::ramdac_map); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_koftball) diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp index a9eb5d1e6ca..db1107ec162 100644 --- a/src/mame/drivers/lastfght.cpp +++ b/src/mame/drivers/lastfght.cpp @@ -565,7 +565,8 @@ MACHINE_CONFIG_START(lastfght_state::lastfght) /* video hardware */ MCFG_PALETTE_ADD( "palette", 256 ) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &lastfght_state::ramdac_map); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE( 512, 256 ) diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index 8039b842de8..55fb5edb424 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -1010,7 +1010,8 @@ MACHINE_CONFIG_START(magicard_state::magicard) MCFG_SCREEN_UPDATE_DRIVER(magicard_state, screen_update_magicard) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &magicard_state::ramdac_map); SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("saa", SAA1099, CLOCK_B) diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index ea2bf537ca8..a6460ad57af 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -898,7 +898,8 @@ MACHINE_CONFIG_START(mediagx_state::mediagx) MCFG_TIMER_DRIVER_ADD("sound_timer", mediagx_state, sound_timer_callback) - MCFG_RAMDAC_ADD(m_ramdac, ramdac_map, "palette") + RAMDAC(config, m_ramdac, 0, m_palette); + m_ramdac->set_addrmap(0, &mediagx_state::ramdac_map); /* video hardware */ MCFG_SCREEN_ADD(m_screen, RASTER) diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index bb24585788b..dcd06dfaaa8 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -345,11 +345,13 @@ MACHINE_CONFIG_START(nibble_state::nibble) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nibble) - MCFG_RAMDAC_ADD("ramdac1", ramdac1_map, "palette") - MCFG_RAMDAC_COLOR_BASE(0) + ramdac_device &ramdac1(RAMDAC(config, "ramdac1", 0, "palette")); + ramdac1.set_addrmap(0, &nibble_state::ramdac1_map); + ramdac1.set_color_base(0); - MCFG_RAMDAC_ADD("ramdac2", ramdac2_map, "palette") - MCFG_RAMDAC_COLOR_BASE(0x100) + ramdac_device &ramdac2(RAMDAC(config, "ramdac2", 0, "palette")); + ramdac2.set_addrmap(0, &nibble_state::ramdac2_map); + ramdac2.set_color_base(0x100); MCFG_PALETTE_ADD("palette", 0x200) diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index a4b8db29fd8..cfda2c12e4b 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -618,7 +618,8 @@ MACHINE_CONFIG_START(pinball2k_state::mediagx) ide_controller_device &ide(IDE_CONTROLLER(config, "ide").options(ata_devices, "hdd", nullptr, true)); ide.irq_handler().set("pic8259_2", FUNC(pic8259_device::ir6_w)); - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + RAMDAC(config, m_ramdac, 0, m_palette); + m_ramdac->set_addrmap(0, &pinball2k_state::ramdac_map); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp index 88980fa6275..7f120374402 100644 --- a/src/mame/drivers/rltennis.cpp +++ b/src/mame/drivers/rltennis.cpp @@ -198,8 +198,9 @@ MACHINE_CONFIG_START(rltennis_state::rltennis) EEPROM_2864(config, "eeprom"); - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_RAMDAC_SPLIT_READ(1) + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); + ramdac.set_addrmap(0, &rltennis_state::ramdac_map); + ramdac.set_split_read(1); SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index 0663a496d53..42536438fbb 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -408,7 +408,8 @@ MACHINE_CONFIG_START(segajw_state::segajw) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); + ramdac.set_addrmap(0, &segajw_state::ramdac_map); MCFG_HD63484_ADD("hd63484", 8000000, segajw_hd63484_map) // unknown clock diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 1a72f30a918..f7c17308650 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -1398,7 +1398,8 @@ MACHINE_CONFIG_START(sfbonus_state::sfbonus) MCFG_PALETTE_ADD("palette", 0x100*2) // *2 for priority workaraound / custom drawing - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &sfbonus_state::ramdac_map); /* Parrot 3 seems fine at 1 Mhz, but Double Challenge isn't? */ diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 3a8b0529a7c..491245d3795 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -1680,11 +1680,13 @@ MACHINE_CONFIG_START(skylncr_state::skylncr) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skylncr) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_RAMDAC_COLOR_BASE(0) + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &nibble_state::ramdac_map); + ramdac.set_color_base(0); - MCFG_RAMDAC_ADD("ramdac2", ramdac2_map, "palette") - MCFG_RAMDAC_COLOR_BASE(0x100) + ramdac_device &ramdac2(RAMDAC(config, "ramdac2", 0, m_palette)); + ramdac2.set_addrmap(0, &nibble_state::ramdac2_map); + ramdac2.set_color_base(0x100); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 547b753d149..da7e984cd2a 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -536,8 +536,8 @@ MACHINE_CONFIG_START(sliver_state::sliver) MCFG_SCREEN_UPDATE_DRIVER(sliver_state, screen_update) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); + ramdac.set_addrmap(0, &adp_state::ramdac_map); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 939825a3559..d1a87d1d4ac 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -2914,7 +2914,8 @@ MACHINE_CONFIG_START(subsino_state::stbsub) MCFG_PALETTE_ADD("palette", 0x100) //MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &subsino_state::ramdac_map); MCFG_VIDEO_START_OVERRIDE(subsino_state,stbsub) diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 7872e83f1b1..232e3e614b1 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -2399,7 +2399,8 @@ MACHINE_CONFIG_START(subsino2_state::bishjan) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &subsino2_state::ramdac_map); MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) @@ -2450,7 +2451,8 @@ MACHINE_CONFIG_START(subsino2_state::mtrain) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &subsino2_state::ramdac_map); MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) @@ -2484,7 +2486,8 @@ MACHINE_CONFIG_START(subsino2_state::saklove) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &subsino2_state::ramdac_map); MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) @@ -2522,7 +2525,8 @@ MACHINE_CONFIG_START(subsino2_state::xplan) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // HMC HM86171 VGA 256 colour RAMDAC + ramdac.set_addrmap(0, &subsino2_state::ramdac_map); MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp index 88429cf2fef..a70aad110ff 100644 --- a/src/mame/drivers/tr175.cpp +++ b/src/mame/drivers/tr175.cpp @@ -106,9 +106,8 @@ void tr175_state::tr175(machine_config &config) duart.irq_cb().set_inputline("maincpu", M68K_IRQ_1); PALETTE(config, "palette", 0x100); - ramdac_device &ramdac(RAMDAC(config, "ramdac", 0)); + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); ramdac.set_addrmap(0, &tr175_state::ramdac_map); - ramdac.set_palette("palette"); } diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index ba886dcc826..54abeb2a6b6 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -479,8 +479,9 @@ MACHINE_CONFIG_START(twins_state::twins) MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_PALETTE_ADD("palette", 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_RAMDAC_SPLIT_READ(0) + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &twins_state::ramdac_map); + ramdac.set_split_read(0); MCFG_24C02_ADD("i2cmem") diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 190e8ad59f7..0aa94a1ed9b 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -759,7 +759,8 @@ MACHINE_CONFIG_START(wheelfir_state::wheelfir) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", NUM_COLORS) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &wheelfir_state::ramdac_map); EEPROM_93C46_16BIT(config, "eeprom"); diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index e5116a75095..5c365becfe5 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -482,7 +482,8 @@ MACHINE_CONFIG_START(wildpkr_state::wildpkr) MCFG_HD63484_ADD("acrtc", 0, hd63484_map) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette")); + ramdac.set_addrmap(0, &wildpkr_state::ramdac_map); MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(wildpkr_state, wildpkr) diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index de434e7ffb3..affd1cb09c2 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -114,8 +114,9 @@ MACHINE_CONFIG_START(inder_vid_device::device_add_mconfig) MCFG_PALETTE_ADD(m_palette, 256) - MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_RAMDAC_SPLIT_READ(1) + ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); + ramdac.set_addrmap(0, &inder_vid_device::ramdac_map); + ramdac.set_split_read(1); MACHINE_CONFIG_END