summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-02-16 17:32:10 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-02-16 17:32:10 +0000
commit7cde79cd9cc8d2fa5ecda0709c15d0f39af92646 (patch)
treecf6a74146f83c43bc272302c0a6f7ffccdf364e9 /src/mess/drivers
parent36d081e756af22894f32c3497202925ce8d7f873 (diff)
Created gfxdecode_device instead of using machine fixed gfxdecode [Miodrag Milanovic]
Updated all devices and drivers for using it. out of whatsnew: Note that it is made to work same as before, in some cases it can be more logic to move gfxdevice into subdevice itself then to keep it in main driver.
Diffstat (limited to 'src/mess/drivers')
-rw-r--r--src/mess/drivers/a5105.c4
-rw-r--r--src/mess/drivers/a51xx.c2
-rw-r--r--src/mess/drivers/ac1.c2
-rw-r--r--src/mess/drivers/ace.c2
-rw-r--r--src/mess/drivers/alphatro.c2
-rw-r--r--src/mess/drivers/amstr_pc.c4
-rw-r--r--src/mess/drivers/apc.c2
-rw-r--r--src/mess/drivers/apexc.c4
-rw-r--r--src/mess/drivers/apogee.c2
-rw-r--r--src/mess/drivers/apple1.c2
-rw-r--r--src/mess/drivers/apple2gs.c2
-rw-r--r--src/mess/drivers/apricotf.c2
-rw-r--r--src/mess/drivers/apricotp.c2
-rw-r--r--src/mess/drivers/aquarius.c2
-rw-r--r--src/mess/drivers/arcadia.c2
-rw-r--r--src/mess/drivers/atm.c5
-rw-r--r--src/mess/drivers/avigo.c2
-rw-r--r--src/mess/drivers/ax20.c4
-rw-r--r--src/mess/drivers/b16.c4
-rw-r--r--src/mess/drivers/bcs3.c2
-rw-r--r--src/mess/drivers/bigbord2.c2
-rw-r--r--src/mess/drivers/binbug.c4
-rw-r--r--src/mess/drivers/bmjr.c2
-rw-r--r--src/mess/drivers/bw12.c2
-rw-r--r--src/mess/drivers/c10.c2
-rw-r--r--src/mess/drivers/c128.c4
-rw-r--r--src/mess/drivers/c900.c2
-rw-r--r--src/mess/drivers/casloopy.c12
-rw-r--r--src/mess/drivers/cd2650.c2
-rw-r--r--src/mess/drivers/cdc721.c2
-rw-r--r--src/mess/drivers/cgenie.c2
-rw-r--r--src/mess/drivers/comquest.c2
-rw-r--r--src/mess/drivers/dai.c2
-rw-r--r--src/mess/drivers/dgn_beta.c2
-rw-r--r--src/mess/drivers/dim68k.c2
-rw-r--r--src/mess/drivers/dmv.c2
-rw-r--r--src/mess/drivers/ec65.c4
-rw-r--r--src/mess/drivers/einstein.c2
-rw-r--r--src/mess/drivers/elwro800.c2
-rw-r--r--src/mess/drivers/fmtowns.c2
-rw-r--r--src/mess/drivers/fp1100.c2
-rw-r--r--src/mess/drivers/fp200.c2
-rw-r--r--src/mess/drivers/fp6000.c4
-rw-r--r--src/mess/drivers/galaxy.c2
-rw-r--r--src/mess/drivers/galeb.c2
-rw-r--r--src/mess/drivers/gb.c4
-rw-r--r--src/mess/drivers/h19.c2
-rw-r--r--src/mess/drivers/homelab.c6
-rw-r--r--src/mess/drivers/homez80.c2
-rw-r--r--src/mess/drivers/hp9k.c4
-rw-r--r--src/mess/drivers/hprot1.c2
-rw-r--r--src/mess/drivers/huebler.c2
-rw-r--r--src/mess/drivers/ie15.c2
-rw-r--r--src/mess/drivers/intv.c2
-rw-r--r--src/mess/drivers/ipds.c2
-rw-r--r--src/mess/drivers/irisha.c2
-rw-r--r--src/mess/drivers/itt3030.c4
-rw-r--r--src/mess/drivers/jonos.c2
-rw-r--r--src/mess/drivers/jr100.c2
-rw-r--r--src/mess/drivers/jr200.c10
-rw-r--r--src/mess/drivers/jtc.c4
-rw-r--r--src/mess/drivers/kaypro.c4
-rw-r--r--src/mess/drivers/korgm1.c2
-rw-r--r--src/mess/drivers/kramermc.c2
-rw-r--r--src/mess/drivers/lcmate2.c2
-rw-r--r--src/mess/drivers/llc.c4
-rw-r--r--src/mess/drivers/m79152pc.c2
-rw-r--r--src/mess/drivers/mbc200.c2
-rw-r--r--src/mess/drivers/mbee.c6
-rw-r--r--src/mess/drivers/megadriv.c13
-rw-r--r--src/mess/drivers/microtan.c2
-rw-r--r--src/mess/drivers/mikro80.c2
-rw-r--r--src/mess/drivers/mikrosha.c2
-rw-r--r--src/mess/drivers/mmodular.c2
-rw-r--r--src/mess/drivers/modellot.c2
-rw-r--r--src/mess/drivers/molecular.c2
-rw-r--r--src/mess/drivers/multi8.c4
-rw-r--r--src/mess/drivers/mx2178.c2
-rw-r--r--src/mess/drivers/myb3k.c2
-rw-r--r--src/mess/drivers/mycom.c2
-rw-r--r--src/mess/drivers/mz2000.c4
-rw-r--r--src/mess/drivers/mz2500.c10
-rw-r--r--src/mess/drivers/mz3500.c2
-rw-r--r--src/mess/drivers/mz700.c5
-rw-r--r--src/mess/drivers/mz80.c4
-rw-r--r--src/mess/drivers/nakajies.c8
-rw-r--r--src/mess/drivers/nanos.c2
-rw-r--r--src/mess/drivers/nascom1.c4
-rw-r--r--src/mess/drivers/newbrain.c2
-rw-r--r--src/mess/drivers/odyssey2.c8
-rw-r--r--src/mess/drivers/okean240.c4
-rw-r--r--src/mess/drivers/osborne1.c2
-rw-r--r--src/mess/drivers/osi.c6
-rw-r--r--src/mess/drivers/p2000t.c2
-rw-r--r--src/mess/drivers/partner.c2
-rw-r--r--src/mess/drivers/paso1600.c4
-rw-r--r--src/mess/drivers/pasopia.c2
-rw-r--r--src/mess/drivers/pasopia7.c4
-rw-r--r--src/mess/drivers/pb1000.c2
-rw-r--r--src/mess/drivers/pc.c26
-rw-r--r--src/mess/drivers/pc100.c2
-rw-r--r--src/mess/drivers/pc2000.c4
-rw-r--r--src/mess/drivers/pc4.c2
-rw-r--r--src/mess/drivers/pc6001.c4
-rw-r--r--src/mess/drivers/pc8801.c2
-rw-r--r--src/mess/drivers/pc88va.c6
-rw-r--r--src/mess/drivers/pc9801.c12
-rw-r--r--src/mess/drivers/pcm.c2
-rw-r--r--src/mess/drivers/pda600.c2
-rw-r--r--src/mess/drivers/pdp1.c2
-rw-r--r--src/mess/drivers/pegasus.c2
-rw-r--r--src/mess/drivers/pentagon.c2
-rw-r--r--src/mess/drivers/phunsy.c2
-rw-r--r--src/mess/drivers/pk8020.c2
-rw-r--r--src/mess/drivers/plan80.c2
-rw-r--r--src/mess/drivers/pocketc.c4
-rw-r--r--src/mess/drivers/poly88.c2
-rw-r--r--src/mess/drivers/portfoli.c2
-rw-r--r--src/mess/drivers/psion.c2
-rw-r--r--src/mess/drivers/ptcsol.c2
-rw-r--r--src/mess/drivers/pv1000.c8
-rw-r--r--src/mess/drivers/px8.c2
-rw-r--r--src/mess/drivers/pyl601.c4
-rw-r--r--src/mess/drivers/qx10.c2
-rw-r--r--src/mess/drivers/radio86.c2
-rw-r--r--src/mess/drivers/rainbow.c2
-rw-r--r--src/mess/drivers/replicator.c2
-rw-r--r--src/mess/drivers/rex6000.c2
-rw-r--r--src/mess/drivers/rt1715.c2
-rw-r--r--src/mess/drivers/rx78.c2
-rw-r--r--src/mess/drivers/saturn.c2
-rw-r--r--src/mess/drivers/sbc6510.c2
-rw-r--r--src/mess/drivers/scorpion.c6
-rw-r--r--src/mess/drivers/scv.c2
-rw-r--r--src/mess/drivers/sm1800.c2
-rw-r--r--src/mess/drivers/smc777.c4
-rw-r--r--src/mess/drivers/sorcerer.c2
-rw-r--r--src/mess/drivers/spec128.c2
-rw-r--r--src/mess/drivers/specpls3.c2
-rw-r--r--src/mess/drivers/spectrum.c2
-rw-r--r--src/mess/drivers/super80.c10
-rw-r--r--src/mess/drivers/supracan.c20
-rw-r--r--src/mess/drivers/svi318.c2
-rw-r--r--src/mess/drivers/tek410x.c2
-rw-r--r--src/mess/drivers/ti990_10.c3
-rw-r--r--src/mess/drivers/ti990_4.c6
-rw-r--r--src/mess/drivers/ti99_2.c4
-rw-r--r--src/mess/drivers/tim100.c2
-rw-r--r--src/mess/drivers/timex.c2
-rw-r--r--src/mess/drivers/tk80bs.c4
-rw-r--r--src/mess/drivers/trs80.c14
-rw-r--r--src/mess/drivers/tx0.c2
-rw-r--r--src/mess/drivers/unior.c2
-rw-r--r--src/mess/drivers/unistar.c2
-rw-r--r--src/mess/drivers/ut88.c2
-rw-r--r--src/mess/drivers/v6809.c2
-rw-r--r--src/mess/drivers/vg5k.c2
-rw-r--r--src/mess/drivers/vt100.c2
-rw-r--r--src/mess/drivers/vt240.c2
-rw-r--r--src/mess/drivers/vta2000.c2
-rw-r--r--src/mess/drivers/vtech2.c2
-rw-r--r--src/mess/drivers/wswan.c2
-rw-r--r--src/mess/drivers/x07.c2
-rw-r--r--src/mess/drivers/x1.c10
-rw-r--r--src/mess/drivers/x1twin.c2
-rw-r--r--src/mess/drivers/x68k.c2
-rw-r--r--src/mess/drivers/xavix.c2
-rw-r--r--src/mess/drivers/xerox820.c4
-rw-r--r--src/mess/drivers/z1013.c2
-rw-r--r--src/mess/drivers/z9001.c2
-rw-r--r--src/mess/drivers/zrt80.c2
-rw-r--r--src/mess/drivers/zx.c8
172 files changed, 298 insertions, 278 deletions
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index b78f31f133a..3b80b72caf4 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -169,7 +169,7 @@ WRITE8_MEMBER( a5105_state::pcg_val_w )
{
m_char_ram[m_pcg_addr | m_pcg_internal_addr] = data;
- machine().gfx[0]->mark_dirty(m_pcg_addr >> 3);
+ m_gfxdecode->gfx(0)->mark_dirty(m_pcg_addr >> 3);
m_pcg_internal_addr++;
m_pcg_internal_addr&=7;
@@ -597,7 +597,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 25*8-1)
- MCFG_GFXDECODE(a5105)
+ MCFG_GFXDECODE_ADD("gfxdecode", a5105)
MCFG_PALETTE_LENGTH(16)
/* sound hardware */
diff --git a/src/mess/drivers/a51xx.c b/src/mess/drivers/a51xx.c
index 301412940e3..b9520aca27f 100644
--- a/src/mess/drivers/a51xx.c
+++ b/src/mess/drivers/a51xx.c
@@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( a5120, a51xx_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(a51xx_state, screen_update_a5120)
- MCFG_GFXDECODE(a51xx)
+ MCFG_GFXDECODE_ADD("gfxdecode", a51xx)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/ac1.c b/src/mess/drivers/ac1.c
index f73fd993daf..204525d379f 100644
--- a/src/mess/drivers/ac1.c
+++ b/src/mess/drivers/ac1.c
@@ -136,7 +136,7 @@ static MACHINE_CONFIG_START( ac1, ac1_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*6-1, 0, 16*8-1)
MCFG_SCREEN_UPDATE_DRIVER(ac1_state, screen_update_ac1)
- MCFG_GFXDECODE( ac1 )
+ MCFG_GFXDECODE_ADD("gfxdecode", ac1 )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c
index bfea26a5b27..49d6b5dd063 100644
--- a/src/mess/drivers/ace.c
+++ b/src/mess/drivers/ace.c
@@ -742,7 +742,7 @@ static MACHINE_CONFIG_START( ace, ace_state )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(ace)
+ MCFG_GFXDECODE_ADD("gfxdecode", ace)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c
index 312bd67792c..888a08cb641 100644
--- a/src/mess/drivers/alphatro.c
+++ b/src/mess/drivers/alphatro.c
@@ -461,7 +461,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_GFXDECODE(alphatro)
+ MCFG_GFXDECODE_ADD("gfxdecode", alphatro)
MCFG_PALETTE_LENGTH(9) // 8 colours + amber
/* sound hardware */
diff --git a/src/mess/drivers/amstr_pc.c b/src/mess/drivers/amstr_pc.c
index b23b4534a42..9928a9c9661 100644
--- a/src/mess/drivers/amstr_pc.c
+++ b/src/mess/drivers/amstr_pc.c
@@ -298,7 +298,7 @@ static MACHINE_CONFIG_START( pc200, amstrad_pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_pc200 )
- MCFG_GFXDECODE(pc200)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc200)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -400,7 +400,7 @@ static MACHINE_CONFIG_START( ppc512, amstrad_pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_pc200 )
- MCFG_GFXDECODE(pc200)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc200)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c
index 811e25ebc04..e7e3daaea98 100644
--- a/src/mess/drivers/apc.c
+++ b/src/mess/drivers/apc.c
@@ -1032,7 +1032,7 @@ static MACHINE_CONFIG_START( apc, apc_state )
MCFG_SCREEN_SIZE(640, 494)
MCFG_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 494-1)
- MCFG_GFXDECODE(apc)
+ MCFG_GFXDECODE_ADD("gfxdecode", apc)
MCFG_UPD7220_ADD("upd7220_chr", XTAL_3_579545MHz, hgdc_1_intf, upd7220_1_map) // unk clock
MCFG_UPD7220_ADD("upd7220_btm", XTAL_3_579545MHz, hgdc_2_intf, upd7220_2_map) // unk clock
diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c
index e3647af754a..82cf7194a3f 100644
--- a/src/mess/drivers/apexc.c
+++ b/src/mess/drivers/apexc.c
@@ -584,7 +584,7 @@ void apexc_state::apexc_draw_led(bitmap_ind16 &bitmap, int x, int y, int state)
/* write a single char on screen */
void apexc_state::apexc_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color)
{
- machine().gfx[0]->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0,
+ m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0,
x+1, y, 0);
}
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( apexc, apexc_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
MCFG_SCREEN_UPDATE_DRIVER(apexc_state, screen_update_apexc)
- MCFG_GFXDECODE(apexc)
+ MCFG_GFXDECODE_ADD("gfxdecode", apexc)
MCFG_PALETTE_LENGTH(APEXC_PALETTE_SIZE)
diff --git a/src/mess/drivers/apogee.c b/src/mess/drivers/apogee.c
index 26e95de79e9..375b233ed01 100644
--- a/src/mess/drivers/apogee.c
+++ b/src/mess/drivers/apogee.c
@@ -239,7 +239,7 @@ static MACHINE_CONFIG_START( apogee, apogee_state )
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE(apogee)
+ MCFG_GFXDECODE_ADD("gfxdecode", apogee)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(apogee_state,radio86)
diff --git a/src/mess/drivers/apple1.c b/src/mess/drivers/apple1.c
index 1670135f22c..3aa7d9d0811 100644
--- a/src/mess/drivers/apple1.c
+++ b/src/mess/drivers/apple1.c
@@ -300,7 +300,7 @@ static MACHINE_CONFIG_START( apple1, apple1_state )
MCFG_SCREEN_UPDATE_DRIVER(apple1_state, screen_update_apple1)
- MCFG_GFXDECODE(apple1)
+ MCFG_GFXDECODE_ADD("gfxdecode", apple1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index 1673e5ec2e6..787fe122da3 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -345,7 +345,7 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state )
MCFG_SCREEN_UPDATE_DRIVER(apple2gs_state, screen_update_apple2gs)
MCFG_PALETTE_LENGTH( 16+256 )
- MCFG_GFXDECODE( apple2gs )
+ MCFG_GFXDECODE_ADD("gfxdecode", apple2gs )
MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gs )
MCFG_MACHINE_RESET_OVERRIDE(apple2gs_state, apple2gs )
diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c
index 8d59a1b738a..52f8f44d116 100644
--- a/src/mess/drivers/apricotf.c
+++ b/src/mess/drivers/apricotf.c
@@ -333,7 +333,7 @@ static MACHINE_CONFIG_START( act_f1, f1_state )
MCFG_SCREEN_SIZE(640, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_PALETTE_LENGTH(16)
- MCFG_GFXDECODE(act_f1)
+ MCFG_GFXDECODE_ADD("gfxdecode", act_f1)
/* Devices */
MCFG_APRICOT_KEYBOARD_ADD(kb_intf)
diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c
index 927f71d586d..0b466c16aa4 100644
--- a/src/mess/drivers/apricotp.c
+++ b/src/mess/drivers/apricotp.c
@@ -627,7 +627,7 @@ static MACHINE_CONFIG_START( fp, fp_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_PALETTE_LENGTH(16)
- MCFG_GFXDECODE(act_f1)
+ MCFG_GFXDECODE_ADD("gfxdecode", act_f1)
MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_CRT_TAG, 4000000, crtc_intf)
// sound hardware
diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c
index ef549437226..0322786cc5d 100644
--- a/src/mess/drivers/aquarius.c
+++ b/src/mess/drivers/aquarius.c
@@ -371,7 +371,7 @@ static MACHINE_CONFIG_START( aquarius, aquarius_state )
MCFG_SCREEN_VISIBLE_AREA(0, 40 * 8 - 1, 0 * 8, 25 * 8 - 1)
MCFG_SCREEN_UPDATE_DRIVER(aquarius_state, screen_update_aquarius)
- MCFG_GFXDECODE( aquarius )
+ MCFG_GFXDECODE_ADD("gfxdecode", aquarius )
MCFG_PALETTE_LENGTH(512)
diff --git a/src/mess/drivers/arcadia.c b/src/mess/drivers/arcadia.c
index e52946333f9..8ea8bdb8403 100644
--- a/src/mess/drivers/arcadia.c
+++ b/src/mess/drivers/arcadia.c
@@ -541,7 +541,7 @@ static MACHINE_CONFIG_START( arcadia, arcadia_state )
MCFG_SCREEN_VISIBLE_AREA(0, 2*XPOS+128-1, 0, 262-1)
MCFG_SCREEN_UPDATE_DRIVER(arcadia_state, screen_update_arcadia)
- MCFG_GFXDECODE( arcadia )
+ MCFG_GFXDECODE_ADD("gfxdecode", arcadia )
MCFG_PALETTE_LENGTH(ARRAY_LENGTH(arcadia_palette))
diff --git a/src/mess/drivers/atm.c b/src/mess/drivers/atm.c
index c352f764bf2..258c35c8a07 100644
--- a/src/mess/drivers/atm.c
+++ b/src/mess/drivers/atm.c
@@ -190,11 +190,12 @@ static MACHINE_CONFIG_DERIVED_CLASS( atm, spectrum_128, atm_state )
MCFG_MACHINE_RESET_OVERRIDE(atm_state, atm )
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
- MCFG_GFXDECODE(atm)
+
+ MCFG_GFXDECODE_MODIFY("gfxdecode", atm)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atmtb2, atm )
- MCFG_GFXDECODE(atmtb2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", atmtb2)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/avigo.c b/src/mess/drivers/avigo.c
index 2583438a256..ae242a404ac 100644
--- a/src/mess/drivers/avigo.c
+++ b/src/mess/drivers/avigo.c
@@ -901,7 +901,7 @@ static MACHINE_CONFIG_START( avigo, avigo_state )
MCFG_SCREEN_VISIBLE_AREA(0, AVIGO_SCREEN_WIDTH-1, 0, AVIGO_SCREEN_HEIGHT + AVIGO_PANEL_HEIGHT -1)
MCFG_DEFAULT_LAYOUT(layout_avigo)
- MCFG_GFXDECODE(avigo)
+ MCFG_GFXDECODE_ADD("gfxdecode", avigo)
MCFG_PALETTE_LENGTH(AVIGO_NUM_COLOURS)
/* sound hardware */
diff --git a/src/mess/drivers/ax20.c b/src/mess/drivers/ax20.c
index 7cc592ae0fc..2157340191a 100644
--- a/src/mess/drivers/ax20.c
+++ b/src/mess/drivers/ax20.c
@@ -47,7 +47,7 @@ UINT32 ax20_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
{
UINT16 tile = m_p_vram[24 + y * 128 + x ] & 0x7f;
- machine().gfx[0]->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*12);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*12);
}
}
@@ -117,7 +117,7 @@ static MACHINE_CONFIG_START( ax20, ax20_state )
MCFG_SCREEN_UPDATE_DRIVER(ax20_state, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*12)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*12-1)
- MCFG_GFXDECODE(ax20)
+ MCFG_GFXDECODE_ADD("gfxdecode", ax20)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c
index 9e8c1b207c5..56686417df1 100644
--- a/src/mess/drivers/b16.c
+++ b/src/mess/drivers/b16.c
@@ -112,7 +112,7 @@ WRITE8_MEMBER( b16_state::b16_pcg_w )
{
m_char_rom[offset] = data;
- machine().gfx[0]->mark_dirty(offset >> 4);
+ m_gfxdecode->gfx(0)->mark_dirty(offset >> 4);
}
static ADDRESS_MAP_START( b16_map, AS_PROGRAM, 16, b16_state)
@@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( b16, b16_state )
MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz/5, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */
MCFG_I8237_ADD("8237dma", XTAL_14_31818MHz/2, b16_dma8237_interface)
- MCFG_GFXDECODE(b16)
+ MCFG_GFXDECODE_ADD("gfxdecode", b16)
MCFG_PALETTE_LENGTH(8)
// MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white) // TODO
diff --git a/src/mess/drivers/bcs3.c b/src/mess/drivers/bcs3.c
index 5bf5ab7f519..1785c120ea8 100644
--- a/src/mess/drivers/bcs3.c
+++ b/src/mess/drivers/bcs3.c
@@ -426,7 +426,7 @@ static MACHINE_CONFIG_START( bcs3, bcs3_state )
MCFG_SCREEN_SIZE(28*8, 12*10)
MCFG_SCREEN_VISIBLE_AREA(0,28*8-1,0,12*10-1)
MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3)
- MCFG_GFXDECODE(bcs3)
+ MCFG_GFXDECODE_ADD("gfxdecode", bcs3)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index b6cbd6cd8c5..4fd96c3c1f7 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -643,7 +643,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state )
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE(bigbord2)
+ MCFG_GFXDECODE_ADD("gfxdecode", bigbord2)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c
index 2f986faa79e..856a98cda4b 100644
--- a/src/mess/drivers/binbug.c
+++ b/src/mess/drivers/binbug.c
@@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state )
MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update)
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
- MCFG_GFXDECODE(dg640)
+ MCFG_GFXDECODE_ADD("gfxdecode", dg640)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_amber)
@@ -569,7 +569,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state )
MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update)
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
- MCFG_GFXDECODE(dg640)
+ MCFG_GFXDECODE_ADD("gfxdecode", dg640)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_amber)
diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c
index 15ba09a0635..acef8f30494 100644
--- a/src/mess/drivers/bmjr.c
+++ b/src/mess/drivers/bmjr.c
@@ -360,7 +360,7 @@ static MACHINE_CONFIG_START( bmjr, bmjr_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
MCFG_SCREEN_UPDATE_DRIVER(bmjr_state, screen_update_bmjr)
MCFG_PALETTE_LENGTH(8)
- MCFG_GFXDECODE(bmjr)
+ MCFG_GFXDECODE_ADD("gfxdecode", bmjr)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c
index 64741c7b3e8..6866da75b23 100644
--- a/src/mess/drivers/bw12.c
+++ b/src/mess/drivers/bw12.c
@@ -607,7 +607,7 @@ static MACHINE_CONFIG_START( common, bw12_state )
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
- MCFG_GFXDECODE(bw12)
+ MCFG_GFXDECODE_ADD("gfxdecode", bw12)
MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/8, bw12_mc6845_interface)
diff --git a/src/mess/drivers/c10.c b/src/mess/drivers/c10.c
index 76cb140ceac..7ab9ac1ea54 100644
--- a/src/mess/drivers/c10.c
+++ b/src/mess/drivers/c10.c
@@ -163,7 +163,7 @@ static MACHINE_CONFIG_START( c10, c10_state )
MCFG_SCREEN_UPDATE_DRIVER(c10_state, screen_update)
MCFG_SCREEN_SIZE(640, 250)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249)
- MCFG_GFXDECODE(c10)
+ MCFG_GFXDECODE_ADD("gfxdecode", c10)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c
index b8dd6e38838..b02c23e88e9 100644
--- a/src/mess/drivers/c128.c
+++ b/src/mess/drivers/c128.c
@@ -1466,7 +1466,7 @@ static MACHINE_CONFIG_START( ntsc, c128_state )
// video hardware
MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, VIC6567_CLOCK*2, vdc_intf, vdc_videoram_map)
MCFG_MOS8564_ADD(MOS8564_TAG, SCREEN_VIC_TAG, M8502_TAG, VIC6567_CLOCK, vic_videoram_map, vic_colorram_map, WRITELINE(c128_state, vic_irq_w), WRITE8(c128_state, vic_k_w))
- MCFG_GFXDECODE(c128)
+ MCFG_GFXDECODE_ADD("gfxdecode", c128)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1598,7 +1598,7 @@ static MACHINE_CONFIG_START( pal, c128_state )
// video hardware
MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, VIC6569_CLOCK*2, vdc_intf, vdc_videoram_map)
MCFG_MOS8566_ADD(MOS8564_TAG, SCREEN_VIC_TAG, M8502_TAG, VIC6569_CLOCK, vic_videoram_map, vic_colorram_map, WRITELINE(c128_state, vic_irq_w), WRITE8(c128_state, vic_k_w))
- MCFG_GFXDECODE(c128)
+ MCFG_GFXDECODE_ADD("gfxdecode", c128)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/c900.c b/src/mess/drivers/c900.c
index 88d707298ab..0ac5821a501 100644
--- a/src/mess/drivers/c900.c
+++ b/src/mess/drivers/c900.c
@@ -115,7 +115,7 @@ static MACHINE_CONFIG_START( c900, c900_state )
MCFG_CPU_IO_MAP(c900_io)
MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf)
- MCFG_GFXDECODE(c900)
+ MCFG_GFXDECODE_ADD("gfxdecode", c900)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index 3beb72b2de1..94a2cd3fb02 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -219,19 +219,19 @@ void casloopy_state::video_start()
m_bitmap_vram = auto_alloc_array_clear(machine(), UINT8, 0x20000);
for (m_gfx_index = 0; m_gfx_index < MAX_GFX_ELEMENTS; m_gfx_index++)
- if (machine().gfx[m_gfx_index] == 0)
+ if (m_gfxdecode->gfx(m_gfx_index) == 0)
break;
for(int i=0;i<0x10000;i++)
m_vram[i] = i & 0xff;
- machine().gfx[m_gfx_index] = auto_alloc(machine(), gfx_element(machine(), casloopy_4bpp_layout, m_vram, 0x10, 0));
- machine().gfx[m_gfx_index+1] = auto_alloc(machine(), gfx_element(machine(), casloopy_8bpp_layout, m_vram, 1, 0));
+ m_gfxdecode->set_gfx(m_gfx_index, auto_alloc(machine(), gfx_element(machine(), casloopy_4bpp_layout, m_vram, 0x10, 0)));
+ m_gfxdecode->set_gfx(m_gfx_index+1, auto_alloc(machine(), gfx_element(machine(), casloopy_8bpp_layout, m_vram, 1, 0)));
}
UINT32 casloopy_state::screen_update_casloopy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = machine().gfx[m_gfx_index];
+ gfx_element *gfx = m_gfxdecode->gfx(m_gfx_index);
int x,y;
int count;
@@ -339,8 +339,8 @@ WRITE8_MEMBER(casloopy_state::casloopy_vram_w)
{
m_vram[offset] = data;
- machine().gfx[m_gfx_index]->mark_dirty(offset/32);
- machine().gfx[m_gfx_index+1]->mark_dirty(offset/64);
+ m_gfxdecode->gfx(m_gfx_index)->mark_dirty(offset/32);
+ m_gfxdecode->gfx(m_gfx_index+1)->mark_dirty(offset/64);
}
/* TODO: all of this should be internal to the SH core, this is just to check what it enables. */
diff --git a/src/mess/drivers/cd2650.c b/src/mess/drivers/cd2650.c
index d1b44459d05..54993cb7996 100644
--- a/src/mess/drivers/cd2650.c
+++ b/src/mess/drivers/cd2650.c
@@ -291,7 +291,7 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state )
MCFG_SCREEN_UPDATE_DRIVER(cd2650_state, screen_update)
MCFG_SCREEN_SIZE(640, 160)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 159)
- MCFG_GFXDECODE(cd2650)
+ MCFG_GFXDECODE_ADD("gfxdecode", cd2650)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/cdc721.c b/src/mess/drivers/cdc721.c
index be6858ceb26..1f87fe4f981 100644
--- a/src/mess/drivers/cdc721.c
+++ b/src/mess/drivers/cdc721.c
@@ -124,7 +124,7 @@ static MACHINE_CONFIG_START( cdc721, cdc721_state )
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(cdc721_state, cdc721)
- MCFG_GFXDECODE(cdc721)
+ MCFG_GFXDECODE_ADD("gfxdecode", cdc721)
MACHINE_CONFIG_END
ROM_START( cdc721 )
diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c
index 3c54643d490..bf8bb879b0d 100644
--- a/src/mess/drivers/cgenie.c
+++ b/src/mess/drivers/cgenie.c
@@ -536,7 +536,7 @@ static MACHINE_CONFIG_START( cgenie_common, cgenie_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1,0*8,32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(cgenie_state, screen_update_cgenie)
- MCFG_GFXDECODE( cgenie )
+ MCFG_GFXDECODE_ADD("gfxdecode", cgenie )
MCFG_PALETTE_LENGTH(108)
// Actually the video is driven by an HD46505 clocked at XTAL_17_73447MHz/16
diff --git a/src/mess/drivers/comquest.c b/src/mess/drivers/comquest.c
index 27b4f4afc26..0d12cdfc0c2 100644
--- a/src/mess/drivers/comquest.c
+++ b/src/mess/drivers/comquest.c
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( comquest, comquest_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*4-1, 0, 128-1)
MCFG_SCREEN_UPDATE_DRIVER(comquest_state, screen_update_comquest)
- MCFG_GFXDECODE( comquest )
+ MCFG_GFXDECODE_ADD("gfxdecode", comquest )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/dai.c b/src/mess/drivers/dai.c
index d1400ad97d0..7a1b893be58 100644
--- a/src/mess/drivers/dai.c
+++ b/src/mess/drivers/dai.c
@@ -215,7 +215,7 @@ static MACHINE_CONFIG_START( dai, dai_state )
MCFG_SCREEN_VISIBLE_AREA(0, 1056-1, 0, 302-1)
MCFG_SCREEN_UPDATE_DRIVER(dai_state, screen_update_dai)
- MCFG_GFXDECODE(dai)
+ MCFG_GFXDECODE_ADD("gfxdecode", dai)
MCFG_PALETTE_LENGTH(sizeof (dai_palette) / 3)
diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c
index 6c04a261db3..48edd4d9e39 100644
--- a/src/mess/drivers/dgn_beta.c
+++ b/src/mess/drivers/dgn_beta.c
@@ -336,7 +336,7 @@ static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state )
MCFG_SCREEN_VISIBLE_AREA(0, 699, 0, 549)
MCFG_SCREEN_UPDATE_DEVICE( "crtc", hd6845_device, screen_update )
- MCFG_GFXDECODE(dgnbeta)
+ MCFG_GFXDECODE_ADD("gfxdecode", dgnbeta)
MCFG_PALETTE_LENGTH(ARRAY_LENGTH(dgnbeta_palette) / 3)
MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
diff --git a/src/mess/drivers/dim68k.c b/src/mess/drivers/dim68k.c
index 90db7ddf189..a1c0478e31a 100644
--- a/src/mess/drivers/dim68k.c
+++ b/src/mess/drivers/dim68k.c
@@ -335,7 +335,7 @@ static MACHINE_CONFIG_START( dim68k, dim68k_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 250-1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(dim68k)
+ MCFG_GFXDECODE_ADD("gfxdecode", dim68k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/dmv.c b/src/mess/drivers/dmv.c
index 438b8378747..03eb061d69c 100644
--- a/src/mess/drivers/dmv.c
+++ b/src/mess/drivers/dmv.c
@@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( dmv, dmv_state )
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MCFG_GFXDECODE(dmv)
+ MCFG_GFXDECODE_ADD("gfxdecode", dmv)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MCFG_DEFAULT_LAYOUT(layout_dmv)
diff --git a/src/mess/drivers/ec65.c b/src/mess/drivers/ec65.c
index 8f4f27222a7..6fb0ca2e72d 100644
--- a/src/mess/drivers/ec65.c
+++ b/src/mess/drivers/ec65.c
@@ -210,7 +210,7 @@ static MACHINE_CONFIG_START( ec65, ec65_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
- MCFG_GFXDECODE(ec65)
+ MCFG_GFXDECODE_ADD("gfxdecode", ec65)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
@@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( ec65k, ec65k_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
- MCFG_GFXDECODE(ec65)
+ MCFG_GFXDECODE_ADD("gfxdecode", ec65)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c
index cebd0d00074..8f3637fb94a 100644
--- a/src/mess/drivers/einstein.c
+++ b/src/mess/drivers/einstein.c
@@ -820,7 +820,7 @@ static MACHINE_CONFIG_DERIVED( einstei2, einstein )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_UPDATE_DRIVER(einstein_state, screen_update_einstein2)
- MCFG_GFXDECODE(einstei2)
+ MCFG_GFXDECODE_ADD("gfxdecode", einstei2)
/* 2 additional colors for the 80 column screen */
MCFG_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE + 2)
diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c
index e60e5349c1e..1cb8170a40c 100644
--- a/src/mess/drivers/elwro800.c
+++ b/src/mess/drivers/elwro800.c
@@ -577,7 +577,7 @@ static MACHINE_CONFIG_START( elwro800, elwro800_state )
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(elwro800_state, spectrum )
- MCFG_GFXDECODE(elwro800)
+ MCFG_GFXDECODE_ADD("gfxdecode", elwro800)
MCFG_VIDEO_START_OVERRIDE(elwro800_state, spectrum )
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index 7cc491aad7a..2ba75b61b4d 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -2781,7 +2781,7 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
MCFG_SCREEN_VISIBLE_AREA(0, 768-1, 0, 512-1)
MCFG_SCREEN_UPDATE_DRIVER(towns_state, screen_update)
- MCFG_GFXDECODE(towns)
+ MCFG_GFXDECODE_ADD("gfxdecode", towns)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c
index 9577c904c76..05ec256abee 100644
--- a/src/mess/drivers/fp1100.c
+++ b/src/mess/drivers/fp1100.c
@@ -361,7 +361,7 @@ static MACHINE_CONFIG_START( fp1100, fp1100_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update)
MCFG_PALETTE_LENGTH(8)
- MCFG_GFXDECODE(fp1100)
+ MCFG_GFXDECODE_ADD("gfxdecode", fp1100)
/* Devices */
MCFG_MC6845_ADD("crtc", H46505, "screen", MAIN_CLOCK/2, mc6845_intf) /* hand tuned to get ~60 fps */
diff --git a/src/mess/drivers/fp200.c b/src/mess/drivers/fp200.c
index b1ebd399ef8..0862db8b5e1 100644
--- a/src/mess/drivers/fp200.c
+++ b/src/mess/drivers/fp200.c
@@ -594,7 +594,7 @@ static MACHINE_CONFIG_START( fp200, fp200_state )
MCFG_SCREEN_SIZE(20*8, 8*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 8*8-1)
- MCFG_GFXDECODE(fp200)
+ MCFG_GFXDECODE_ADD("gfxdecode", fp200)
MCFG_PALETTE_LENGTH(2)
diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c
index 6accf03f7df..def94b38c1d 100644
--- a/src/mess/drivers/fp6000.c
+++ b/src/mess/drivers/fp6000.c
@@ -153,7 +153,7 @@ READ8_MEMBER(fp6000_state::fp6000_pcg_r)
WRITE8_MEMBER(fp6000_state::fp6000_pcg_w)
{
m_char_rom[offset] = data;
- machine().gfx[0]->mark_dirty(offset >> 4);
+ m_gfxdecode->gfx(0)->mark_dirty(offset >> 4);
}
WRITE8_MEMBER(fp6000_state::fp6000_6845_address_w)
@@ -318,7 +318,7 @@ static MACHINE_CONFIG_START( fp6000, fp6000_state )
MCFG_PALETTE_LENGTH(8)
// MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(fp6000)
+ MCFG_GFXDECODE_ADD("gfxdecode", fp6000)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/galaxy.c b/src/mess/drivers/galaxy.c
index dcc5f8f832f..2da489c4f45 100644
--- a/src/mess/drivers/galaxy.c
+++ b/src/mess/drivers/galaxy.c
@@ -198,7 +198,7 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state )
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 208-1)
MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy)
- MCFG_GFXDECODE(galaxy)
+ MCFG_GFXDECODE_ADD("gfxdecode", galaxy)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/galeb.c b/src/mess/drivers/galeb.c
index ee0ff68ce48..5bf38fb623c 100644
--- a/src/mess/drivers/galeb.c
+++ b/src/mess/drivers/galeb.c
@@ -138,7 +138,7 @@ static MACHINE_CONFIG_START( galeb, galeb_state )
MCFG_SCREEN_VISIBLE_AREA(0, 48*8-1, 0, 16*8-1)
MCFG_SCREEN_UPDATE_DRIVER(galeb_state, screen_update_galeb)
- MCFG_GFXDECODE( galeb )
+ MCFG_GFXDECODE_ADD("gfxdecode", galeb )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c
index 95e0e3b9fcf..d6103681379 100644
--- a/src/mess/drivers/gb.c
+++ b/src/mess/drivers/gb.c
@@ -760,7 +760,7 @@ static MACHINE_CONFIG_START( gameboy, gb_state )
MCFG_SCREEN_SIZE( 458, 154 )
MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1)
- MCFG_GFXDECODE(gb)
+ MCFG_GFXDECODE_ADD("gfxdecode", gb)
MCFG_PALETTE_LENGTH(4)
MCFG_PALETTE_INIT_OVERRIDE(gb_state,gb)
@@ -862,7 +862,7 @@ static MACHINE_CONFIG_START( megaduck, megaduck_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
- MCFG_GFXDECODE(gb)
+ MCFG_GFXDECODE_ADD("gfxdecode", gb)
MCFG_PALETTE_LENGTH(4)
MCFG_PALETTE_INIT_OVERRIDE(megaduck_state,megaduck)
diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c
index db6abfa191e..fcbc75bb431 100644
--- a/src/mess/drivers/h19.c
+++ b/src/mess/drivers/h19.c
@@ -428,7 +428,7 @@ static MACHINE_CONFIG_START( h19, h19_state )
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
- MCFG_GFXDECODE(h19)
+ MCFG_GFXDECODE_ADD("gfxdecode", h19)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c
index 388ecb2aaea..c18e2d4395c 100644
--- a/src/mess/drivers/homelab.c
+++ b/src/mess/drivers/homelab.c
@@ -760,7 +760,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state )
MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 25*8-1)
MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab2)
MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab2)
- MCFG_GFXDECODE(homelab)
+ MCFG_GFXDECODE_ADD("gfxdecode", homelab)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
@@ -790,7 +790,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab3)
MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3)
- MCFG_GFXDECODE(homelab)
+ MCFG_GFXDECODE_ADD("gfxdecode", homelab)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
@@ -820,7 +820,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
MCFG_VIDEO_START_OVERRIDE(homelab_state,brailab4)
MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3)
- MCFG_GFXDECODE(homelab)
+ MCFG_GFXDECODE_ADD("gfxdecode", homelab)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/homez80.c b/src/mess/drivers/homez80.c
index 8cf2fae1e31..c2f481e4d3e 100644
--- a/src/mess/drivers/homez80.c
+++ b/src/mess/drivers/homez80.c
@@ -294,7 +294,7 @@ static MACHINE_CONFIG_START( homez80, homez80_state )
MCFG_SCREEN_VISIBLE_AREA(0, 344-1, 0, 32*8-1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE( homez80 )
+ MCFG_GFXDECODE_ADD("gfxdecode", homez80 )
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c
index 360550218b3..6412d2ec2f9 100644
--- a/src/mess/drivers/hp9k.c
+++ b/src/mess/drivers/hp9k.c
@@ -345,7 +345,7 @@ GFXDECODE_END
void hp9k_state::putChar(UINT8 thec,int x,int y,bitmap_ind16 &bitmap)
{
- const UINT8* pchar=machine().gfx[0]->get_data(thec);
+ const UINT8* pchar=m_gfxdecode->gfx(0)->get_data(thec);
for (int py=0;py<HP9816_CHDIMY;py++)
{
@@ -416,7 +416,7 @@ static MACHINE_CONFIG_START( hp9k, hp9k_state )
MCFG_SCREEN_UPDATE_DRIVER(hp9k_state, screen_update)
- MCFG_GFXDECODE(hp9k)
+ MCFG_GFXDECODE_ADD("gfxdecode", hp9k)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/hprot1.c b/src/mess/drivers/hprot1.c
index 24614de2ffe..1e331a547ab 100644
--- a/src/mess/drivers/hprot1.c
+++ b/src/mess/drivers/hprot1.c
@@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( hprot1, hprot1_state )
MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(hprot1)
+ MCFG_GFXDECODE_ADD("gfxdecode", hprot1)
MCFG_HD44780_ADD("hd44780")
MCFG_HD44780_LCD_SIZE(2, 16)
diff --git a/src/mess/drivers/huebler.c b/src/mess/drivers/huebler.c
index 61e82fa4dde..8ff38421f29 100644
--- a/src/mess/drivers/huebler.c
+++ b/src/mess/drivers/huebler.c
@@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( amu880, amu880_state )
MCFG_SCREEN_UPDATE_DRIVER(amu880_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(9000000, 576, 0*6, 64*6, 320, 0*10, 24*10)
- MCFG_GFXDECODE(amu880)
+ MCFG_GFXDECODE_ADD("gfxdecode", amu880)
/* devices */
MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_10MHz/4, ctc_intf)
diff --git a/src/mess/drivers/ie15.c b/src/mess/drivers/ie15.c
index 2201aa20f94..fddd3396f68 100644
--- a/src/mess/drivers/ie15.c
+++ b/src/mess/drivers/ie15.c
@@ -633,7 +633,7 @@ static MACHINE_CONFIG_START( ie15, ie15_state )
MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz/2,IE15_TOTAL_HORZ,IE15_HORZ_START,
IE15_HORZ_START+IE15_DISP_HORZ,IE15_TOTAL_VERT,IE15_VERT_START,
IE15_VERT_START+IE15_DISP_VERT);
- MCFG_GFXDECODE(ie15)
+ MCFG_GFXDECODE_ADD("gfxdecode", ie15)
MCFG_PALETTE_LENGTH(2)
/* Devices */
diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c
index 87118cfed93..9ee2490f5d6 100644
--- a/src/mess/drivers/intv.c
+++ b/src/mess/drivers/intv.c
@@ -878,7 +878,7 @@ static MACHINE_CONFIG_DERIVED( intvkbd, intv )
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
/* video hardware */
- MCFG_GFXDECODE(intvkbd)
+ MCFG_GFXDECODE_ADD("gfxdecode", intvkbd)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE((STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTVKBD_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTVKBD_Y_SCALE)
MCFG_SCREEN_VISIBLE_AREA(0, (STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTVKBD_X_SCALE-1, 0, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTVKBD_Y_SCALE-1)
diff --git a/src/mess/drivers/ipds.c b/src/mess/drivers/ipds.c
index 81092cd4376..472c62018e5 100644
--- a/src/mess/drivers/ipds.c
+++ b/src/mess/drivers/ipds.c
@@ -152,7 +152,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MCFG_GFXDECODE(ipds)
+ MCFG_GFXDECODE_ADD("gfxdecode", ipds)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/irisha.c b/src/mess/drivers/irisha.c
index 49091b97ce3..69506b0a979 100644
--- a/src/mess/drivers/irisha.c
+++ b/src/mess/drivers/irisha.c
@@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( irisha, irisha_state )
MCFG_SCREEN_SIZE(320, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DRIVER(irisha_state, screen_update_irisha)
- MCFG_GFXDECODE(irisha)
+ MCFG_GFXDECODE_ADD("gfxdecode", irisha)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c
index 2ec875b3372..686436e9ce0 100644
--- a/src/mess/drivers/itt3030.c
+++ b/src/mess/drivers/itt3030.c
@@ -358,7 +358,7 @@ UINT32 itt3030_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap
for(int x = 0; x < 80; x++ )
{
UINT8 code = m_vram[x + y*128];
- machine().gfx[0]->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*16);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*16);
}
}
@@ -622,7 +622,7 @@ static MACHINE_CONFIG_START( itt3030, itt3030_state )
MCFG_FLOPPY_DRIVE_ADD("fdc:0", itt3030_floppies, "525dd", itt3030_state::itt3030_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", itt3030_floppies, "525dd", itt3030_state::itt3030_floppy_formats)
- MCFG_GFXDECODE(itt3030)
+ MCFG_GFXDECODE_ADD("gfxdecode", itt3030)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/jonos.c b/src/mess/drivers/jonos.c
index 5fb59014e8a..61722e9b53d 100644
--- a/src/mess/drivers/jonos.c
+++ b/src/mess/drivers/jonos.c
@@ -130,7 +130,7 @@ static MACHINE_CONFIG_START( jonos, jonos_state )
MCFG_SCREEN_UPDATE_DRIVER(jonos_state, screen_update)
MCFG_SCREEN_SIZE(640, 300)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 299)
- MCFG_GFXDECODE(jonos)
+ MCFG_GFXDECODE_ADD("gfxdecode", jonos)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c
index 18d70313199..4b85f7a806c 100644
--- a/src/mess/drivers/jr100.c
+++ b/src/mess/drivers/jr100.c
@@ -384,7 +384,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256 - 1, 0, 192 - 1)
MCFG_SCREEN_UPDATE_DRIVER(jr100_state, screen_update_jr100)
- MCFG_GFXDECODE(jr100)
+ MCFG_GFXDECODE_ADD("gfxdecode", jr100)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/jr200.c b/src/mess/drivers/jr200.c
index e67ff4b5ff0..f9e6c447682 100644
--- a/src/mess/drivers/jr200.c
+++ b/src/mess/drivers/jr200.c
@@ -220,13 +220,13 @@ READ8_MEMBER(jr200_state::jr200_pcg_2_r)
WRITE8_MEMBER(jr200_state::jr200_pcg_1_w)
{
m_pcg->base()[offset+0x000] = data;
- machine().gfx[1]->mark_dirty((offset+0x000) >> 3);
+ m_gfxdecode->gfx(1)->mark_dirty((offset+0x000) >> 3);
}
WRITE8_MEMBER(jr200_state::jr200_pcg_2_w)
{
m_pcg->base()[offset+0x400] = data;
- machine().gfx[1]->mark_dirty((offset+0x400) >> 3);
+ m_gfxdecode->gfx(1)->mark_dirty((offset+0x400) >> 3);
}
READ8_MEMBER(jr200_state::jr200_bios_char_r)
@@ -239,7 +239,7 @@ WRITE8_MEMBER(jr200_state::jr200_bios_char_w)
{
/* TODO: writing is presumably controlled by an I/O bit */
// m_gfx_ram->base()[offset] = data;
-// machine().gfx[0]->mark_dirty(offset >> 3);
+// m_gfxdecode->gfx(0)->mark_dirty(offset >> 3);
}
/*
@@ -533,7 +533,7 @@ void jr200_state::machine_reset()
gfx_ram[i] = gfx_rom[i];
for(i=0;i<0x800;i+=8)
- machine().gfx[0]->mark_dirty(i >> 3);
+ m_gfxdecode->gfx(0)->mark_dirty(i >> 3);
}
@@ -553,7 +553,7 @@ static MACHINE_CONFIG_START( jr200, jr200_state )
MCFG_SCREEN_VISIBLE_AREA(0, 16 + 256 + 16 - 1, 0, 16 + 192 + 16 - 1)
MCFG_SCREEN_UPDATE_DRIVER(jr200_state, screen_update_jr200)
- MCFG_GFXDECODE(jr200)
+ MCFG_GFXDECODE_ADD("gfxdecode", jr200)
MCFG_PALETTE_LENGTH(8)
diff --git a/src/mess/drivers/jtc.c b/src/mess/drivers/jtc.c
index 7867090097c..9d980a79515 100644
--- a/src/mess/drivers/jtc.c
+++ b/src/mess/drivers/jtc.c
@@ -787,7 +787,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( jtces23, basic, jtces23_state )
MCFG_SCREEN_SIZE(128, 128)
MCFG_SCREEN_VISIBLE_AREA(0, 128-1, 0, 128-1)
- MCFG_GFXDECODE(jtces23)
+ MCFG_GFXDECODE_ADD("gfxdecode", jtces23)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
@@ -809,7 +809,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( jtces40, basic, jtces40_state )
MCFG_SCREEN_SIZE(320, 192)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 192-1)
- MCFG_GFXDECODE(jtces40)
+ MCFG_GFXDECODE_ADD("gfxdecode", jtces40)
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(jtc_state,jtc_es40)
diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c
index f54447f711c..7501adf1a4d 100644
--- a/src/mess/drivers/kaypro.c
+++ b/src/mess/drivers/kaypro.c
@@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state )
MCFG_SCREEN_VISIBLE_AREA(0,80*7-1,0,24*10-1)
MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro )
MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kayproii)
- MCFG_GFXDECODE(kayproii)
+ MCFG_GFXDECODE_ADD("gfxdecode", kayproii)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
@@ -263,7 +263,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state )
MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*16-1)
MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro )
MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kaypro2x)
- MCFG_GFXDECODE(kaypro2x)
+ MCFG_GFXDECODE_ADD("gfxdecode", kaypro2x)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(kaypro_state,kaypro)
diff --git a/src/mess/drivers/korgm1.c b/src/mess/drivers/korgm1.c
index 937c167f46f..b0145389798 100644
--- a/src/mess/drivers/korgm1.c
+++ b/src/mess/drivers/korgm1.c
@@ -177,7 +177,7 @@ static MACHINE_CONFIG_START( korgm1, korgm1_state )
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MCFG_GFXDECODE(korgm1)
+ MCFG_GFXDECODE_ADD("gfxdecode", korgm1)
MCFG_PALETTE_LENGTH(8)
diff --git a/src/mess/drivers/kramermc.c b/src/mess/drivers/kramermc.c
index c937bb884e4..ba8a0fa19de 100644
--- a/src/mess/drivers/kramermc.c
+++ b/src/mess/drivers/kramermc.c
@@ -120,7 +120,7 @@ static MACHINE_CONFIG_START( kramermc, kramermc_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kramermc_state, screen_update_kramermc)
- MCFG_GFXDECODE( kramermc )
+ MCFG_GFXDECODE_ADD("gfxdecode", kramermc )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/lcmate2.c b/src/mess/drivers/lcmate2.c
index ec78190b9a1..33106f7b10f 100644
--- a/src/mess/drivers/lcmate2.c
+++ b/src/mess/drivers/lcmate2.c
@@ -242,7 +242,7 @@ static MACHINE_CONFIG_START( lcmate2, lcmate2_state )
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18-1)
MCFG_PALETTE_LENGTH(2)
MCFG_DEFAULT_LAYOUT(layout_lcd)
- MCFG_GFXDECODE(lcmate2)
+ MCFG_GFXDECODE_ADD("gfxdecode", lcmate2)
MCFG_HD44780_ADD("hd44780")
MCFG_HD44780_LCD_SIZE(2, 20)
diff --git a/src/mess/drivers/llc.c b/src/mess/drivers/llc.c
index 5057f2abb70..39573968c98 100644
--- a/src/mess/drivers/llc.c
+++ b/src/mess/drivers/llc.c
@@ -216,7 +216,7 @@ static MACHINE_CONFIG_START( llc1, llc_state )
MCFG_SCREEN_SIZE(64*8, 16*8)
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1)
MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc1)
- MCFG_GFXDECODE(llc1)
+ MCFG_GFXDECODE_ADD("gfxdecode", llc1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MCFG_DEFAULT_LAYOUT(layout_llc1)
@@ -243,7 +243,7 @@ static MACHINE_CONFIG_START( llc2, llc_state )
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc2)
- MCFG_GFXDECODE(llc2)
+ MCFG_GFXDECODE_ADD("gfxdecode", llc2)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/m79152pc.c b/src/mess/drivers/m79152pc.c
index 498aef4f2fc..d738d4b5d82 100644
--- a/src/mess/drivers/m79152pc.c
+++ b/src/mess/drivers/m79152pc.c
@@ -122,7 +122,7 @@ static MACHINE_CONFIG_START( m79152pc, m79152pc_state )
MCFG_SCREEN_SIZE(640, 300)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 300-1)
MCFG_SCREEN_UPDATE_DRIVER(m79152pc_state, screen_update_m79152pc)
- MCFG_GFXDECODE(m79152pc)
+ MCFG_GFXDECODE_ADD("gfxdecode", m79152pc)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c
index 53d54f0664b..1cd82c5958a 100644
--- a/src/mess/drivers/mbc200.c
+++ b/src/mess/drivers/mbc200.c
@@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state )
MCFG_SCREEN_SIZE(640, 400)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
MCFG_SCREEN_UPDATE_DRIVER(mbc200_state, screen_update_mbc200)
- MCFG_GFXDECODE(mbc200)
+ MCFG_GFXDECODE_ADD("gfxdecode", mbc200)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c
index b57e904b2e6..930cf8043ab 100644
--- a/src/mess/drivers/mbee.c
+++ b/src/mess/drivers/mbee.c
@@ -738,7 +738,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 19*16-1)
MCFG_SCREEN_UPDATE_DRIVER(mbee_state, screen_update_mbee)
- MCFG_GFXDECODE(mbee)
+ MCFG_GFXDECODE_ADD("gfxdecode", mbee)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_amber) // usually sold with amber or green monitor
@@ -783,7 +783,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state )
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 19*16-1)
MCFG_SCREEN_UPDATE_DRIVER(mbee_state, screen_update_mbee)
- MCFG_GFXDECODE(mbeeic)
+ MCFG_GFXDECODE_ADD("gfxdecode", mbeeic)
MCFG_PALETTE_LENGTH(96)
MCFG_PALETTE_INIT_OVERRIDE(mbee_state,mbeeic)
@@ -829,7 +829,7 @@ static MACHINE_CONFIG_DERIVED( mbeeppc, mbeeic )
MCFG_CPU_PROGRAM_MAP(mbeeppc_mem)
MCFG_CPU_IO_MAP(mbeeppc_io)
MCFG_VIDEO_START_OVERRIDE(mbee_state,mbeeppc)
- MCFG_GFXDECODE(mbeeppc)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", mbeeppc)
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(mbee_state,mbeeppc)
MCFG_DEVICE_REMOVE("crtc")
diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c
index b87dbea7e1e..4d1aeda9726 100644
--- a/src/mess/drivers/megadriv.c
+++ b/src/mess/drivers/megadriv.c
@@ -642,6 +642,9 @@ static MACHINE_CONFIG_START( genesis_scd, md_cons_state )
MCFG_MACHINE_RESET_OVERRIDE( md_cons_state, ms_megadriv )
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_US, 0)
+ MCFG_SEGACD_GFXDECODE("gfxdecode")
+
+ MCFG_GFXDECODE_ADD("gfxdecode", empty)
MCFG_CDROM_ADD( "cdrom",scd_cdrom )
MCFG_SOFTWARE_LIST_ADD("cd_list","segacd")
@@ -654,6 +657,9 @@ static MACHINE_CONFIG_START( md_scd, md_cons_state )
MCFG_MACHINE_RESET_OVERRIDE( md_cons_state, ms_megadriv )
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_EUROPE, 0)
+ MCFG_SEGACD_GFXDECODE("gfxdecode")
+
+ MCFG_GFXDECODE_ADD("gfxdecode", empty)
MCFG_CDROM_ADD( "cdrom",scd_cdrom )
@@ -667,6 +673,10 @@ static MACHINE_CONFIG_START( mdj_scd, md_cons_state )
MCFG_MACHINE_RESET_OVERRIDE( md_cons_state, ms_megadriv )
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_JAPAN, 0)
+ MCFG_SEGACD_GFXDECODE("gfxdecode")
+
+ MCFG_GFXDECODE_ADD("gfxdecode", empty)
+
MCFG_CDROM_ADD( "cdrom",scd_cdrom )
MCFG_SOFTWARE_LIST_ADD("cd_list","megacdj")
@@ -676,6 +686,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( genesis_32x_scd, genesis_32x )
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_US, 0)
+ MCFG_SEGACD_GFXDECODE("gfxdecode")
+
+ MCFG_GFXDECODE_ADD("gfxdecode", empty)
//MCFG_QUANTUM_PERFECT_CPU("32x_master_sh2")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/microtan.c b/src/mess/drivers/microtan.c
index 65cb0b877b7..b49e18154d8 100644
--- a/src/mess/drivers/microtan.c
+++ b/src/mess/drivers/microtan.c
@@ -229,7 +229,7 @@ static MACHINE_CONFIG_START( microtan, microtan_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*16, 16*16-1)
MCFG_SCREEN_UPDATE_DRIVER(microtan_state, screen_update_microtan)
- MCFG_GFXDECODE(microtan)
+ MCFG_GFXDECODE_ADD("gfxdecode", microtan)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/mikro80.c b/src/mess/drivers/mikro80.c
index c96e50d5540..0e3282fcbad 100644
--- a/src/mess/drivers/mikro80.c
+++ b/src/mess/drivers/mikro80.c
@@ -183,7 +183,7 @@ static MACHINE_CONFIG_START( mikro80, mikro80_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mikro80_state, screen_update_mikro80)
- MCFG_GFXDECODE(mikro80)
+ MCFG_GFXDECODE_ADD("gfxdecode", mikro80)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/mikrosha.c b/src/mess/drivers/mikrosha.c
index 30c4bdb9f4b..d349f5d6d3e 100644
--- a/src/mess/drivers/mikrosha.c
+++ b/src/mess/drivers/mikrosha.c
@@ -218,7 +218,7 @@ static MACHINE_CONFIG_START( mikrosha, mikrosha_state )
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE(mikrosha)
+ MCFG_GFXDECODE_ADD("gfxdecode", mikrosha)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(mikrosha_state,radio86)
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index 1eb45f26dfa..7499c19da07 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -1524,7 +1524,7 @@ static MACHINE_CONFIG_FRAGMENT ( chess_common )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(polgar_state,chess_lcd)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_GFXDECODE(chess_lcd)
+ MCFG_GFXDECODE_ADD("gfxdecode", chess_lcd)
MCFG_HD44780_ADD("hd44780")
MCFG_HD44780_LCD_SIZE(2, 16)
diff --git a/src/mess/drivers/modellot.c b/src/mess/drivers/modellot.c
index 26f2cec7479..8b282b2dc39 100644
--- a/src/mess/drivers/modellot.c
+++ b/src/mess/drivers/modellot.c
@@ -166,7 +166,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state )
MCFG_SCREEN_SIZE(64*8, 16*16)
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1)
MCFG_SCREEN_UPDATE_DRIVER(modellot_state, screen_update_modellot)
- MCFG_GFXDECODE( modellot )
+ MCFG_GFXDECODE_ADD("gfxdecode", modellot )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/molecular.c b/src/mess/drivers/molecular.c
index 457a5a4b7f8..3b567c88803 100644
--- a/src/mess/drivers/molecular.c
+++ b/src/mess/drivers/molecular.c
@@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( molecula, molecula_state )
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MCFG_GFXDECODE(molecula)
+ MCFG_GFXDECODE_ADD("gfxdecode", molecula)
MCFG_PALETTE_LENGTH(8)
diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c
index 058ab7eaac9..5dbc43732db 100644
--- a/src/mess/drivers/multi8.c
+++ b/src/mess/drivers/multi8.c
@@ -183,7 +183,7 @@ UINT32 multi8_state::screen_update_multi8(screen_device &screen, bitmap_ind16 &b
}
}
- // machine().gfx[0]->opaque(bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8);
+ // m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8);
// draw cursor
if(mc6845_cursor_addr+0xc000 == count)
@@ -674,7 +674,7 @@ static MACHINE_CONFIG_START( multi8, multi8_state )
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DRIVER(multi8_state, screen_update_multi8)
MCFG_PALETTE_LENGTH(8)
- MCFG_GFXDECODE(multi8)
+ MCFG_GFXDECODE_ADD("gfxdecode", multi8)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/mx2178.c b/src/mess/drivers/mx2178.c
index 4d0e4e31dda..cb875ade955 100644
--- a/src/mess/drivers/mx2178.c
+++ b/src/mess/drivers/mx2178.c
@@ -182,7 +182,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state )
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_GFXDECODE(mx2178)
+ MCFG_GFXDECODE_ADD("gfxdecode", mx2178)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c
index a60fb06d750..7e1384fdd22 100644
--- a/src/mess/drivers/myb3k.c
+++ b/src/mess/drivers/myb3k.c
@@ -283,7 +283,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state )
MCFG_SCREEN_SIZE(320, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DRIVER(myb3k_state, screen_update_myb3k)
- MCFG_GFXDECODE(myb3k)
+ MCFG_GFXDECODE_ADD("gfxdecode", myb3k)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c
index 85361029319..dc1b8daa2c2 100644
--- a/src/mess/drivers/mycom.c
+++ b/src/mess/drivers/mycom.c
@@ -562,7 +562,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state )
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 192-1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(mycom)
+ MCFG_GFXDECODE_ADD("gfxdecode", mycom)
/* Manual states clock is 1.008mhz for 40 cols, and 2.016 mhz for 80 cols.
The CRTC is a HD46505S - same as a 6845. The start registers need to be readable. */
diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c
index 15944a08a6b..f42e38249c8 100644
--- a/src/mess/drivers/mz2000.c
+++ b/src/mess/drivers/mz2000.c
@@ -883,11 +883,11 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
+ MCFG_SCREEN_UPDATE_DRIVER(mz2000_state, screen_update_mz2000)
- MCFG_GFXDECODE(mz2000)
+ MCFG_GFXDECODE_ADD("gfxdecode", mz2000)
MCFG_PALETTE_LENGTH(8)
- MCFG_SCREEN_UPDATE_DRIVER(mz2000_state, screen_update_mz2000)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c
index 0974cc5f08a..c488cbbdb98 100644
--- a/src/mess/drivers/mz2500.c
+++ b/src/mess/drivers/mz2500.c
@@ -934,9 +934,9 @@ void mz2500_state::mz2500_ram_write(UINT16 offset, UINT8 data, UINT8 bank_num)
{
m_pcg_ram[offset] = data;
if((offset & 0x1800) == 0x0000)
- machine().gfx[3]->mark_dirty((offset) >> 3);
+ m_gfxdecode->gfx(3)->mark_dirty((offset) >> 3);
else
- machine().gfx[4]->mark_dirty((offset & 0x7ff) >> 3);
+ m_gfxdecode->gfx(4)->mark_dirty((offset & 0x7ff) >> 3);
}
break;
}
@@ -1776,8 +1776,8 @@ void mz2500_state::machine_start()
save_pointer(NAME(m_emm_ram), 0x100000);
/* TODO: gfx[4] crashes as per now */
- machine().gfx[3] = auto_alloc(machine(), gfx_element(machine(), mz2500_pcg_layout_1bpp, (UINT8 *)m_pcg_ram, 0x10, 0));
- machine().gfx[4] = auto_alloc(machine(), gfx_element(machine(), mz2500_pcg_layout_3bpp, (UINT8 *)m_pcg_ram, 4, 0));
+ m_gfxdecode->set_gfx(3, auto_alloc(machine(), gfx_element(machine(), mz2500_pcg_layout_1bpp, (UINT8 *)m_pcg_ram, 0x10, 0)));
+ m_gfxdecode->set_gfx(4, auto_alloc(machine(), gfx_element(machine(), mz2500_pcg_layout_3bpp, (UINT8 *)m_pcg_ram, 4, 0)));
}
void mz2500_state::machine_reset()
@@ -2160,7 +2160,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state )
MCFG_PALETTE_LENGTH(0x200)
- MCFG_GFXDECODE(mz2500)
+ MCFG_GFXDECODE_ADD("gfxdecode", mz2500)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c
index 40709ffe6be..82a3a57eb5e 100644
--- a/src/mess/drivers/mz3500.c
+++ b/src/mess/drivers/mz3500.c
@@ -879,7 +879,7 @@ static MACHINE_CONFIG_START( mz3500, mz3500_state )
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MCFG_GFXDECODE(mz3500)
+ MCFG_GFXDECODE_ADD("gfxdecode", mz3500)
MCFG_PALETTE_LENGTH(8)
diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c
index 34d48d18fe7..51ae7529424 100644
--- a/src/mess/drivers/mz700.c
+++ b/src/mess/drivers/mz700.c
@@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( mz700, mz_state )
MCFG_SCREEN_RAW_PARAMS(XTAL_17_73447MHz/2, 568, 0, 40*8, 312, 0, 25*8)
MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz700)
- MCFG_GFXDECODE(mz700)
+ MCFG_GFXDECODE_ADD("gfxdecode", mz700)
MCFG_PALETTE_LENGTH(256*2)
/* sound hardware */
@@ -374,7 +374,8 @@ static MACHINE_CONFIG_DERIVED( mz800, mz700 )
MCFG_CPU_PROGRAM_MAP(mz800_mem)
MCFG_CPU_IO_MAP(mz800_io)
- MCFG_GFXDECODE(mz800)
+ MCFG_GFXDECODE_MODIFY("gfxdecode",mz800)
+
MCFG_VIDEO_START_OVERRIDE(mz_state,mz800)
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mess/drivers/mz80.c b/src/mess/drivers/mz80.c
index a66d3b2aee7..12f4627dff5 100644
--- a/src/mess/drivers/mz80.c
+++ b/src/mess/drivers/mz80.c
@@ -289,7 +289,7 @@ static MACHINE_CONFIG_START( mz80k, mz80_state )
MCFG_SCREEN_SIZE(320, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199)
MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80k)
- MCFG_GFXDECODE(mz80k)
+ MCFG_GFXDECODE_ADD("gfxdecode", mz80k)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
@@ -310,7 +310,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mz80kj, mz80k )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80kj)
- MCFG_GFXDECODE(mz80kj)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", mz80kj)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mz80a, mz80k )
diff --git a/src/mess/drivers/nakajies.c b/src/mess/drivers/nakajies.c
index 85b5937c3e7..2f4e65af9bb 100644
--- a/src/mess/drivers/nakajies.c
+++ b/src/mess/drivers/nakajies.c
@@ -749,7 +749,7 @@ static MACHINE_CONFIG_START( nakajies210, nakajies_state )
MCFG_SCREEN_UPDATE_DRIVER( nakajies_state, screen_update )
MCFG_SCREEN_SIZE( 80 * 6, 8 * 8 )
MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 8 * 8 - 1 )
- MCFG_GFXDECODE(wales210)
+ MCFG_GFXDECODE_ADD("gfxdecode", wales210)
MCFG_PALETTE_LENGTH( 2 )
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -765,18 +765,18 @@ static MACHINE_CONFIG_START( nakajies210, nakajies_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dator3k, nakajies210 )
- MCFG_GFXDECODE(dator3k)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", dator3k)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nakajies220, nakajies210 )
- MCFG_GFXDECODE(drwrt400)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", drwrt400)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nakajies250, nakajies210 )
MCFG_SCREEN_MODIFY( "screen" )
MCFG_SCREEN_SIZE( 80 * 6, 16 * 8 )
MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 16 * 8 - 1 )
- MCFG_GFXDECODE(drwrt200)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", drwrt200)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c
index 461b4701b56..c714d17c3e4 100644
--- a/src/mess/drivers/nanos.c
+++ b/src/mess/drivers/nanos.c
@@ -569,7 +569,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state )
MCFG_SCREEN_UPDATE_DRIVER(nanos_state, screen_update)
MCFG_SCREEN_SIZE(80*8, 25*10)
MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*10-1)
- MCFG_GFXDECODE(nanos)
+ MCFG_GFXDECODE_ADD("gfxdecode", nanos)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c
index 5e5cdd00ee3..d21e10bb3ed 100644
--- a/src/mess/drivers/nascom1.c
+++ b/src/mess/drivers/nascom1.c
@@ -295,7 +295,7 @@ static MACHINE_CONFIG_START( nascom1, nascom1_state )
MCFG_SCREEN_VISIBLE_AREA(0, 48 * 8 - 1, 0, 16 * 16 - 1)
MCFG_SCREEN_UPDATE_DRIVER(nascom1_state, screen_update_nascom1)
- MCFG_GFXDECODE(nascom1)
+ MCFG_GFXDECODE_ADD("gfxdecode", nascom1)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
@@ -352,7 +352,7 @@ static MACHINE_CONFIG_DERIVED( nascom2, nascom1 )
MCFG_SCREEN_VISIBLE_AREA(0, 48 * 8 - 1, 0, 16 * 14 - 1)
MCFG_SCREEN_UPDATE_DRIVER(nascom1_state, screen_update_nascom2)
- MCFG_GFXDECODE(nascom2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", nascom2)
MCFG_FD1793_ADD("wd1793", nascom2_wd17xx_interface )
diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c
index cafc29733ed..5ee1244eff8 100644
--- a/src/mess/drivers/newbrain.c
+++ b/src/mess/drivers/newbrain.c
@@ -1371,7 +1371,7 @@ static MACHINE_CONFIG_START( newbrain_a, newbrain_state )
MCFG_CPU_IO_MAP(newbrain_cop_io_map)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, COP400_MICROBUS_ENABLED )
- MCFG_GFXDECODE(newbrain)
+ MCFG_GFXDECODE_ADD("gfxdecode", newbrain)
MCFG_TIMER_DRIVER_ADD_PERIODIC("cop_regint", newbrain_state, cop_regint_tick, attotime::from_usec(12500))
diff --git a/src/mess/drivers/odyssey2.c b/src/mess/drivers/odyssey2.c
index 917f87a0153..a6a02b895cf 100644
--- a/src/mess/drivers/odyssey2.c
+++ b/src/mess/drivers/odyssey2.c
@@ -776,7 +776,7 @@ static MACHINE_CONFIG_START( odyssey2, odyssey2_state )
MCFG_SCREEN_RAW_PARAMS( XTAL_7_15909MHz/2 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8244_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
- MCFG_GFXDECODE( odyssey2 )
+ MCFG_GFXDECODE_ADD("gfxdecode", odyssey2 )
MCFG_PALETTE_LENGTH(32)
/* sound hardware */
@@ -805,7 +805,7 @@ static MACHINE_CONFIG_START( videopac, odyssey2_state )
MCFG_SCREEN_RAW_PARAMS( XTAL_17_73447MHz/5 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8245_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
- MCFG_GFXDECODE( odyssey2 )
+ MCFG_GFXDECODE_ADD("gfxdecode", odyssey2 )
MCFG_PALETTE_LENGTH(16)
/* sound hardware */
@@ -833,7 +833,7 @@ static MACHINE_CONFIG_START( g7400, g7400_state )
MCFG_SCREEN_RAW_PARAMS( 3540000 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8245_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
- MCFG_GFXDECODE( odyssey2 )
+ MCFG_GFXDECODE_ADD("gfxdecode", odyssey2 )
MCFG_PALETTE_LENGTH(16)
MCFG_I8243_ADD( "i8243", NOOP, WRITE8(g7400_state,i8243_port_w))
@@ -867,7 +867,7 @@ static MACHINE_CONFIG_START( odyssey3, g7400_state )
MCFG_SCREEN_RAW_PARAMS( 3540000 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8244_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
- MCFG_GFXDECODE( odyssey2 )
+ MCFG_GFXDECODE_ADD("gfxdecode", odyssey2 )
MCFG_PALETTE_LENGTH(16)
MCFG_I8243_ADD( "i8243", NOOP, WRITE8(g7400_state,i8243_port_w))
diff --git a/src/mess/drivers/okean240.c b/src/mess/drivers/okean240.c
index 4ebd731088d..5209e568d58 100644
--- a/src/mess/drivers/okean240.c
+++ b/src/mess/drivers/okean240.c
@@ -500,7 +500,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( okean240a, okean240t )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(okean240a_io)
- MCFG_GFXDECODE(okean240a)
+ MCFG_GFXDECODE_ADD("gfxdecode", okean240a)
MCFG_DEVICE_REMOVE(TERMINAL_TAG)
MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, terminal_intf)
MACHINE_CONFIG_END
@@ -508,7 +508,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( okean240, okean240t )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(okean240_io)
- MCFG_GFXDECODE(okean240)
+ MCFG_GFXDECODE_ADD("gfxdecode", okean240)
MCFG_DEVICE_REMOVE(TERMINAL_TAG)
MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, terminal_intf)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c
index 254a31cd9d5..dd1bb6a8436 100644
--- a/src/mess/drivers/osborne1.c
+++ b/src/mess/drivers/osborne1.c
@@ -242,7 +242,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(osborne1_state, screen_update)
MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK/2, 512, 0, 416, 260, 0, 240 )
- MCFG_GFXDECODE(osborne1)
+ MCFG_GFXDECODE_ADD("gfxdecode", osborne1)
MCFG_PALETTE_LENGTH( 3 )
MCFG_SPEAKER_STANDARD_MONO( "mono" )
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index 771925f5117..6219a77774b 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -756,7 +756,7 @@ static MACHINE_CONFIG_START( osi600, sb2m600_state )
/* video hardware */
MCFG_FRAGMENT_ADD(osi600_video)
- MCFG_GFXDECODE(osi)
+ MCFG_GFXDECODE_ADD("gfxdecode", osi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -784,7 +784,7 @@ static MACHINE_CONFIG_START( uk101, uk101_state )
/* video hardware */
MCFG_FRAGMENT_ADD(uk101_video)
- MCFG_GFXDECODE(osi)
+ MCFG_GFXDECODE_ADD("gfxdecode", osi)
/* cassette ACIA */
MCFG_ACIA6850_ADD("acia_0", uk101_acia_intf)
@@ -806,7 +806,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state )
/* video hardware */
MCFG_FRAGMENT_ADD(osi630_video)
- MCFG_GFXDECODE(osi)
+ MCFG_GFXDECODE_ADD("gfxdecode", osi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/p2000t.c b/src/mess/drivers/p2000t.c
index 82eb5e417fb..d84c5230c2a 100644
--- a/src/mess/drivers/p2000t.c
+++ b/src/mess/drivers/p2000t.c
@@ -260,7 +260,7 @@ static MACHINE_CONFIG_START( p2000m, p2000t_state )
MCFG_SCREEN_VISIBLE_AREA(0, 80 * 12 - 1, 0, 24 * 20 - 1)
MCFG_VIDEO_START_OVERRIDE(p2000t_state,p2000m)
MCFG_SCREEN_UPDATE_DRIVER(p2000t_state, screen_update_p2000m)
- MCFG_GFXDECODE( p2000m )
+ MCFG_GFXDECODE_ADD("gfxdecode", p2000m )
MCFG_PALETTE_LENGTH(4)
MCFG_PALETTE_INIT_OVERRIDE(p2000t_state,p2000m)
diff --git a/src/mess/drivers/partner.c b/src/mess/drivers/partner.c
index 10a65c9a319..7097d7b6eef 100644
--- a/src/mess/drivers/partner.c
+++ b/src/mess/drivers/partner.c
@@ -207,7 +207,7 @@ static MACHINE_CONFIG_START( partner, partner_state )
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE(partner)
+ MCFG_GFXDECODE_ADD("gfxdecode", partner)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(partner_state,radio86)
diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c
index 3567d2f6566..762ef8e9f08 100644
--- a/src/mess/drivers/paso1600.c
+++ b/src/mess/drivers/paso1600.c
@@ -174,7 +174,7 @@ READ8_MEMBER( paso1600_state::paso1600_pcg_r )
WRITE8_MEMBER( paso1600_state::paso1600_pcg_w )
{
m_p_pcg[offset] = data;
- machine().gfx[0]->mark_dirty(offset >> 3);
+ m_gfxdecode->gfx(0)->mark_dirty(offset >> 3);
}
WRITE8_MEMBER( paso1600_state::paso1600_6845_address_w )
@@ -348,7 +348,7 @@ static MACHINE_CONFIG_START( paso1600, paso1600_state )
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(paso1600_state, screen_update_paso1600)
- MCFG_GFXDECODE(paso1600)
+ MCFG_GFXDECODE_ADD("gfxdecode", paso1600)
MCFG_PALETTE_LENGTH(8)
// MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pasopia.c b/src/mess/drivers/pasopia.c
index 810097267ad..4d8e5569d8b 100644
--- a/src/mess/drivers/pasopia.c
+++ b/src/mess/drivers/pasopia.c
@@ -368,7 +368,7 @@ static MACHINE_CONFIG_START( pasopia, pasopia_state )
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update)
- MCFG_GFXDECODE(pasopia)
+ MCFG_GFXDECODE_ADD("gfxdecode", pasopia)
MCFG_PALETTE_LENGTH(8)
/* Devices */
diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c
index 2f20534e65f..a9c78d6640c 100644
--- a/src/mess/drivers/pasopia7.c
+++ b/src/mess/drivers/pasopia7.c
@@ -1017,7 +1017,7 @@ static MACHINE_CONFIG_DERIVED( p7_raster, p7_base )
MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7)
MCFG_PALETTE_LENGTH(8)
MCFG_PALETTE_INIT_OVERRIDE(pasopia7_state,p7_raster)
- MCFG_GFXDECODE( pasopia7 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pasopia7 )
MCFG_MC6845_ADD("crtc", H46505, "screen", VDP_CLOCK, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */
MACHINE_CONFIG_END
@@ -1033,7 +1033,7 @@ static MACHINE_CONFIG_DERIVED( p7_lcd, p7_base )
MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7)
MCFG_PALETTE_LENGTH(8)
MCFG_PALETTE_INIT_OVERRIDE(pasopia7_state,p7_lcd)
- MCFG_GFXDECODE( pasopia7 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pasopia7 )
MCFG_MC6845_ADD("crtc", H46505, "screen", LCD_CLOCK, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */
MCFG_DEFAULT_LAYOUT( layout_lcd )
diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c
index 7d6252e7ed7..4bf41223331 100644
--- a/src/mess/drivers/pb1000.c
+++ b/src/mess/drivers/pb1000.c
@@ -520,7 +520,7 @@ static MACHINE_CONFIG_START( pb1000, pb1000_state )
MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 32-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE( pb1000 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pb1000 )
MCFG_HD44352_ADD("hd44352", 910000, hd44352_pb1000_conf)
diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c
index 2cc2f161499..2dd3a780449 100644
--- a/src/mess/drivers/pc.c
+++ b/src/mess/drivers/pc.c
@@ -830,7 +830,7 @@ static MACHINE_CONFIG_START( pccga, pc_state )
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250_1", ins8250_uart_device, cts_w))
MCFG_FRAGMENT_ADD( pcvideo_cga )
- MCFG_GFXDECODE(ibm5150)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibm5150)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -877,7 +877,7 @@ static GFXDECODE_START( pc10iii )
GFXDECODE_END
static MACHINE_CONFIG_DERIVED( pc10iii, pccga )
- MCFG_GFXDECODE(pc10iii)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pc10iii)
MACHINE_CONFIG_END
static const gfx_layout europc_8_charlayout =
@@ -948,7 +948,7 @@ static MACHINE_CONFIG_START( europc, europc_pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_aga )
- MCFG_GFXDECODE(europc)
+ MCFG_GFXDECODE_ADD("gfxdecode", europc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1026,7 +1026,7 @@ static MACHINE_CONFIG_START( t1000hx, tandy_pc_state )
/* video hardware */
MCFG_PCVIDEO_T1000_ADD("pcvideo_t1000")
- MCFG_GFXDECODE(t1000)
+ MCFG_GFXDECODE_ADD("gfxdecode", t1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1095,7 +1095,7 @@ static MACHINE_CONFIG_START( t1000_16, tandy_pc_state )
/* video hardware */
MCFG_PCVIDEO_T1000_ADD("pcvideo_t1000")
- MCFG_GFXDECODE(t1000)
+ MCFG_GFXDECODE_ADD("gfxdecode", t1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1165,7 +1165,7 @@ static MACHINE_CONFIG_START( t1000_286, tandy_pc_state )
/* video hardware */
MCFG_PCVIDEO_T1000_ADD("pcvideo_t1000")
- MCFG_GFXDECODE(t1000)
+ MCFG_GFXDECODE_ADD("gfxdecode", t1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1240,7 +1240,7 @@ static MACHINE_CONFIG_START( ibmpcjr, tandy_pc_state )
/* video hardware */
MCFG_PCVIDEO_PCJR_ADD("pcvideo_pcjr")
- MCFG_GFXDECODE(ibmpcjr)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibmpcjr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1300,7 +1300,7 @@ static MACHINE_CONFIG_DERIVED( ibmpcjx, ibmpcjr )
MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "35dd", pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "35dd", pc_state::floppy_formats)
- MCFG_GFXDECODE(ibmpcjx)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", ibmpcjx)
MACHINE_CONFIG_END
@@ -1321,7 +1321,7 @@ static MACHINE_CONFIG_START( asst128, pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_mc1502 )
- MCFG_GFXDECODE(ibmpcjr)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibmpcjr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1464,7 +1464,7 @@ static MACHINE_CONFIG_START( poisk2, pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_poisk2 )
- MCFG_GFXDECODE(ibm5150)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibm5150)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1527,7 +1527,7 @@ static MACHINE_CONFIG_START( zenith, pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_cga )
- MCFG_GFXDECODE(ibm5150)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibm5150)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1590,7 +1590,7 @@ static MACHINE_CONFIG_START( olivetti, pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_cga )
- MCFG_GFXDECODE(ibm5150)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibm5150)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1653,7 +1653,7 @@ static MACHINE_CONFIG_START( ibm5550, pc_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_cga )
- MCFG_GFXDECODE(ibm5150)
+ MCFG_GFXDECODE_ADD("gfxdecode", ibm5150)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c
index 9e22886433f..15a08b73736 100644
--- a/src/mess/drivers/pc100.c
+++ b/src/mess/drivers/pc100.c
@@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( pc100, pc100_state )
/* TODO: Unknown Pixel Clock and CRTC is dynamic */
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*4, 1024, 0, 768, 264*2, 0, 512)
MCFG_SCREEN_UPDATE_DRIVER(pc100_state, screen_update_pc100)
- MCFG_GFXDECODE(pc100)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc100)
MCFG_PALETTE_LENGTH(16)
// MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c
index a6c7c233702..5bc2861ab3b 100644
--- a/src/mess/drivers/pc2000.c
+++ b/src/mess/drivers/pc2000.c
@@ -758,7 +758,7 @@ static MACHINE_CONFIG_START( pc2000, pc2000_state )
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18-1)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(pc2000)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc2000)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_HD44780_ADD("hd44780")
@@ -810,7 +810,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( gl3000s, pc2000, gl3000s_state )
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 16-1)
MCFG_SCREEN_UPDATE_DRIVER( gl3000s_state, screen_update )
- MCFG_GFXDECODE(gl3000s)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gl3000s)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gl4000, pc2000 )
diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c
index dabbf5aa5bb..a360a51753c 100644
--- a/src/mess/drivers/pc4.c
+++ b/src/mess/drivers/pc4.c
@@ -231,7 +231,7 @@ static MACHINE_CONFIG_START( pc4, pc4_state )
MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 36-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(pc4)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c
index 226a1aa0e93..6050ca3d5ba 100644
--- a/src/mess/drivers/pc6001.c
+++ b/src/mess/drivers/pc6001.c
@@ -2315,7 +2315,7 @@ static MACHINE_CONFIG_START( pc6001, pc6001_state )
// MCFG_CPU_ADD("subcpu", I8049, 7987200)
- MCFG_GFXDECODE(pc6001m2)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc6001m2)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2372,7 +2372,7 @@ static MACHINE_CONFIG_DERIVED( pc6001m2, pc6001 )
MCFG_CPU_PROGRAM_MAP(pc6001m2_map)
MCFG_CPU_IO_MAP(pc6001m2_io)
- MCFG_GFXDECODE(pc6001m2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pc6001m2)
MCFG_SOUND_ADD("upd7752", UPD7752, PC6001_MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c
index 4b2100337d7..0900f68d42b 100644
--- a/src/mess/drivers/pc8801.c
+++ b/src/mess/drivers/pc8801.c
@@ -2665,7 +2665,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK_24KHz,848,0,640,448,0,400)
MCFG_SCREEN_UPDATE_DRIVER(pc8801_state, screen_update)
- MCFG_GFXDECODE( pc8801 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pc8801 )
MCFG_PALETTE_LENGTH(0x10)
// MCFG_VIDEO_START_OVERRIDE(pc8801_state,pc8801)
diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c
index 6c3679c4d01..82294ebb74d 100644
--- a/src/mess/drivers/pc88va.c
+++ b/src/mess/drivers/pc88va.c
@@ -643,8 +643,8 @@ WRITE16_MEMBER(pc88va_state::sys_mem_w)
if(knj_offset >= 0x50000/2 && knj_offset <= 0x53fff/2) // TODO: there's an area that can be write protected
{
COMBINE_DATA(&knj_ram[knj_offset]);
- machine().gfx[0]->mark_dirty((knj_offset * 2) / 8);
- machine().gfx[1]->mark_dirty((knj_offset * 2) / 32);
+ m_gfxdecode->gfx(0)->mark_dirty((knj_offset * 2) / 8);
+ m_gfxdecode->gfx(1)->mark_dirty((knj_offset * 2) / 32);
}
}
break;
@@ -1875,7 +1875,7 @@ static MACHINE_CONFIG_START( pc88va, pc88va_state )
MCFG_PALETTE_LENGTH(32)
// MCFG_PALETTE_INIT_OVERRIDE(pc88va_state, pc8801 )
- MCFG_GFXDECODE( pc88va )
+ MCFG_GFXDECODE_ADD("gfxdecode", pc88va )
MCFG_I8255_ADD( "d8255_2", master_fdd_intf )
MCFG_I8255_ADD( "d8255_3", r232c_ctrl_intf )
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index 81b280878fb..44d3ac62252 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -1489,13 +1489,13 @@ WRITE8_MEMBER(pc9801_state::pc9801_a0_w)
if((m_font_addr & 0xff00) == 0x5600 || (m_font_addr & 0xff00) == 0x5700)
{
m_kanji_rom[pcg_offset] = data;
- machine().gfx[2]->mark_dirty(pcg_offset >> 5);
+ m_gfxdecode->gfx(2)->mark_dirty(pcg_offset >> 5);
}
return;
}
}
- //printf("Write to undefined port [%02x] <- %02x\n",offset+0xa0,data);
+ //printf("Write to undefined port [%02x) <- %02x\n",offset+0xa0,data);
}
}
@@ -1901,7 +1901,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_knjram_w)
if((m_font_addr & 0xff00) == 0x5600 || (m_font_addr & 0xff00) == 0x5700)
{
m_kanji_rom[pcg_offset] = data;
- machine().gfx[2]->mark_dirty(pcg_offset >> 5);
+ m_gfxdecode->gfx(2)->mark_dirty(pcg_offset >> 5);
}
}
@@ -3734,7 +3734,7 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state )
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(pc9801_state,pc9801)
- MCFG_GFXDECODE(pc9801)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc9801)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3798,7 +3798,7 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state )
MCFG_PALETTE_LENGTH(16+16)
MCFG_PALETTE_INIT_OVERRIDE(pc9801_state,pc9801)
- MCFG_GFXDECODE(pc9801)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc9801)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3876,7 +3876,7 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state )
MCFG_PALETTE_LENGTH(16+16+256)
MCFG_PALETTE_INIT_OVERRIDE(pc9801_state,pc9801)
- MCFG_GFXDECODE(pc9801)
+ MCFG_GFXDECODE_ADD("gfxdecode", pc9801)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c
index 37d266fa636..f5b32d8fcd5 100644
--- a/src/mess/drivers/pcm.c
+++ b/src/mess/drivers/pcm.c
@@ -326,7 +326,7 @@ static MACHINE_CONFIG_START( pcm, pcm_state )
MCFG_SCREEN_UPDATE_DRIVER(pcm_state, screen_update)
MCFG_SCREEN_SIZE(64*8, 16*8)
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1)
- MCFG_GFXDECODE(pcm)
+ MCFG_GFXDECODE_ADD("gfxdecode", pcm)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pda600.c b/src/mess/drivers/pda600.c
index 14628f7d640..39037c89937 100644
--- a/src/mess/drivers/pda600.c
+++ b/src/mess/drivers/pda600.c
@@ -213,7 +213,7 @@ static MACHINE_CONFIG_START( pda600, pda600_state )
MCFG_SCREEN_SIZE(240, 320)
MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 320-1)
MCFG_SCREEN_UPDATE_DRIVER( pda600_state, screen_update )
- MCFG_GFXDECODE(pda600)
+ MCFG_GFXDECODE_ADD("gfxdecode", pda600)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pdp1.c b/src/mess/drivers/pdp1.c
index 1fdc498ced1..dda6d83e061 100644
--- a/src/mess/drivers/pdp1.c
+++ b/src/mess/drivers/pdp1.c
@@ -1963,7 +1963,7 @@ static MACHINE_CONFIG_START( pdp1, pdp1_state )
MCFG_DEVICE_ADD("typewriter", PDP1_PRINTER, 0)
MCFG_DEVICE_ADD("drum", PDP1_CYLINDER, 0)
- MCFG_GFXDECODE(pdp1)
+ MCFG_GFXDECODE_ADD("gfxdecode", pdp1)
MCFG_PALETTE_LENGTH(pen_crt_num_levels + sizeof(pdp1_colors) / 3 + sizeof(pdp1_palette))
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c
index cc3ef427c33..762acfb75c0 100644
--- a/src/mess/drivers/pegasus.c
+++ b/src/mess/drivers/pegasus.c
@@ -477,7 +477,7 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state )
MCFG_SCREEN_UPDATE_DRIVER(pegasus_state, screen_update)
MCFG_SCREEN_SIZE(32*8, 16*16)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 16*16-1)
- MCFG_GFXDECODE(pegasus)
+ MCFG_GFXDECODE_ADD("gfxdecode", pegasus)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pentagon.c b/src/mess/drivers/pentagon.c
index 76cfb998b5b..490dd6f6b36 100644
--- a/src/mess/drivers/pentagon.c
+++ b/src/mess/drivers/pentagon.c
@@ -180,7 +180,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( pentagon, spectrum_128, pentagon_state )
MCFG_MACHINE_RESET_OVERRIDE(pentagon_state, pentagon )
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
- MCFG_GFXDECODE(pentagon)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pentagon)
MCFG_SOFTWARE_LIST_ADD("cass_list_pen","pentagon_cass")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/phunsy.c b/src/mess/drivers/phunsy.c
index 7d1543ff697..5958f95729b 100644
--- a/src/mess/drivers/phunsy.c
+++ b/src/mess/drivers/phunsy.c
@@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state )
*/
MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz, 480, 0, 64*6, 313, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(phunsy_state, screen_update)
- MCFG_GFXDECODE(phunsy)
+ MCFG_GFXDECODE_ADD("gfxdecode", phunsy)
MCFG_PALETTE_LENGTH(8)
/* sound hardware */
diff --git a/src/mess/drivers/pk8020.c b/src/mess/drivers/pk8020.c
index ec78259b03f..bc986a19fec 100644
--- a/src/mess/drivers/pk8020.c
+++ b/src/mess/drivers/pk8020.c
@@ -216,7 +216,7 @@ static MACHINE_CONFIG_START( pk8020, pk8020_state )
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(pk8020_state, screen_update_pk8020)
- MCFG_GFXDECODE(pk8020)
+ MCFG_GFXDECODE_ADD("gfxdecode", pk8020)
MCFG_PALETTE_LENGTH(16)
diff --git a/src/mess/drivers/plan80.c b/src/mess/drivers/plan80.c
index 9411b52c1e2..445baab9b15 100644
--- a/src/mess/drivers/plan80.c
+++ b/src/mess/drivers/plan80.c
@@ -241,7 +241,7 @@ static MACHINE_CONFIG_START( plan80, plan80_state )
MCFG_SCREEN_UPDATE_DRIVER(plan80_state, screen_update)
MCFG_SCREEN_SIZE(48*6, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 48*6-1, 0, 32*8-1)
- MCFG_GFXDECODE(plan80)
+ MCFG_GFXDECODE_ADD("gfxdecode", plan80)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/pocketc.c b/src/mess/drivers/pocketc.c
index c77859eb8eb..6e00f7ce0b5 100644
--- a/src/mess/drivers/pocketc.c
+++ b/src/mess/drivers/pocketc.c
@@ -727,7 +727,7 @@ static MACHINE_CONFIG_FRAGMENT( pocketc )
MCFG_SCREEN_VISIBLE_AREA(0, 594-1, 0, 273-1)
// MCFG_SCREEN_SIZE(640, 273)
// MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 273-1)
- MCFG_GFXDECODE( pc1401 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pc1401 )
MCFG_PALETTE_LENGTH(8*2)
MCFG_PALETTE_INIT( pocketc )
@@ -777,7 +777,7 @@ static MACHINE_CONFIG_START( pc1250, pc1251_state )
MCFG_SCREEN_SIZE(608, 300)
MCFG_SCREEN_VISIBLE_AREA(0, 608-1, 0, 300-1)
MCFG_SCREEN_UPDATE_DRIVER(pc1251_state, screen_update_pc1251)
- MCFG_GFXDECODE( pc1251 )
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pc1251 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pc1251, pc1250 )
diff --git a/src/mess/drivers/poly88.c b/src/mess/drivers/poly88.c
index bae385646a0..92db0a1050b 100644
--- a/src/mess/drivers/poly88.c
+++ b/src/mess/drivers/poly88.c
@@ -182,7 +182,7 @@ static MACHINE_CONFIG_START( poly88, poly88_state )
MCFG_SCREEN_VISIBLE_AREA(0, 64*10-1, 0, 16*15-1)
MCFG_SCREEN_UPDATE_DRIVER(poly88_state, screen_update_poly88)
- MCFG_GFXDECODE(poly88)
+ MCFG_GFXDECODE_ADD("gfxdecode", poly88)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c
index 381281f1f8b..50bbde9679b 100644
--- a/src/mess/drivers/portfoli.c
+++ b/src/mess/drivers/portfoli.c
@@ -853,7 +853,7 @@ static MACHINE_CONFIG_START( portfolio, portfolio_state )
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(portfolio)
+ MCFG_GFXDECODE_ADD("gfxdecode", portfolio)
MCFG_HD61830_ADD(HD61830_TAG, XTAL_4_9152MHz/2/2, lcdc_intf)
diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c
index 857f9767f23..feb1a1b76c9 100644
--- a/src/mess/drivers/psion.c
+++ b/src/mess/drivers/psion.c
@@ -486,7 +486,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state )
MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(psion)
+ MCFG_GFXDECODE_ADD("gfxdecode", psion)
MCFG_HD44780_ADD("hd44780")
MCFG_HD44780_LCD_SIZE(2, 16)
diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c
index 16a1670b055..b7c4ec101d7 100644
--- a/src/mess/drivers/ptcsol.c
+++ b/src/mess/drivers/ptcsol.c
@@ -762,7 +762,7 @@ static MACHINE_CONFIG_START( sol20, sol20_state )
MCFG_SCREEN_UPDATE_DRIVER(sol20_state, screen_update)
MCFG_SCREEN_SIZE(576, 208)
MCFG_SCREEN_VISIBLE_AREA(0, 575, 0, 207)
- MCFG_GFXDECODE(sol20)
+ MCFG_GFXDECODE_ADD("gfxdecode", sol20)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index 5cb1f07eb0f..c954c6acfde 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -193,7 +193,7 @@ WRITE8_MEMBER( pv1000_state::pv1000_gfxram_w )
UINT8 *gfxram = memregion( "gfxram" )->base();
gfxram[ offset ] = data;
- machine().gfx[1]->mark_dirty(offset/32);
+ m_gfxdecode->gfx(1)->mark_dirty(offset/32);
}
@@ -352,12 +352,12 @@ UINT32 pv1000_state::screen_update_pv1000(screen_device &screen, bitmap_ind16 &b
if ( tile < 0xe0 || m_force_pattern )
{
tile += ( m_pcg_bank << 8);
- machine().gfx[0]->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
}
else
{
tile -= 0xe0;
- machine().gfx[1]->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
+ m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
}
}
}
@@ -462,7 +462,7 @@ static MACHINE_CONFIG_START( pv1000, pv1000_state )
MCFG_SCREEN_UPDATE_DRIVER(pv1000_state, screen_update_pv1000)
MCFG_PALETTE_LENGTH( 8 )
- MCFG_GFXDECODE( pv1000 )
+ MCFG_GFXDECODE_ADD("gfxdecode", pv1000 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD( "pv1000_sound", PV1000, 17897725 )
diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c
index 10b65a6c522..93a925e36e0 100644
--- a/src/mess/drivers/px8.c
+++ b/src/mess/drivers/px8.c
@@ -792,7 +792,7 @@ static MACHINE_CONFIG_START( px8, px8_state )
MCFG_SCREEN_SIZE(480, 64)
MCFG_SCREEN_VISIBLE_AREA(0, 479, 0, 63)
- MCFG_GFXDECODE(px8)
+ MCFG_GFXDECODE_ADD("gfxdecode", px8)
MCFG_PALETTE_LENGTH(2)
/* sound hardware */
diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c
index cd36765405f..1ea39b27246 100644
--- a/src/mess/drivers/pyl601.c
+++ b/src/mess/drivers/pyl601.c
@@ -566,7 +566,7 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state )
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE(pyl601)
+ MCFG_GFXDECODE_ADD("gfxdecode", pyl601)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
@@ -591,7 +591,7 @@ static MACHINE_CONFIG_DERIVED( pyl601a, pyl601 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK( XTAL_2MHz)
- MCFG_GFXDECODE(pyl601a)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pyl601a)
MCFG_DEVICE_REMOVE("crtc")
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz, pyl601a_crtc6845_interface)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c
index 216f3fb7b6f..52920c5b419 100644
--- a/src/mess/drivers/qx10.c
+++ b/src/mess/drivers/qx10.c
@@ -859,7 +859,7 @@ static MACHINE_CONFIG_START( qx10, qx10_state )
MCFG_SCREEN_UPDATE_DRIVER(qx10_state, screen_update)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MCFG_GFXDECODE(qx10)
+ MCFG_GFXDECODE_ADD("gfxdecode", qx10)
MCFG_PALETTE_LENGTH(8)
/* Devices */
diff --git a/src/mess/drivers/radio86.c b/src/mess/drivers/radio86.c
index b26e494e70e..eb8127b5506 100644
--- a/src/mess/drivers/radio86.c
+++ b/src/mess/drivers/radio86.c
@@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( radio86, radio86_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE(radio86)
+ MCFG_GFXDECODE_ADD("gfxdecode", radio86)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(radio86_state,radio86)
diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c
index 623b94b0895..92d54855a27 100644
--- a/src/mess/drivers/rainbow.c
+++ b/src/mess/drivers/rainbow.c
@@ -1131,7 +1131,7 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state )
MCFG_SCREEN_SIZE(132*10, 49*10)
MCFG_SCREEN_VISIBLE_AREA(0, 80 * 10-1, 0, 24 * 10-1)
MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow)
- MCFG_GFXDECODE(rainbow)
+ MCFG_GFXDECODE_ADD("gfxdecode", rainbow)
MCFG_PALETTE_LENGTH(4)
MCFG_RAINBOW_VIDEO_ADD("vt100_video", video_interface)
diff --git a/src/mess/drivers/replicator.c b/src/mess/drivers/replicator.c
index a90f033ce51..a9e5f1cf16c 100644
--- a/src/mess/drivers/replicator.c
+++ b/src/mess/drivers/replicator.c
@@ -668,7 +668,7 @@ static MACHINE_CONFIG_START( replicator, replicator_state )
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18*2-1)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(replicator)
+ MCFG_GFXDECODE_ADD("gfxdecode", replicator)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_HD44780_ADD("hd44780")
diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c
index 1af73918924..578c25f56c2 100644
--- a/src/mess/drivers/rex6000.c
+++ b/src/mess/drivers/rex6000.c
@@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( rex6000, rex6000_state )
MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 120-1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_LENGTH(2)
- MCFG_GFXDECODE(rex6000)
+ MCFG_GFXDECODE_ADD("gfxdecode", rex6000)
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", rex6000_state, rex6000, "rex,ds2", 0)
diff --git a/src/mess/drivers/rt1715.c b/src/mess/drivers/rt1715.c
index 5147cec7a61..7220c1e7cb2 100644
--- a/src/mess/drivers/rt1715.c
+++ b/src/mess/drivers/rt1715.c
@@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( rt1715, rt1715_state )
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE(rt1715)
+ MCFG_GFXDECODE_ADD("gfxdecode", rt1715)
MCFG_PALETTE_LENGTH(3)
MCFG_I8275_ADD("a26", rt1715_i8275_intf)
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index adc12006e91..a586b39107e 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -470,7 +470,7 @@ static MACHINE_CONFIG_START( rx78, rx78_state )
MCFG_SCREEN_SIZE(192, 184)
MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 184-1)
MCFG_PALETTE_LENGTH(16+1) //+1 for the background color
- MCFG_GFXDECODE(rx78)
+ MCFG_GFXDECODE_ADD("gfxdecode", rx78)
MCFG_CARTSLOT_ADD("cart")
MCFG_CARTSLOT_EXTENSION_LIST("rom")
diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c
index 4a06ae177c5..92b733d27f2 100644
--- a/src/mess/drivers/saturn.c
+++ b/src/mess/drivers/saturn.c
@@ -782,7 +782,7 @@ static MACHINE_CONFIG_START( saturn, sat_console_state )
MCFG_SCREEN_UPDATE_DRIVER(sat_console_state, screen_update_stv_vdp2)
MCFG_PALETTE_LENGTH(2048+(2048*2))//standard palette + extra memory for rgb brightness.
- MCFG_GFXDECODE(stv)
+ MCFG_GFXDECODE_ADD("gfxdecode", stv)
MCFG_VIDEO_START_OVERRIDE(sat_console_state,stv_vdp2)
diff --git a/src/mess/drivers/sbc6510.c b/src/mess/drivers/sbc6510.c
index d7bb32eab77..7d052fa17dd 100644
--- a/src/mess/drivers/sbc6510.c
+++ b/src/mess/drivers/sbc6510.c
@@ -311,7 +311,7 @@ static MACHINE_CONFIG_START( sbc6510, sbc6510_state )
MCFG_CPU_DATA_MAP(sbc6510_video_data)
MCFG_CPU_IO_MAP(sbc6510_video_io)
- MCFG_GFXDECODE(sbc6510)
+ MCFG_GFXDECODE_ADD("gfxdecode", sbc6510)
/* video hardware */
MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf)
diff --git a/src/mess/drivers/scorpion.c b/src/mess/drivers/scorpion.c
index 1405246c2dc..c72c44b134c 100644
--- a/src/mess/drivers/scorpion.c
+++ b/src/mess/drivers/scorpion.c
@@ -417,7 +417,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( scorpion, spectrum_128, scorpion_state )
MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion )
MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion )
- MCFG_GFXDECODE(scorpion)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", scorpion)
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
@@ -429,11 +429,11 @@ static MACHINE_CONFIG_DERIVED_CLASS( scorpion, spectrum_128, scorpion_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( profi, scorpion )
- MCFG_GFXDECODE(profi)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", profi)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quorum, scorpion )
- MCFG_GFXDECODE(quorum)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", quorum)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/scv.c b/src/mess/drivers/scv.c
index 78b4408b8cb..a34972c012c 100644
--- a/src/mess/drivers/scv.c
+++ b/src/mess/drivers/scv.c
@@ -832,7 +832,7 @@ static MACHINE_CONFIG_START( scv, scv_state )
MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz/2, 456, 24, 24+192, 262, 23, 23+222 ) /* TODO: Verify */
MCFG_SCREEN_UPDATE_DRIVER(scv_state, screen_update_scv)
- MCFG_GFXDECODE(scv)
+ MCFG_GFXDECODE_ADD("gfxdecode", scv)
MCFG_PALETTE_LENGTH( 16 )
/* Sound is generated by UPD1771C clocked at XTAL_6MHz */
diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c
index e2bfdd0a520..9e8d1d375d9 100644
--- a/src/mess/drivers/sm1800.c
+++ b/src/mess/drivers/sm1800.c
@@ -183,7 +183,7 @@ static MACHINE_CONFIG_START( sm1800, sm1800_state )
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(640, 480)
- MCFG_GFXDECODE(sm1800)
+ MCFG_GFXDECODE_ADD("gfxdecode", sm1800)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_PALETTE_LENGTH(3)
diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c
index b1962fbddd0..e011d9aa182 100644
--- a/src/mess/drivers/smc777.c
+++ b/src/mess/drivers/smc777.c
@@ -352,7 +352,7 @@ WRITE8_MEMBER(smc777_state::smc777_pcg_w)
m_pcg[vram_index] = data;
- machine().gfx[0]->mark_dirty(vram_index >> 3);
+ m_gfxdecode->gfx(0)->mark_dirty(vram_index >> 3);
}
READ8_MEMBER(smc777_state::smc777_fbuf_r)
@@ -984,7 +984,7 @@ void smc777_state::machine_start()
save_pointer(NAME(m_gvram), 0x8000);
save_pointer(NAME(m_pcg), 0x800);
- machine().gfx[0] = auto_alloc(machine(), gfx_element(machine(), smc777_charlayout, (UINT8 *)m_pcg, 8, 0));
+ m_gfxdecode->set_gfx(0, auto_alloc(machine(), gfx_element(machine(), smc777_charlayout, (UINT8 *)m_pcg, 8, 0)));
}
void smc777_state::machine_reset()
diff --git a/src/mess/drivers/sorcerer.c b/src/mess/drivers/sorcerer.c
index dd4763b77bf..ac6c39683d9 100644
--- a/src/mess/drivers/sorcerer.c
+++ b/src/mess/drivers/sorcerer.c
@@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( sorcerer, sorcerer_state )
MCFG_SCREEN_SIZE(64*8, 30*8)
MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(sorcerer_state, screen_update)
- MCFG_GFXDECODE(sorcerer)
+ MCFG_GFXDECODE_ADD("gfxdecode", sorcerer)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/spec128.c b/src/mess/drivers/spec128.c
index a74004c546a..dcb5945c4c3 100644
--- a/src/mess/drivers/spec128.c
+++ b/src/mess/drivers/spec128.c
@@ -308,7 +308,7 @@ MACHINE_CONFIG_DERIVED( spectrum_128, spectrum )
MCFG_SCREEN_RAW_PARAMS(X1_128_SINCLAIR / 2.5f, 456, 0, 352, 311, 0, 296)
MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum_128 )
- MCFG_GFXDECODE(spec128)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", spec128)
/* sound hardware */
MCFG_SOUND_ADD("ay8912", AY8912, 1773400)
diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c
index 62d523965c3..8228164142d 100644
--- a/src/mess/drivers/specpls3.c
+++ b/src/mess/drivers/specpls3.c
@@ -388,7 +388,7 @@ static MACHINE_CONFIG_DERIVED( spectrum_plus3, spectrum_128 )
MCFG_CPU_IO_MAP(spectrum_plus3_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.01)
- MCFG_GFXDECODE(specpls3)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", specpls3)
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_plus3 )
diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c
index cd9ee17a035..f509b722dd0 100644
--- a/src/mess/drivers/spectrum.c
+++ b/src/mess/drivers/spectrum.c
@@ -706,7 +706,7 @@ MACHINE_CONFIG_START( spectrum_common, spectrum_state )
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(spectrum_state, spectrum )
- MCFG_GFXDECODE(spectrum)
+ MCFG_GFXDECODE_ADD("gfxdecode", spectrum)
MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum )
/* sound hardware */
diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c
index f2d0e2c305a..5b32da2a208 100644
--- a/src/mess/drivers/super80.c
+++ b/src/mess/drivers/super80.c
@@ -652,7 +652,7 @@ static MACHINE_CONFIG_START( super80, super80_state )
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
- MCFG_GFXDECODE(super80)
+ MCFG_GFXDECODE_ADD("gfxdecode", super80)
MCFG_DEFAULT_LAYOUT( layout_super80 )
MCFG_VIDEO_START_OVERRIDE(super80_state,super80)
@@ -679,7 +679,7 @@ static MACHINE_CONFIG_START( super80, super80_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( super80d, super80 )
- MCFG_GFXDECODE(super80d)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", super80d)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80d)
MACHINE_CONFIG_END
@@ -687,7 +687,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( super80e, super80 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(super80e_io)
- MCFG_GFXDECODE(super80e)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", super80e)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80e)
MACHINE_CONFIG_END
@@ -696,7 +696,7 @@ static MACHINE_CONFIG_DERIVED( super80m, super80 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(super80m_map)
- MCFG_GFXDECODE(super80m)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", super80m)
MCFG_PALETTE_LENGTH(16)
MCFG_PALETTE_INIT_OVERRIDE(super80_state,super80m)
@@ -726,7 +726,7 @@ static MACHINE_CONFIG_START( super80v, super80_state )
MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / SUPER80V_DOTS, super80v_crtc)
- MCFG_GFXDECODE(super80v)
+ MCFG_GFXDECODE_ADD("gfxdecode", super80v)
MCFG_DEFAULT_LAYOUT( layout_super80 )
MCFG_VIDEO_START_OVERRIDE(super80_state,super80v)
diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c
index 208a373cf95..23d6ed83eee 100644
--- a/src/mess/drivers/supracan.c
+++ b/src/mess/drivers/supracan.c
@@ -343,7 +343,7 @@ void supracan_state::supracan_tilemap_get_info_common(int layer, tile_data &tile
int flipxy = (supracan_vram[count] & 0x0c00)>>10;
int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank;
- SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy));
+ SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, palette, TILE_FLIPXY(flipxy));
}
// I wonder how different this really is.. my guess, not at all.
@@ -372,7 +372,7 @@ void supracan_state::supracan_tilemap_get_info_roz(int layer, tile_data &tileinf
if (count & 0x20) tile ^= 1;
tile |= (count & 0xc0)>>2;
- SET_TILE_INFO_MEMBER(region, tile, 0, 0);
+ SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, 0, 0);
return;
}
@@ -396,7 +396,7 @@ void supracan_state::supracan_tilemap_get_info_roz(int layer, tile_data &tileinf
int flipxy = (supracan_vram[count] & 0x0c00)>>10;
int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank;
- SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy));
+ SET_TILE_INFO_MEMBER(m_gfxdecode, region, tile, palette, TILE_FLIPXY(flipxy));
}
@@ -528,7 +528,7 @@ void supracan_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
int sprite_xflip = (supracan_vram[i+1] & 0x0800) >> 11;
int sprite_yflip = (supracan_vram[i+1] & 0x0400) >> 10;
//int xscale = (supracan_vram[i+2] & 0xf000) >> 12;
- gfx_element *gfx = machine().gfx[region];
+ gfx_element *gfx = m_gfxdecode->gfx(region);
@@ -1114,11 +1114,11 @@ WRITE16_MEMBER( supracan_state::supracan_vram_w )
write_swapped_byte(offset*2, (data & 0x00ff));
// mark tiles of each depth as dirty
- machine().gfx[0]->mark_dirty((offset*2)/(64));
- machine().gfx[1]->mark_dirty((offset*2)/(32));
- machine().gfx[2]->mark_dirty((offset*2)/(16));
- machine().gfx[3]->mark_dirty((offset*2)/(512));
- machine().gfx[4]->mark_dirty((offset*2)/(8));
+ m_gfxdecode->gfx(0)->mark_dirty((offset*2)/(64));
+ m_gfxdecode->gfx(1)->mark_dirty((offset*2)/(32));
+ m_gfxdecode->gfx(2)->mark_dirty((offset*2)/(16));
+ m_gfxdecode->gfx(3)->mark_dirty((offset*2)/(512));
+ m_gfxdecode->gfx(4)->mark_dirty((offset*2)/(8));
}
@@ -1924,7 +1924,7 @@ static MACHINE_CONFIG_START( supracan, supracan_state )
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, 348, 0, 256, 256, 0, 240 ) /* No idea if this is correct */
MCFG_SCREEN_UPDATE_DRIVER(supracan_state, screen_update_supracan)
MCFG_PALETTE_LENGTH( 32768 )
- MCFG_GFXDECODE(supracan)
+ MCFG_GFXDECODE_ADD("gfxdecode", supracan)
MCFG_CARTSLOT_ADD("cart")
MCFG_CARTSLOT_EXTENSION_LIST("bin")
diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c
index 7402eb75d62..45acd9e9bd0 100644
--- a/src/mess/drivers/svi318.c
+++ b/src/mess/drivers/svi318.c
@@ -452,7 +452,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE(svi328)
+ MCFG_GFXDECODE_ADD("gfxdecode", svi328)
MCFG_MC6845_ADD("crtc", MC6845, "svi806", XTAL_12MHz / 8, svi806_crtc6845_interface)
diff --git a/src/mess/drivers/tek410x.c b/src/mess/drivers/tek410x.c
index 8987027bd3c..0bfbdfe54a1 100644
--- a/src/mess/drivers/tek410x.c
+++ b/src/mess/drivers/tek410x.c
@@ -99,7 +99,7 @@ static MACHINE_CONFIG_START( tek4107a, tek4107a_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_PALETTE_LENGTH(64)
- MCFG_GFXDECODE(tek4107a)
+ MCFG_GFXDECODE_ADD("gfxdecode", tek4107a)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tek4109a, tek4107a )
diff --git a/src/mess/drivers/ti990_10.c b/src/mess/drivers/ti990_10.c
index f8e9b770858..5b44b0e7d44 100644
--- a/src/mess/drivers/ti990_10.c
+++ b/src/mess/drivers/ti990_10.c
@@ -229,10 +229,11 @@ static MACHINE_CONFIG_START( ti990_10, ti990_10_state )
MCFG_SCREEN_VISIBLE_AREA(0, 560-1, 0, /*250*/280-1)
MCFG_SCREEN_UPDATE_DRIVER(ti990_10_state, screen_update_ti990_10)
- MCFG_GFXDECODE(vdt911)
+ MCFG_GFXDECODE_ADD("gfxdecode", vdt911)
MCFG_PALETTE_LENGTH(8)
MCFG_VDT911_VIDEO_ADD("vdt911", vdt911_intf)
+ MCFG_VDT911_VIDEO_GFXDECODE("gfxdecode")
/* 911 VDT has a beep tone generator */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/ti990_4.c b/src/mess/drivers/ti990_4.c
index 0c4f1656c8f..8765ea72568 100644
--- a/src/mess/drivers/ti990_4.c
+++ b/src/mess/drivers/ti990_4.c
@@ -262,17 +262,19 @@ static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
#endif
#if VIDEO_911
- MCFG_GFXDECODE(vdt911)
+ MCFG_GFXDECODE_ADD("gfxdecode", vdt911)
MCFG_PALETTE_LENGTH(8)
#else
- MCFG_GFXDECODE(asr733)
+ MCFG_GFXDECODE_ADD("gfxdecode", asr733)
MCFG_PALETTE_LENGTH(2)
#endif
#if VIDEO_911
MCFG_VDT911_VIDEO_ADD("vdt911", vdt911_intf)
+ MCFG_VDT911_VIDEO_GFXDECODE("gfxdecode")
#else
MCFG_ASR733_VIDEO_ADD("asr733", asr733_intf)
+ MCFG_ASR733_VIDEO_GFXDECODE("gfxdecode")
#endif
#if VIDEO_911
diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c
index 4a9ed948e78..94fa221a35d 100644
--- a/src/mess/drivers/ti99_2.c
+++ b/src/mess/drivers/ti99_2.c
@@ -176,7 +176,7 @@ UINT32 ti99_2_state::screen_update_ti99_2(screen_device &screen, bitmap_ind16 &b
for (i = 0; i < 768; i++)
{
/* Is the char code masked or not ??? */
- machine().gfx[0]->opaque(bitmap,cliprect, videoram[i] & 0x7F, 0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[i] & 0x7F, 0,
0, 0, sx, sy);
sx += 8;
@@ -395,7 +395,7 @@ static MACHINE_CONFIG_START( ti99_2, ti99_2_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
MCFG_SCREEN_UPDATE_DRIVER(ti99_2_state, screen_update_ti99_2)
- MCFG_GFXDECODE(ti99_2)
+ MCFG_GFXDECODE_ADD("gfxdecode", ti99_2)
MCFG_PALETTE_LENGTH(2)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/tim100.c b/src/mess/drivers/tim100.c
index c5b9a89fe08..92de929ffad 100644
--- a/src/mess/drivers/tim100.c
+++ b/src/mess/drivers/tim100.c
@@ -130,7 +130,7 @@ static MACHINE_CONFIG_START( tim100, tim100_state )
MCFG_SCREEN_SIZE(40*16, 16*16)
MCFG_SCREEN_VISIBLE_AREA(0, 40*16-1, 0, 16*16-1)
- MCFG_GFXDECODE( tim100 )
+ MCFG_GFXDECODE_ADD("gfxdecode", tim100 )
MCFG_I8275_ADD ( "i8276", tim100_i8276_interface)
diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c
index b6bbc6db97a..17f49ee2ee3 100644
--- a/src/mess/drivers/timex.c
+++ b/src/mess/drivers/timex.c
@@ -743,7 +743,7 @@ static MACHINE_CONFIG_DERIVED( ts2068, spectrum_128 )
MCFG_SCREEN_VISIBLE_AREA(0, TS2068_SCREEN_WIDTH-1, 0, TS2068_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_ts2068)
- MCFG_GFXDECODE(ts2068)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", ts2068)
MCFG_VIDEO_START_OVERRIDE(spectrum_state, ts2068 )
diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c
index f264c9f9bf0..e5d50e24aa1 100644
--- a/src/mess/drivers/tk80bs.c
+++ b/src/mess/drivers/tk80bs.c
@@ -67,7 +67,7 @@ UINT32 tk80bs_state::screen_update_tk80bs(screen_device &screen, bitmap_ind16 &b
{
int tile = m_p_videoram[count++];
- machine().gfx[0]->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8);
}
}
@@ -193,7 +193,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state )
MCFG_SCREEN_UPDATE_DRIVER(tk80bs_state, screen_update_tk80bs)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(tk80bs)
+ MCFG_GFXDECODE_ADD("gfxdecode", tk80bs)
/* Devices */
MCFG_I8255_ADD( "ppi", ppi_intf)
diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c
index ec2db385717..854da73f197 100644
--- a/src/mess/drivers/trs80.c
+++ b/src/mess/drivers/trs80.c
@@ -591,7 +591,7 @@ static MACHINE_CONFIG_START( trs80, trs80_state ) // the original model I,
MCFG_SCREEN_VISIBLE_AREA(0,64*6-1,0,16*12-1)
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_trs80)
- MCFG_GFXDECODE(trs80)
+ MCFG_GFXDECODE_ADD("gfxdecode", trs80)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
@@ -640,7 +640,8 @@ static MACHINE_CONFIG_DERIVED( model3, model1 )
MCFG_MACHINE_RESET_OVERRIDE(trs80_state, trs80m4 )
- MCFG_GFXDECODE(trs80m4)
+ MCFG_GFXDECODE_MODIFY("gfxdecode",trs80m4)
+
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_trs80m4)
MCFG_SCREEN_SIZE(80*8, 240)
@@ -665,7 +666,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ht1080z, sys80 )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_ht1080z)
- MCFG_GFXDECODE(ht1080z)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", ht1080z)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lnw80, model1 )
@@ -674,7 +675,8 @@ static MACHINE_CONFIG_DERIVED( lnw80, model1 )
MCFG_CPU_IO_MAP( lnw80_io)
MCFG_MACHINE_RESET_OVERRIDE(trs80_state, lnw80 )
- MCFG_GFXDECODE(lnw80)
+ MCFG_GFXDECODE_MODIFY("gfxdecode",lnw80)
+
MCFG_PALETTE_LENGTH(8)
MCFG_PALETTE_INIT_OVERRIDE(trs80_state,lnw80)
MCFG_SCREEN_MODIFY("screen")
@@ -688,7 +690,7 @@ static MACHINE_CONFIG_DERIVED( radionic, model1 )
MCFG_SCREEN_SIZE(64*8, 16*16)
MCFG_SCREEN_VISIBLE_AREA(0,64*8-1,0,16*16-1)
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_radionic)
- MCFG_GFXDECODE(radionic)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", radionic)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( meritum, sys80 )
@@ -697,7 +699,7 @@ static MACHINE_CONFIG_DERIVED( meritum, sys80 )
MCFG_CPU_IO_MAP( meritum_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_meritum)
- MCFG_GFXDECODE(meritum)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", meritum)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mess/drivers/tx0.c b/src/mess/drivers/tx0.c
index 4cdd01b1b64..e4f5c89379e 100644
--- a/src/mess/drivers/tx0.c
+++ b/src/mess/drivers/tx0.c
@@ -1597,7 +1597,7 @@ static MACHINE_CONFIG_START( tx0_64kw, tx0_state )
MCFG_DEVICE_ADD("typewriter", TX0_PRINTER, 0)
MCFG_DEVICE_ADD("magtape", TX0_MAGTAPE, 0)
- MCFG_GFXDECODE(tx0)
+ MCFG_GFXDECODE_ADD("gfxdecode", tx0)
MCFG_PALETTE_LENGTH(pen_crt_num_levels + sizeof(tx0_colors) / 3 + sizeof(tx0_palette))
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/unior.c b/src/mess/drivers/unior.c
index 8a056273aad..2694e8825c3 100644
--- a/src/mess/drivers/unior.c
+++ b/src/mess/drivers/unior.c
@@ -455,7 +455,7 @@ static MACHINE_CONFIG_START( unior, unior_state )
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", i8275_device, screen_update)
- MCFG_GFXDECODE(unior)
+ MCFG_GFXDECODE_ADD("gfxdecode", unior)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(unior_state,unior)
diff --git a/src/mess/drivers/unistar.c b/src/mess/drivers/unistar.c
index 9f11cc3932a..49165c6d1e4 100644
--- a/src/mess/drivers/unistar.c
+++ b/src/mess/drivers/unistar.c
@@ -99,7 +99,7 @@ static MACHINE_CONFIG_START( unistar, unistar_state )
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(unistar_state, screen_update_unistar)
- MCFG_GFXDECODE(unistar)
+ MCFG_GFXDECODE_ADD("gfxdecode", unistar)
MCFG_PALETTE_LENGTH(3)
MCFG_PALETTE_INIT_OVERRIDE(unistar_state, unistar)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/ut88.c b/src/mess/drivers/ut88.c
index ce2e7593d5f..909e9b4a1e9 100644
--- a/src/mess/drivers/ut88.c
+++ b/src/mess/drivers/ut88.c
@@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( ut88, ut88_state )
MCFG_SCREEN_UPDATE_DRIVER(ut88_state, screen_update_ut88)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE( ut88 )
+ MCFG_GFXDECODE_ADD("gfxdecode", ut88 )
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/v6809.c b/src/mess/drivers/v6809.c
index 6ad532d9f5d..d6eb7276d21 100644
--- a/src/mess/drivers/v6809.c
+++ b/src/mess/drivers/v6809.c
@@ -341,7 +341,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state )
MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(v6809)
+ MCFG_GFXDECODE_ADD("gfxdecode", v6809)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/vg5k.c b/src/mess/drivers/vg5k.c
index 3de754db648..90f46e1b197 100644
--- a/src/mess/drivers/vg5k.c
+++ b/src/mess/drivers/vg5k.c
@@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( vg5k, vg5k_state )
MCFG_SCREEN_SIZE(336, 300)
MCFG_SCREEN_VISIBLE_AREA(00, 336-1, 00, 270-1)
- MCFG_GFXDECODE(vg5k)
+ MCFG_GFXDECODE_ADD("gfxdecode", vg5k)
MCFG_PALETTE_LENGTH(8)
/* sound hardware */
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index 5e2a467e506..8ac33079ecc 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state )
MCFG_SCREEN_VISIBLE_AREA(0, 80*10-1, 0, 25*10-1)
MCFG_SCREEN_UPDATE_DRIVER(vt100_state, screen_update_vt100)
- MCFG_GFXDECODE(vt100)
+ MCFG_GFXDECODE_ADD("gfxdecode", vt100)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/vt240.c b/src/mess/drivers/vt240.c
index fd2cc8cd74c..3c7a8e395a6 100644
--- a/src/mess/drivers/vt240.c
+++ b/src/mess/drivers/vt240.c
@@ -178,7 +178,7 @@ static MACHINE_CONFIG_START( vt240, vt240_state )
MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
- MCFG_GFXDECODE(vt240)
+ MCFG_GFXDECODE_ADD("gfxdecode", vt240)
MCFG_UPD7220_ADD("upd7220", XTAL_4MHz / 4, hgdc_intf, upd7220_map) //unknown clock
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/vta2000.c b/src/mess/drivers/vta2000.c
index 594cf3360bc..6d9c644fd4f 100644
--- a/src/mess/drivers/vta2000.c
+++ b/src/mess/drivers/vta2000.c
@@ -171,7 +171,7 @@ static MACHINE_CONFIG_START( vta2000, vta2000_state )
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 25*12-1)
MCFG_SCREEN_UPDATE_DRIVER(vta2000_state, screen_update_vta2000)
MCFG_PALETTE_LENGTH(3)
- MCFG_GFXDECODE(vta2000)
+ MCFG_GFXDECODE_ADD("gfxdecode", vta2000)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/vtech2.c b/src/mess/drivers/vtech2.c
index 63b6d91869e..711161d9e77 100644
--- a/src/mess/drivers/vtech2.c
+++ b/src/mess/drivers/vtech2.c
@@ -442,7 +442,7 @@ static MACHINE_CONFIG_START( laser350, vtech2_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 88*8-1, 0*8, 24*8+32-1)
MCFG_SCREEN_UPDATE_DRIVER(vtech2_state, screen_update_laser)
- MCFG_GFXDECODE( vtech2 )
+ MCFG_GFXDECODE_ADD("gfxdecode", vtech2 )
MCFG_PALETTE_LENGTH(528)
diff --git a/src/mess/drivers/wswan.c b/src/mess/drivers/wswan.c
index e60152518a2..78de5af8e2c 100644
--- a/src/mess/drivers/wswan.c
+++ b/src/mess/drivers/wswan.c
@@ -141,7 +141,7 @@ static MACHINE_CONFIG_START( wswan, wswan_state )
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_GFXDECODE(wswan)
+ MCFG_GFXDECODE_ADD("gfxdecode", wswan)
MCFG_PALETTE_LENGTH(16)
/* sound hardware */
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index d1a2595ed1b..4880bf1b5f5 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1508,7 +1508,7 @@ static MACHINE_CONFIG_START( x07, x07_state )
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 32-1)
MCFG_PALETTE_LENGTH(2)
MCFG_DEFAULT_LAYOUT(layout_lcd)
- MCFG_GFXDECODE(x07)
+ MCFG_GFXDECODE_ADD("gfxdecode", x07)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c
index bca3bed4c7b..80aa50f557f 100644
--- a/src/mess/drivers/x1.c
+++ b/src/mess/drivers/x1.c
@@ -1165,7 +1165,7 @@ WRITE8_MEMBER( x1_state::x1_pcg_w )
pcg_offset &= 0x7ff;
- machine().gfx[3]->mark_dirty(pcg_offset >> 3);
+ m_gfxdecode->gfx(3)->mark_dirty(pcg_offset >> 3);
}
else // Compatible Mode
{
@@ -1182,7 +1182,7 @@ WRITE8_MEMBER( x1_state::x1_pcg_w )
pcg_offset &= 0x7ff;
- machine().gfx[3]->mark_dirty(pcg_offset >> 3);
+ m_gfxdecode->gfx(3)->mark_dirty(pcg_offset >> 3);
}
}
}
@@ -2443,7 +2443,7 @@ MACHINE_RESET_MEMBER(x1_state,x1)
for(i=0;i<0x1800;i++)
{
m_pcg_ram[i] = 0;
- machine().gfx[3]->mark_dirty(i >> 3);
+ m_gfxdecode->gfx(3)->mark_dirty(i >> 3);
}
m_is_turbo = 0;
@@ -2526,7 +2526,7 @@ MACHINE_START_MEMBER(x1_state,x1)
save_pointer(NAME(m_emm_ram), 0x1000000);
save_pointer(NAME(m_pcg_ram), 0x1800);
- machine().gfx[3] = auto_alloc(machine(), gfx_element(machine(), x1_pcg_8x8, (UINT8 *)m_pcg_ram, 1, 0));
+ m_gfxdecode->set_gfx(3, auto_alloc(machine(), gfx_element(machine(), x1_pcg_8x8, (UINT8 *)m_pcg_ram, 1, 0)));
}
PALETTE_INIT_MEMBER(x1_state,x1)
@@ -2587,7 +2587,7 @@ static MACHINE_CONFIG_START( x1, x1_state )
MCFG_PALETTE_LENGTH(0x10+0x1000)
MCFG_PALETTE_INIT_OVERRIDE(x1_state,x1)
- MCFG_GFXDECODE(x1)
+ MCFG_GFXDECODE_ADD("gfxdecode", x1)
MCFG_VIDEO_START_OVERRIDE(x1_state,x1)
diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c
index f60463d4f14..fcbf46c2222 100644
--- a/src/mess/drivers/x1twin.c
+++ b/src/mess/drivers/x1twin.c
@@ -564,7 +564,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state )
MCFG_PALETTE_LENGTH(0x10+0x1000)
MCFG_PALETTE_INIT_OVERRIDE(x1twin_state,x1)
- MCFG_GFXDECODE(x1)
+ MCFG_GFXDECODE_ADD("gfxdecode", x1)
MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1)
diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c
index 80a8fff8198..03769973b83 100644
--- a/src/mess/drivers/x68k.c
+++ b/src/mess/drivers/x68k.c
@@ -1945,7 +1945,7 @@ static MACHINE_CONFIG_FRAGMENT( x68000_base )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(55.45)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
-// MCFG_GFXDECODE(x68k)
+// MCFG_GFXDECODE_ADD("gfxdecode", x68k)
MCFG_SCREEN_SIZE(1096, 568) // inital setting
MCFG_SCREEN_VISIBLE_AREA(0, 767, 0, 511)
MCFG_SCREEN_UPDATE_DRIVER(x68k_state, screen_update_x68000)
diff --git a/src/mess/drivers/xavix.c b/src/mess/drivers/xavix.c
index a407de28bb0..d0d1c088766 100644
--- a/src/mess/drivers/xavix.c
+++ b/src/mess/drivers/xavix.c
@@ -158,7 +158,7 @@ static MACHINE_CONFIG_START( xavix, xavix_state )
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MCFG_GFXDECODE(xavix)
+ MCFG_GFXDECODE_ADD("gfxdecode", xavix)
MCFG_PALETTE_LENGTH(16)
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 1295054f26e..816e5926640 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -695,7 +695,7 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state )
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(xerox820_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
- MCFG_GFXDECODE(xerox820)
+ MCFG_GFXDECODE_ADD("gfxdecode", xerox820)
/* devices */
MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_20MHz/8, sio_intf)
@@ -742,7 +742,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state )
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(xerox820ii_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
- MCFG_GFXDECODE(xerox820ii)
+ MCFG_GFXDECODE_ADD("gfxdecode", xerox820ii)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/z1013.c b/src/mess/drivers/z1013.c
index 084c2f29faf..fa344e3eb5f 100644
--- a/src/mess/drivers/z1013.c
+++ b/src/mess/drivers/z1013.c
@@ -408,7 +408,7 @@ static MACHINE_CONFIG_START( z1013, z1013_state )
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(z1013_state, screen_update_z1013)
- MCFG_GFXDECODE(z1013)
+ MCFG_GFXDECODE_ADD("gfxdecode", z1013)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, black_and_white)
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index 7af76ebaee6..3b13778f2c1 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
MCFG_SCREEN_SIZE(40*8, 24*8)
MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 24*8-1)
MCFG_SCREEN_UPDATE_DRIVER(z9001_state, screen_update_z9001)
- MCFG_GFXDECODE(z9001)
+ MCFG_GFXDECODE_ADD("gfxdecode", z9001)
MCFG_PALETTE_LENGTH(16)
/* Sound */
diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c
index be6a29c48e0..91639642653 100644
--- a/src/mess/drivers/zrt80.c
+++ b/src/mess/drivers/zrt80.c
@@ -316,7 +316,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state )
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
- MCFG_GFXDECODE(zrt80)
+ MCFG_GFXDECODE_ADD("gfxdecode", zrt80)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT_OVERRIDE(driver_device, monochrome_green)
diff --git a/src/mess/drivers/zx.c b/src/mess/drivers/zx.c
index 65509230139..f8eea5664b1 100644
--- a/src/mess/drivers/zx.c
+++ b/src/mess/drivers/zx.c
@@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( zx80, zx_state )
MCFG_SCREEN_VISIBLE_AREA(0, ZX81_PIXELS_PER_SCANLINE-1, 0, ZX81_PAL_SCANLINES-1)
MCFG_SCREEN_VBLANK_DRIVER(zx_state, screen_eof_zx)
- MCFG_GFXDECODE(zx80)
+ MCFG_GFXDECODE_ADD("gfxdecode", zx80)
MCFG_PALETTE_LENGTH(4)
@@ -421,7 +421,7 @@ static MACHINE_CONFIG_DERIVED( zx81, zx80 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(zx81_io_map)
- MCFG_GFXDECODE(zx81)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", zx81)
MCFG_CASSETTE_MODIFY( "cassette", zx81_cassette_interface )
MACHINE_CONFIG_END
@@ -450,7 +450,7 @@ static MACHINE_CONFIG_DERIVED( pc8300, zx81 )
MCFG_SCREEN_SIZE(ZX81_PIXELS_PER_SCANLINE, ZX81_NTSC_SCANLINES)
MCFG_SCREEN_VISIBLE_AREA(0, ZX81_PIXELS_PER_SCANLINE-1, 0, ZX81_NTSC_SCANLINES-1)
- MCFG_GFXDECODE(pc8300)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pc8300)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -464,7 +464,7 @@ static MACHINE_CONFIG_DERIVED( pow3000, zx81 )
MCFG_MACHINE_RESET_OVERRIDE(zx_state,pow3000)
- MCFG_GFXDECODE(pc8300)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", pc8300)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)