From c709841aa50abda3686014b80dc291fa6dee936f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 9 Mar 2015 19:26:46 +1100 Subject: [PATCH] More negative lines of code --- src/mame/drivers/goldstar.c | 132 ++++++------------------------------ 1 file changed, 21 insertions(+), 111 deletions(-) diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 821f0c120ac..a1848198af4 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -7849,112 +7849,13 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cb3e, cb3_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(ncb3_map) - MCFG_CPU_IO_MAP(ncb3_readwriteport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) - - MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) - MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed - - MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("IN1")) - MCFG_I8255_IN_PORTB_CB(IOPORT("IN2")) - MCFG_I8255_IN_PORTC_CB(IOPORT("DSW1")) - - MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2")) - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(goldstar_state, screen_update_goldstar) - MCFG_SCREEN_PALETTE("palette") - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cb3e) - MCFG_PALETTE_ADD("palette", 256) - MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) - MCFG_NVRAM_ADD_1FILL("nvram") - - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - - MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK) - MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4")) - MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - - - -static MACHINE_CONFIG_START( cb3c, cb3_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(ncb3_map) - MCFG_CPU_IO_MAP(ncb3_readwriteport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) - - MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) - MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed - - MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("IN1")) - MCFG_I8255_IN_PORTB_CB(IOPORT("IN2")) - MCFG_I8255_IN_PORTC_CB(IOPORT("DSW1")) - - MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2")) - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(goldstar_state, screen_update_goldstar) - MCFG_SCREEN_PALETTE("palette") - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cb3c) - MCFG_PALETTE_ADD("palette", 256) - MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) - MCFG_NVRAM_ADD_1FILL("nvram") - - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - - MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK) - MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4")) - MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - - static MACHINE_CONFIG_START( ncb3, cb3_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(ncb3_map) MCFG_CPU_IO_MAP(ncb3_readwriteport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -7979,11 +7880,11 @@ static MACHINE_CONFIG_START( ncb3, cb3_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) MCFG_PALETTE_ADD("palette", 256) - MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) + MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7997,6 +7898,23 @@ static MACHINE_CONFIG_START( ncb3, cb3_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END +static MACHINE_CONFIG_DERIVED( cb3c, ncb3 ) + MCFG_GFXDECODE_MODIFY("gfxdecode", cb3c) +MACHINE_CONFIG_END + +static MACHINE_CONFIG_DERIVED( cb3e, ncb3 ) + MCFG_GFXDECODE_MODIFY("gfxdecode", cb3e) +MACHINE_CONFIG_END + +static MACHINE_CONFIG_DERIVED( cherrys, ncb3 ) + MCFG_GFXDECODE_MODIFY("gfxdecode", cherrys) +MACHINE_CONFIG_END + +static MACHINE_CONFIG_DERIVED( cm97, ncb3 ) + MCFG_GFXDECODE_MODIFY("gfxdecode", cm97) +MACHINE_CONFIG_END + + static MACHINE_CONFIG_START( wcherry, goldstar_state ) @@ -8209,7 +8127,7 @@ static MACHINE_CONFIG_START( bingowng, wingco_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(lucky8_map) //MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", wingco_state, masked_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", wingco_state, masked_irq) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8621,14 +8539,6 @@ static MACHINE_CONFIG_START( unkch, unkch_state ) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cherrys, ncb3 ) - MCFG_GFXDECODE_MODIFY("gfxdecode", cherrys) -MACHINE_CONFIG_END - -static MACHINE_CONFIG_DERIVED( cm97, ncb3 ) - MCFG_GFXDECODE_MODIFY("gfxdecode", cm97) -MACHINE_CONFIG_END - // hw unknown - should be somewhat similar to cm