diff options
Diffstat (limited to 'src/mame/drivers/williams.c')
-rw-r--r-- | src/mame/drivers/williams.c | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index 1a6f25930b7..dd510309858 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -1430,46 +1430,46 @@ GFXDECODE_END static MACHINE_CONFIG_START( defender, williams_state ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4) - MDRV_CPU_PROGRAM_MAP(defender_map) + MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4) + MCFG_CPU_PROGRAM_MAP(defender_map) - MDRV_CPU_ADD("soundcpu", M6808, SOUND_CLOCK) - MDRV_CPU_PROGRAM_MAP(defender_sound_map) + MCFG_CPU_ADD("soundcpu", M6808, SOUND_CLOCK) + MCFG_CPU_PROGRAM_MAP(defender_sound_map) - MDRV_MACHINE_START(defender) - MDRV_MACHINE_RESET(defender) - MDRV_NVRAM_ADD_0FILL("nvram") + MCFG_MACHINE_START(defender) + MCFG_MACHINE_RESET(defender) + MCFG_NVRAM_ADD_0FILL("nvram") - MDRV_TIMER_ADD("scan_timer", williams_va11_callback) - MDRV_TIMER_ADD("240_timer", williams_count240_callback) + MCFG_TIMER_ADD("scan_timer", williams_va11_callback) + MCFG_TIMER_ADD("240_timer", williams_count240_callback) /* video hardware */ - MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) + MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) - MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 10, 304, 260, 7, 245) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 10, 304, 260, 7, 245) - MDRV_VIDEO_START(williams) - MDRV_VIDEO_UPDATE(williams) + MCFG_VIDEO_START(williams) + MCFG_VIDEO_UPDATE(williams) /* sound hardware */ - MDRV_SPEAKER_STANDARD_MONO("mono") + MCFG_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("wmsdac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + MCFG_SOUND_ADD("wmsdac", DAC, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* pia */ - MDRV_PIA6821_ADD("pia_0", williams_pia_0_intf) - MDRV_PIA6821_ADD("pia_1", williams_pia_1_intf) - MDRV_PIA6821_ADD("pia_2", williams_snd_pia_intf) + MCFG_PIA6821_ADD("pia_0", williams_pia_0_intf) + MCFG_PIA6821_ADD("pia_1", williams_pia_1_intf) + MCFG_PIA6821_ADD("pia_2", williams_snd_pia_intf) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( jin, defender ) // needs a different screen size or the credit text is clipped /* basic machine hardware */ - MDRV_SCREEN_MODIFY("screen") - MDRV_SCREEN_VISIBLE_AREA(0, 315, 7, 245) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_VISIBLE_AREA(0, 315, 7, 245) MACHINE_CONFIG_END @@ -1477,16 +1477,16 @@ static MACHINE_CONFIG_DERIVED( williams, defender ) /* basic machine hardware */ - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(williams_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(williams_map) - MDRV_CPU_MODIFY("soundcpu") - MDRV_CPU_PROGRAM_MAP(sound_map) + MCFG_CPU_MODIFY("soundcpu") + MCFG_CPU_PROGRAM_MAP(sound_map) - MDRV_MACHINE_START(williams) - MDRV_MACHINE_RESET(williams) - MDRV_SCREEN_MODIFY("screen") - MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1) + MCFG_MACHINE_START(williams) + MCFG_MACHINE_RESET(williams) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1) MACHINE_CONFIG_END @@ -1495,7 +1495,7 @@ static MACHINE_CONFIG_DERIVED( williams_muxed, williams ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf) MACHINE_CONFIG_END @@ -1503,8 +1503,8 @@ static MACHINE_CONFIG_DERIVED( williams_extra_ram, williams ) /* basic machine hardware */ - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(williams_extra_ram_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(williams_extra_ram_map) MACHINE_CONFIG_END @@ -1513,7 +1513,7 @@ static MACHINE_CONFIG_DERIVED( spdball, williams ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_ADD("pia_3", spdball_pia_3_intf) + MCFG_PIA6821_ADD("pia_3", spdball_pia_3_intf) MACHINE_CONFIG_END @@ -1522,8 +1522,8 @@ static MACHINE_CONFIG_DERIVED( lottofun, williams ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_MODIFY("pia_0", lottofun_pia_0_intf) - MDRV_TICKET_DISPENSER_ADD("ticket", 70, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) + MCFG_PIA6821_MODIFY("pia_0", lottofun_pia_0_intf) + MCFG_TICKET_DISPENSER_ADD("ticket", 70, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) MACHINE_CONFIG_END @@ -1531,16 +1531,16 @@ static MACHINE_CONFIG_DERIVED( alienar, defender ) /* basic machine hardware */ - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(williams_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(williams_map) - MDRV_MACHINE_START(williams) - MDRV_MACHINE_RESET(williams) - MDRV_SCREEN_MODIFY("screen") - MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1) + MCFG_MACHINE_START(williams) + MCFG_MACHINE_RESET(williams) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1) /* pia */ - MDRV_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf) MACHINE_CONFIG_END @@ -1549,12 +1549,12 @@ static MACHINE_CONFIG_DERIVED( sinistar, williams_extra_ram ) /* basic machine hardware */ /* sound hardware */ - MDRV_SOUND_ADD("cvsd", HC55516, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) + MCFG_SOUND_ADD("cvsd", HC55516, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) /* pia */ - MDRV_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf) - MDRV_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf) + MCFG_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf) MACHINE_CONFIG_END @@ -1563,16 +1563,16 @@ static MACHINE_CONFIG_DERIVED( playball, williams ) /* basic machine hardware */ /* video hardware */ - MDRV_SCREEN_MODIFY("screen") - MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 8, 239-1) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 8, 239-1) /* sound hardware */ - MDRV_SOUND_ADD("cvsd", HC55516, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) + MCFG_SOUND_ADD("cvsd", HC55516, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) /* pia */ - MDRV_PIA6821_MODIFY("pia_1", playball_pia_1_intf) - MDRV_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf) + MCFG_PIA6821_MODIFY("pia_1", playball_pia_1_intf) + MCFG_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf) MACHINE_CONFIG_END @@ -1580,18 +1580,18 @@ static MACHINE_CONFIG_DERIVED( blaster, williams ) /* basic machine hardware */ - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(blaster_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(blaster_map) - MDRV_MACHINE_START(blaster) - MDRV_MACHINE_RESET(blaster) + MCFG_MACHINE_START(blaster) + MCFG_MACHINE_RESET(blaster) /* video hardware */ - MDRV_VIDEO_START(blaster) - MDRV_VIDEO_UPDATE(blaster) + MCFG_VIDEO_START(blaster) + MCFG_VIDEO_UPDATE(blaster) /* pia */ - MDRV_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf) MACHINE_CONFIG_END @@ -1600,48 +1600,48 @@ static MACHINE_CONFIG_DERIVED( blastkit, blaster ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_MODIFY("pia_0", williams_49way_muxed_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_0", williams_49way_muxed_pia_0_intf) MACHINE_CONFIG_END static MACHINE_CONFIG_START( williams2, williams_state ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4) - MDRV_CPU_PROGRAM_MAP(williams2_map) + MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4) + MCFG_CPU_PROGRAM_MAP(williams2_map) - MDRV_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */ - MDRV_CPU_PROGRAM_MAP(williams2_sound_map) + MCFG_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */ + MCFG_CPU_PROGRAM_MAP(williams2_sound_map) - MDRV_MACHINE_START(williams2) - MDRV_MACHINE_RESET(williams2) - MDRV_NVRAM_ADD_0FILL("nvram") + MCFG_MACHINE_START(williams2) + MCFG_MACHINE_RESET(williams2) + MCFG_NVRAM_ADD_0FILL("nvram") - MDRV_TIMER_ADD("scan_timer", williams2_va11_callback) - MDRV_TIMER_ADD("254_timer", williams2_endscreen_callback) + MCFG_TIMER_ADD("scan_timer", williams2_va11_callback) + MCFG_TIMER_ADD("254_timer", williams2_endscreen_callback) /* video hardware */ - MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) - MDRV_PALETTE_LENGTH(1024) - MDRV_GFXDECODE(williams2) + MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) + MCFG_PALETTE_LENGTH(1024) + MCFG_GFXDECODE(williams2) - MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) - MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248) - MDRV_VIDEO_START(williams2) - MDRV_VIDEO_UPDATE(williams2) + MCFG_VIDEO_START(williams2) + MCFG_VIDEO_UPDATE(williams2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_MONO("mono") + MCFG_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("wmsdac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + MCFG_SOUND_ADD("wmsdac", DAC, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* pia */ - MDRV_PIA6821_ADD("pia_0", williams2_muxed_pia_0_intf) - MDRV_PIA6821_ADD("pia_1", williams2_pia_1_intf) - MDRV_PIA6821_ADD("pia_2", williams2_snd_pia_intf) + MCFG_PIA6821_ADD("pia_0", williams2_muxed_pia_0_intf) + MCFG_PIA6821_ADD("pia_1", williams2_pia_1_intf) + MCFG_PIA6821_ADD("pia_2", williams2_snd_pia_intf) MACHINE_CONFIG_END @@ -1649,8 +1649,8 @@ static MACHINE_CONFIG_DERIVED( williams2_extra_ram, williams2 ) /* basic machine hardware */ - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(williams2_extra_ram_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(williams2_extra_ram_map) MACHINE_CONFIG_END @@ -1659,8 +1659,8 @@ static MACHINE_CONFIG_DERIVED( mysticm, williams2_extra_ram ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_MODIFY("pia_0", mysticm_pia_0_intf) - MDRV_PIA6821_MODIFY("pia_1", mysticm_pia_1_intf) + MCFG_PIA6821_MODIFY("pia_0", mysticm_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_1", mysticm_pia_1_intf) MACHINE_CONFIG_END @@ -1669,23 +1669,23 @@ static MACHINE_CONFIG_DERIVED( tshoot, williams2 ) /* basic machine hardware */ /* pia */ - MDRV_PIA6821_MODIFY("pia_0", tshoot_pia_0_intf) - MDRV_PIA6821_MODIFY("pia_1", tshoot_pia_1_intf) - MDRV_PIA6821_MODIFY("pia_2", tshoot_snd_pia_intf) + MCFG_PIA6821_MODIFY("pia_0", tshoot_pia_0_intf) + MCFG_PIA6821_MODIFY("pia_1", tshoot_pia_1_intf) + MCFG_PIA6821_MODIFY("pia_2", tshoot_snd_pia_intf) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( joust2, williams2 ) /* basic machine hardware */ - MDRV_DEVICE_REMOVE("mono") - MDRV_FRAGMENT_ADD(williams_cvsd_sound) + MCFG_DEVICE_REMOVE("mono") + MCFG_FRAGMENT_ADD(williams_cvsd_sound) - MDRV_MACHINE_START(joust2) - MDRV_MACHINE_RESET(joust2) + MCFG_MACHINE_START(joust2) + MCFG_MACHINE_RESET(joust2) /* pia */ - MDRV_PIA6821_MODIFY("pia_1", joust2_pia_1_intf) + MCFG_PIA6821_MODIFY("pia_1", joust2_pia_1_intf) MACHINE_CONFIG_END |