Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 02:18:09 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Goldstar.cpp: Some cleanups toward coding standards.

Browse Source
This commit is contained in:
RobertoFresca 2016-05-31 14:32:34 -03:00
parent 430f88f2f6
commit 36d2b7205f
1 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/mame/drivers/goldstar.cpp
View File

@ -7161,7 +7161,7 @@ static const gfx_layout tilelayout_cb3e =
256, /* 256 tiles */
4, /* 4 bits per pixel */
{ 0, 2, 4, 6 },
{ 2*8+0, 2*8+1,3*8+0, 3*8+1, 0, 1, 1*8+0, 1*8+1 },
{ 2*8+0, 2*8+1,3*8+0, 3*8+1, 0, 1, 1*8+0, 1*8+1 },
{ 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8,
32*8, 36*8, 40*8, 44*8, 48*8, 52*8, 56*8, 60*8,
64*8, 68*8, 72*8, 76*8, 80*8, 84*8, 88*8, 92*8,
@ -7202,8 +7202,8 @@ static const gfx_layout tiles8x32x4alt_layout =
8,32,
RGN_FRAC(1,2),
4,
{ RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4,0,4 },
{ 3,2,1,0,11, 10, 9, 8 },
{ RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4, 0, 4 },
{ 3, 2, 1, 0, 11, 10, 9, 8 },
{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16,
8*16, 9*16, 10*16, 11*16, 12*16, 13*16, 14*16, 15*16,
16*16,17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16,
@ -7282,8 +7282,8 @@ static const gfx_layout cb3c_tiles8x8_layout =
8,8,
RGN_FRAC(1,1),
4,
{ 0,1,2,3 },
{ 4,0,12,8,20,16,28,24 },
{ 0, 1, 2, 3 },
{ 4, 0, 12, 8, 20, 16, 28, 24 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
8*32
};
@ -7294,9 +7294,11 @@ static const gfx_layout cb3c_tiles8x32_layout =
8,32,
RGN_FRAC(1,1),
4,
{ 0,1,2,3 },
{ 4,0,12,8,20,16,28,24 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32,16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32,24*32,25*32,26*32,27*32,28*32,29*32,30*32,31*32 },
{ 0, 1, 2, 3 },
{ 4, 0, 12, 8, 20, 16, 28, 24 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32, 9*32, 10*32, 11*32, 12*32,
13*32, 14*32, 15*32, 16*32, 17*32, 18*32, 19*32, 20*32, 21*32, 22*32, 23*32,
24*32, 25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32 },
32*32
};
@ -7472,9 +7474,11 @@ static const gfx_layout tiles8x32_4bpp_layout =
8,32,
RGN_FRAC(1,4),
4,
{ RGN_FRAC(0,4),RGN_FRAC(1,4),RGN_FRAC(2,4),RGN_FRAC(3,4) },
{ 0,1,2,3,4,5,6,7},
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8,8*8,9*8,10*8,11*8,12*8,13*8,14*8,15*8,16*8,17*8,18*8,19*8,20*8,21*8,22*8,23*8,24*8,25*8,26*8,27*8,28*8,29*8,30*8,31*8 },
{ RGN_FRAC(0,4), RGN_FRAC(1,4), RGN_FRAC(2,4), RGN_FRAC(3,4) },
{ 0, 1, 2, 3, 4, 5, 6, 7},
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8, 9*8, 10*8, 11*8, 12*8,
13*8, 14*8, 15*8, 16*8, 17*8, 18*8, 19*8, 20*8, 21*8, 22*8, 23*8,
24*8, 25*8, 26*8, 27*8, 28*8, 29*8, 30*8, 31*8 },
32*8
};
@ -7483,8 +7487,8 @@ static const gfx_layout tiles8x8_3bpp_layout =
8,8,
RGN_FRAC(1,3),
3,
{ RGN_FRAC(0,3),RGN_FRAC(1,3),RGN_FRAC(2,3) },
{ 0,1,2,3,4,5,6,7},
{ RGN_FRAC(0,3), RGN_FRAC(1,3), RGN_FRAC(2,3) },
{ 0, 1, 2, 3, 4, 5, 6, 7},
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
8*8
};
@ -7500,8 +7504,8 @@ static const gfx_layout tiles8x8x3_miss1bpp_layout =
8,8,
RGN_FRAC(1,1),
3,
{ 1,2,3 },
{ 8,12,0,4,24,28,16,20 },
{ 1, 2, 3 },
{ 8, 12, 0, 4, 24, 28, 16, 20 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
8*32
};
@ -7511,8 +7515,8 @@ static const gfx_layout tiles8x8x4alt_layout =
8,8,
RGN_FRAC(1,1),
4,
{ 0, 1,2,3 },
{ 4,0,12,8,20,16,28,24 },
{ 0, 1, 2, 3 },
{ 4, 0, 12, 8, 20, 16, 28, 24 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
8*32
};
@ -7522,8 +7526,8 @@ static const gfx_layout tiles8x32x4alt2_layout =
8,32,
RGN_FRAC(1,1),
4,
{ 0, 1,2,3 },
{ 4,0,12,8,20,16,28,24 },
{ 0, 1, 2, 3 },
{ 4, 0, 12, 8, 20, 16, 28, 24 },
{ STEP32(0,32) },
32*32
};
@ -7539,8 +7543,8 @@ static const gfx_layout tilescherrys_layout =
8,32,
RGN_FRAC(1,1),
4,
{ 3,2,1,0 },
{ 8,12,0,4,24,28,16,20 },
{ 3, 2, 1, 0 },
{ 8, 12, 0, 4, 24, 28, 16, 20 },
{ STEP32(0,32) },
32*32
};
@ -7576,9 +7580,9 @@ static const gfx_layout cm97_layout =
8,8,
RGN_FRAC(1,1),
4,
{ 0,1,2,3 },
{ 8,12,0,4,24,28, 16,20 },
{ 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32 },
{ 0, 1, 2, 3 },
{ 8, 12, 0, 4, 24, 28, 16, 20 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
8*32
};
@ -7589,7 +7593,9 @@ static const gfx_layout cm97_layout32 =
4,
{ 0,1,2,3 },
{ 8,12,0,4,24,28, 16,20 },
{ 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32, 8*32, 9*32, 10*32, 11*32, 12*32, 13*32,14*32,15*32,16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32,24*32,25*32,26*32,27*32,28*32,29*32,30*32,31*32 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32, 9*32, 10*32, 11*32,
12*32, 13*32, 14*32, 15*32, 16*32, 17*32, 18*32, 19*32, 20*32, 21*32,
22*32, 23*32, 24*32, 25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32 },
32*32
};
@ -7650,7 +7656,7 @@ static MACHINE_CONFIG_START( goldstar, goldstar_state )
MCFG_PALETTE_FORMAT(BBGGGRRR)
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")
@ -7671,7 +7677,7 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(goldstar_map)
MCFG_CPU_IO_MAP(goldstar_readport)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -7687,7 +7693,7 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state )
MCFG_PALETTE_FORMAT(BBGGGRRR)
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")
@ -7715,7 +7721,7 @@ static MACHINE_CONFIG_START( star100, sanghopm_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(star100_map)
MCFG_CPU_IO_MAP(star100_readport)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sanghopm_state, irq0_line_hold)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sanghopm_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -7756,7 +7762,7 @@ static MACHINE_CONFIG_START( super9, goldstar_state )
// MCFG_CPU_PROGRAM_MAP(nfm_map)
MCFG_CPU_IO_MAP(goldstar_readport)
// MCFG_CPU_IO_MAP(unkch_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -7922,7 +7928,7 @@ static MACHINE_CONFIG_START( wcherry, goldstar_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(wcherry_map)
MCFG_CPU_IO_MAP(wcherry_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"))
@ -7971,7 +7977,7 @@ static MACHINE_CONFIG_START( cm, cmaster_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(cm_map)
MCFG_CPU_IO_MAP(cm_portmap)
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"))
@ -8101,7 +8107,7 @@ static MACHINE_CONFIG_START( lucky8, wingco_state )
MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8)
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")
@ -8152,7 +8158,7 @@ static MACHINE_CONFIG_START( bingowng, wingco_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(goldstar_state,lucky8)
MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_VIDEO_START_OVERRIDE(wingco_state, bingowng)
@ -8205,7 +8211,7 @@ static MACHINE_CONFIG_START( magodds, wingco_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(magodds_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"))
@ -8260,7 +8266,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(kkotnoli_map)
//MCFG_CPU_IO_MAP(goldstar_readport)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@ -8287,7 +8293,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state )
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8)
MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar)
MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@ -8304,7 +8310,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(ladylinr_map)
//MCFG_CPU_IO_MAP(goldstar_readport)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@ -8328,7 +8334,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state )
MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8)
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")
@ -8347,7 +8353,7 @@ static MACHINE_CONFIG_START( wcat3, wingco_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(wcat3_map)
//MCFG_CPU_IO_MAP(goldstar_readport)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@ -8379,7 +8385,7 @@ static MACHINE_CONFIG_START( wcat3, wingco_state )
MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8)
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")
@ -8404,7 +8410,7 @@ static MACHINE_CONFIG_START( amcoe1, cmaster_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(cm_map)
MCFG_CPU_IO_MAP(amcoe1_portmap)
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"))
@ -8486,7 +8492,7 @@ static MACHINE_CONFIG_START( amcoe2, cmaster_state )
MCFG_PALETTE_INIT_OWNER(goldstar_state,cm)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_VIDEO_START_OVERRIDE(goldstar_state,cherrym)
MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@ -8557,7 +8563,7 @@ static MACHINE_CONFIG_START( pkrmast, goldstar_state )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(cm_map)
MCFG_CPU_IO_MAP(pkrmast_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)