From 7a4ed7a3302984a729f28f7508515658238f45d8 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sun, 8 Dec 2013 17:52:22 +0000 Subject: [PATCH] Converted Toaplan 2 to use SCREEN_RAW_PARAMS [Angelo Salese] --- src/mame/drivers/toaplan2.c | 127 ++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index b8b9750bdeb..1412a80c1f5 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3168,9 +3168,10 @@ static MACHINE_CONFIG_START( tekipaki, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3209,9 +3210,10 @@ static MACHINE_CONFIG_START( ghox, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3297,9 +3299,7 @@ static MACHINE_CONFIG_START( dogyuun, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE( (double)(XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */ - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_dogyuun) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3341,9 +3341,10 @@ static MACHINE_CONFIG_START( kbash, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3378,9 +3379,10 @@ static MACHINE_CONFIG_START( kbash2, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3415,9 +3417,7 @@ static MACHINE_CONFIG_START( truxton2, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE( (double)(XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */ - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3470,9 +3470,10 @@ static MACHINE_CONFIG_START( pipibibs, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3511,9 +3512,10 @@ static MACHINE_CONFIG_START( pipibibsbl, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3590,9 +3592,7 @@ static MACHINE_CONFIG_START( fixeight, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE( (double)(XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */ - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) /* verified on pcb */ MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3627,9 +3627,10 @@ static MACHINE_CONFIG_START( fixeightbl, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3667,9 +3668,7 @@ static MACHINE_CONFIG_START( vfive, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE( (double)(XTAL_27MHz / 4) / (432 * 263) ) /* verified on pcb */ - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) /* verified on pcb */ MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3705,9 +3704,10 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_batsugun) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3729,7 +3729,6 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -/* TODO: clocks */ static MACHINE_CONFIG_START( pwrkick, toaplan2_state ) /* basic machine hardware */ @@ -3743,9 +3742,7 @@ static MACHINE_CONFIG_START( pwrkick, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3759,7 +3756,7 @@ static MACHINE_CONFIG_START( pwrkick, toaplan2_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") /* empty YM2151 socket*/ - MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) // not confirmed MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END @@ -3775,9 +3772,7 @@ static MACHINE_CONFIG_START( othldrby, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3791,7 +3786,7 @@ static MACHINE_CONFIG_START( othldrby, toaplan2_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) // not confirmed MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END @@ -3808,9 +3803,10 @@ static MACHINE_CONFIG_START( snowbro2, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3851,9 +3847,10 @@ static MACHINE_CONFIG_START( mahoudai, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3894,9 +3891,10 @@ static MACHINE_CONFIG_START( shippumd, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3948,9 +3946,10 @@ static MACHINE_CONFIG_START( bgaregga, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2) MCFG_SCREEN_VBLANK_DRIVER(toaplan2_state, screen_eof_toaplan2) @@ -3998,9 +3997,10 @@ static MACHINE_CONFIG_START( batrider, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_batrider) MCFG_GFXDECODE(batrider) @@ -4049,9 +4049,10 @@ static MACHINE_CONFIG_START( bbakraid, toaplan2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(432, 262) - MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) + //MCFG_SCREEN_REFRESH_RATE(60) + //MCFG_SCREEN_SIZE(432, 262) + //MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_batrider) MCFG_GFXDECODE(batrider)