From d9071fe7a9188f444275509ceb3a27016feab36d Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Sun, 6 Apr 2014 08:12:24 +0000 Subject: [PATCH] Use owner()->subdevice instead of siblingdevice() like devcb2 does (nw) --- src/emu/bus/iq151/video32.c | 2 +- src/emu/bus/iq151/video64.c | 2 +- src/emu/digfx.c | 4 ++-- src/mame/video/c45.c | 2 +- src/mess/machine/megacd.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/emu/bus/iq151/video32.c b/src/emu/bus/iq151/video32.c index b287ff060a2..24ee5d1438b 100644 --- a/src/emu/bus/iq151/video32.c +++ b/src/emu/bus/iq151/video32.c @@ -40,7 +40,7 @@ static GFXDECODE_START( video32 ) GFXDECODE_END static MACHINE_CONFIG_FRAGMENT( video32 ) - MCFG_GFXDECODE_ADD("gfxdecode", ":palette", video32) + MCFG_GFXDECODE_ADD("gfxdecode", "^^palette", video32) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/emu/bus/iq151/video64.c b/src/emu/bus/iq151/video64.c index 7d00f33930c..c6751adfe3d 100644 --- a/src/emu/bus/iq151/video64.c +++ b/src/emu/bus/iq151/video64.c @@ -40,7 +40,7 @@ static GFXDECODE_START( video64 ) GFXDECODE_END static MACHINE_CONFIG_FRAGMENT( video64 ) - MCFG_GFXDECODE_ADD("gfxdecode", ":palette", video64) + MCFG_GFXDECODE_ADD("gfxdecode", "^^palette", video64) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/emu/digfx.c b/src/emu/digfx.c index 92e723c210b..4a32d1a9190 100644 --- a/src/emu/digfx.c +++ b/src/emu/digfx.c @@ -80,7 +80,7 @@ void device_gfx_interface::interface_pre_start() // find our palette device, either as a sibling device or subdevice if (m_palette_is_sibling) - m_palette = device().siblingdevice(m_palette_tag); + m_palette = device().owner()->subdevice(m_palette_tag); else m_palette = device().subdevice(m_palette_tag); @@ -301,7 +301,7 @@ void device_gfx_interface::interface_validity_check(validity_checker &valid) con { palette_device *palette; if (m_palette_is_sibling) - palette = device().siblingdevice(m_palette_tag); + palette = device().owner()->subdevice(m_palette_tag); else palette = device().subdevice(m_palette_tag); diff --git a/src/mame/video/c45.c b/src/mame/video/c45.c index a6b77bbf013..9c08d58039b 100644 --- a/src/mame/video/c45.c +++ b/src/mame/video/c45.c @@ -214,7 +214,7 @@ void namco_c45_road_device::device_start() } MACHINE_CONFIG_FRAGMENT( namco_c45_road ) - MCFG_GFXDECODE_ADD("gfxdecode", ":palette", empty) // FIXME + MCFG_GFXDECODE_ADD("gfxdecode", "^palette", empty) // FIXME MACHINE_CONFIG_END //------------------------------------------------- // device_mconfig_additions - return a pointer to diff --git a/src/mess/machine/megacd.c b/src/mess/machine/megacd.c index da1f2eed22c..af3be9f5aca 100644 --- a/src/mess/machine/megacd.c +++ b/src/mess/machine/megacd.c @@ -312,7 +312,7 @@ static MACHINE_CONFIG_FRAGMENT( segacd_fragment ) MCFG_TIMER_DRIVER_ADD("stamp_timer", sega_segacd_device, segacd_gfx_conversion_timer_callback) MCFG_TIMER_DRIVER_ADD("scd_dma_timer", sega_segacd_device, scd_dma_timer_callback) - MCFG_GFXDECODE_ADD("gfxdecode", ":gen_vdp:palette", segacd) // FIXME + MCFG_GFXDECODE_ADD("gfxdecode", "^gen_vdp:palette", segacd) // FIXME MCFG_DEFAULT_LAYOUT( layout_megacd )