summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-03-06 14:28:32 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-03-06 14:28:32 +0000
commite1cb7f6788d7040274185ac0abd3a0060ccff088 (patch)
tree47922cc93fb9cb39a53cb7598f818233957e1ad2 /src/mess
parent03d3ddf76be650ec715b4395278898502f09f41c (diff)
Video attributes are now per screen (nw)
Diffstat (limited to 'src/mess')
-rw-r--r--src/mess/drivers/amiga.c4
-rw-r--r--src/mess/drivers/amstrad.c9
-rw-r--r--src/mess/drivers/compis.c2
-rw-r--r--src/mess/drivers/concept.c2
-rw-r--r--src/mess/drivers/dgn_beta.c2
-rw-r--r--src/mess/drivers/electron.c2
-rw-r--r--src/mess/drivers/exelv.c4
-rw-r--r--src/mess/drivers/hp16500.c3
-rw-r--r--src/mess/drivers/lisa.c2
-rw-r--r--src/mess/drivers/mac.c24
-rw-r--r--src/mess/drivers/msx.c4
-rw-r--r--src/mess/drivers/palm.c7
-rw-r--r--src/mess/drivers/rmnimbus.c3
-rw-r--r--src/mess/video/apollo.c4
14 files changed, 34 insertions, 38 deletions
diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index ccdb27876e8..137f27516e3 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -652,7 +652,7 @@ static MACHINE_CONFIG_START( ntsc, amiga_state )
MCFG_DEFAULT_LAYOUT(layout_amiga)
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
// MCFG_SCREEN_SIZE(228*4, 262)
// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
MCFG_SCREEN_RAW_PARAMS(AMIGA_68000_NTSC_CLOCK*2,228*4,214,228*4,262,34,262)
@@ -966,7 +966,7 @@ static MACHINE_CONFIG_START( a3000n, amiga_state )
MCFG_DEFAULT_LAYOUT(layout_amiga)
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(A3000_XTAL,228*4,214,228*4,262,34,262)
// MCFG_SCREEN_SIZE(228*4, 262)
// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c
index 2df7a2b579d..e4ed193dc31 100644
--- a/src/mess/drivers/amstrad.c
+++ b/src/mess/drivers/amstrad.c
@@ -890,8 +890,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state )
MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_DRIVER(amstrad_state, screen_eof_amstrad)
-
- MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_cpc)
@@ -966,8 +965,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_DRIVER(amstrad_state, screen_eof_amstrad)
-
- MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
@@ -1026,8 +1024,7 @@ static MACHINE_CONFIG_START( gx4000, amstrad_state )
MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_DRIVER(amstrad_state, screen_eof_amstrad)
-
- MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c
index aa598cf39f2..602fd0e90bf 100644
--- a/src/mess/drivers/compis.c
+++ b/src/mess/drivers/compis.c
@@ -714,8 +714,8 @@ static MACHINE_CONFIG_START( compis, compis_state )
MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr1_w))
// video hardware
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate
MCFG_SCREEN_SIZE(640, 400)
diff --git a/src/mess/drivers/concept.c b/src/mess/drivers/concept.c
index 2e15cdfc2b7..3dbba15451b 100644
--- a/src/mess/drivers/concept.c
+++ b/src/mess/drivers/concept.c
@@ -213,8 +213,8 @@ static MACHINE_CONFIG_START( concept, concept_state )
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60) /* 50 or 60, jumper-selectable */
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(720, 560)
diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c
index fa2295634b9..0a66fef8042 100644
--- a/src/mess/drivers/dgn_beta.c
+++ b/src/mess/drivers/dgn_beta.c
@@ -335,11 +335,11 @@ static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state )
MCFG_SCREEN_SIZE(700,550)
MCFG_SCREEN_VISIBLE_AREA(0, 699, 0, 549)
MCFG_SCREEN_UPDATE_DEVICE( "crtc", hd6845_device, screen_update )
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_GFXDECODE_ADD("gfxdecode", dgnbeta)
MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(dgnbeta_palette) / 3)
MCFG_PALETTE_INIT_OWNER(dgn_beta_state, dgn)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
/* PIA 0 at $FC20-$FC23 I46 */
MCFG_DEVICE_ADD(PIA_0_TAG, PIA6821, 0)
diff --git a/src/mess/drivers/electron.c b/src/mess/drivers/electron.c
index a0884842ede..515ff23d504 100644
--- a/src/mess/drivers/electron.c
+++ b/src/mess/drivers/electron.c
@@ -189,11 +189,11 @@ static MACHINE_CONFIG_START( electron, electron_state )
MCFG_SCREEN_SIZE( 640, 312 )
MCFG_SCREEN_VISIBLE_AREA( 0, 640-1, 0, 256-1 )
MCFG_SCREEN_UPDATE_DRIVER(electron_state, screen_update_electron)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_PALETTE_ADD( "palette", 16 )
MCFG_PALETTE_INIT_OWNER(electron_state, electron)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
diff --git a/src/mess/drivers/exelv.c b/src/mess/drivers/exelv.c
index d4f553c923b..a351c6d3d1b 100644
--- a/src/mess/drivers/exelv.c
+++ b/src/mess/drivers/exelv.c
@@ -526,7 +526,7 @@ static MACHINE_CONFIG_START( exl100, exelv_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_UPDATE_DEVICE("tms3556", tms3556_device, screen_update)
#if TMS3556_DOUBLE_WIDTH
MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH*2, TMS3556_TOTAL_HEIGHT*2)
@@ -569,7 +569,7 @@ static MACHINE_CONFIG_START( exeltel, exelv_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_UPDATE_DEVICE("tms3556", tms3556_device, screen_update)
#if TMS3556_DOUBLE_WIDTH
MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH*2, TMS3556_TOTAL_HEIGHT*2)
diff --git a/src/mess/drivers/hp16500.c b/src/mess/drivers/hp16500.c
index e0c23ed96f6..34aef932a98 100644
--- a/src/mess/drivers/hp16500.c
+++ b/src/mess/drivers/hp16500.c
@@ -57,8 +57,7 @@ static MACHINE_CONFIG_START( hp16500, hp16500_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
-
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_SIZE(1024, 768)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(hp16500_state, screen_update_hp16500)
diff --git a/src/mess/drivers/lisa.c b/src/mess/drivers/lisa.c
index eeb116acc64..8d256191a8d 100644
--- a/src/mess/drivers/lisa.c
+++ b/src/mess/drivers/lisa.c
@@ -144,8 +144,8 @@ static MACHINE_CONFIG_START( lisa, lisa_state )
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(880, 380)
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index d225011faf8..84f62e1cd4f 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -923,13 +923,13 @@ static MACHINE_CONFIG_START( mac512ke, mac_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
MCFG_CPU_PROGRAM_MAP(mac512ke_map)
- MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
- MCFG_SCREEN_REFRESH_RATE(60.15)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.15)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_SIZE(MAC_H_TOTAL, MAC_V_TOTAL)
MCFG_SCREEN_VISIBLE_AREA(0, MAC_H_VIS-1, 0, MAC_V_VIS-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_mac)
@@ -1048,13 +1048,13 @@ static MACHINE_CONFIG_START( macprtb, mac_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, C15M)
MCFG_CPU_PROGRAM_MAP(macprtb_map)
- MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
- MCFG_SCREEN_REFRESH_RATE(60.15)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.15)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_SIZE(700, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 399)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macprtb)
@@ -1404,8 +1404,8 @@ static MACHINE_CONFIG_START( macse30, mac_state )
MCFG_CPU_PROGRAM_MAP(macse30_map)
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60.15)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
MCFG_SCREEN_SIZE(MAC_H_TOTAL, MAC_V_TOTAL)
@@ -1468,8 +1468,8 @@ static MACHINE_CONFIG_START( macpb140, mac_state )
MCFG_CPU_PROGRAM_MAP(macpb140_map)
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60.15)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
MCFG_SCREEN_SIZE(700, 480)
@@ -1548,8 +1548,8 @@ static MACHINE_CONFIG_START( macpb160, mac_state )
MCFG_CPU_PROGRAM_MAP(macpb160_map)
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60.15)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260))
MCFG_SCREEN_SIZE(700, 480)
@@ -1745,7 +1745,7 @@ static MACHINE_CONFIG_START( pwrmac, mac_state )
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
// dot clock, htotal, hstart, hend, vtotal, vstart, vend
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_SIZE(1024, 768)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv)
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index a9435e179ef..7df718af5b4 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1189,8 +1189,8 @@ static MACHINE_CONFIG_START( msx2, msx_state )
MCFG_V9938_ADD("v9938", "screen", 0x20000)
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_vdp_interrupt))
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DEVICE("v9938", v9938_device, screen_update)
@@ -1259,8 +1259,8 @@ static MACHINE_CONFIG_START( msx2p, msx_state )
MCFG_V9958_ADD("v9958", "screen", 0x20000)
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_vdp_interrupt))
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DEVICE("v9958", v9958_device, screen_update)
diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c
index c6eef79abf5..df7f779e4fe 100644
--- a/src/mess/drivers/palm.c
+++ b/src/mess/drivers/palm.c
@@ -224,13 +224,14 @@ static MACHINE_CONFIG_START( palm, palm_state )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */
MCFG_CPU_PROGRAM_MAP( palm_map)
+
+ MCFG_QUANTUM_TIME( attotime::from_hz(60) )
+
MCFG_SCREEN_ADD( "screen", RASTER )
MCFG_SCREEN_REFRESH_RATE( 60 )
MCFG_SCREEN_VBLANK_TIME( ATTOSECONDS_IN_USEC(1260) )
- MCFG_QUANTUM_TIME( attotime::from_hz(60) )
-
/* video hardware */
- MCFG_VIDEO_ATTRIBUTES( VIDEO_UPDATE_BEFORE_VBLANK )
+ MCFG_SCREEN_VIDEO_ATTRIBUTES( VIDEO_UPDATE_BEFORE_VBLANK )
MCFG_SCREEN_SIZE( 160, 220 )
MCFG_SCREEN_VISIBLE_AREA( 0, 159, 0, 219 )
MCFG_SCREEN_UPDATE_DEVICE(MC68328_TAG, mc68328_device, screen_update)
diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c
index 97e03f50650..b8559d7cedd 100644
--- a/src/mess/drivers/rmnimbus.c
+++ b/src/mess/drivers/rmnimbus.c
@@ -291,8 +291,7 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state )
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(100))
MCFG_SCREEN_UPDATE_DRIVER(rmnimbus_state, screen_update_nimbus)
MCFG_SCREEN_VBLANK_DRIVER(rmnimbus_state, screen_eof_nimbus)
-
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_PALETTE_ADD("palette", SCREEN_NO_COLOURS)
MCFG_PALETTE_INIT_OWNER(rmnimbus_state, rmnimbus)
diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c
index 0277d6b4789..15c4013b208 100644
--- a/src/mess/video/apollo.c
+++ b/src/mess/video/apollo.c
@@ -2113,7 +2113,7 @@ static SCREEN_UPDATE_RGB32( apollo_screen )
MACHINE_CONFIG_FRAGMENT( apollo_graphics )
MCFG_DEFAULT_LAYOUT( layout_apollo_15i )
MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER)
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_REFRESH_RATE(76)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(657))
MCFG_SCREEN_SIZE(1024, 800)
@@ -2192,9 +2192,9 @@ WRITE8_DEVICE_HANDLER( apollo_ccr_w )
MACHINE_CONFIG_FRAGMENT( apollo_mono19i )
MCFG_DEFAULT_LAYOUT( layout_apollo )
- MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette")
MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_REFRESH_RATE(64)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(616))
MCFG_SCREEN_SIZE(1280, 1024)