whitespace laundry

This commit is contained in:
Michaël Banaan Ananas 2014-08-23 20:12:50 +00:00
parent 5e5c2b202b
commit f1f00dfd7f

View File

@ -471,36 +471,31 @@ $a00000 checks have been seen on the Final Lap boards.
/* 68000/6809/63705 Shared memory area - DUAL PORT Memory */
/*************************************************************/
static void
GollyGhostUpdateLED_c4( int data )
static void GollyGhostUpdateLED_c4( int data )
{
output_set_value("zip100", data >> 4);
output_set_value("zip10", data & 0x0f);
}
static void
GollyGhostUpdateLED_c6( int data )
static void GollyGhostUpdateLED_c6( int data )
{
output_set_value("zip1", data >> 4);
output_set_value("time10", data & 0x0f);
}
static void
GollyGhostUpdateLED_c8( int data )
static void GollyGhostUpdateLED_c8( int data )
{
output_set_value("time1", data >> 4);
output_set_value("zap100", data & 0x0f);
}
static void
GollyGhostUpdateLED_ca( int data )
static void GollyGhostUpdateLED_ca( int data )
{
output_set_value("zap10", data >> 4);
output_set_value("zap1", data & 0x0f);
}
static void
GollyGhostUpdateDiorama_c0( int data )
static void GollyGhostUpdateDiorama_c0( int data )
{
if (data & 0x80)
{
@ -790,18 +785,7 @@ ADDRESS_MAP_END
/*************************************************************/
READ8_MEMBER(namcos2_state::c68_p5_r)
{
UINT8 rv;
if (m_player_mux)
{
rv = ioport("MCUB2")->read();
}
else
{
rv = ioport("MCUB")->read();
}
return rv;
return (m_player_mux) ? ioport("MCUB2")->read() : ioport("MCUB")->read();
}
WRITE8_MEMBER(namcos2_state::c68_p3_w)
@ -847,7 +831,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) \
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) \
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_0) /* Make it accessible by default*/ \
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Service Button") \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
#define NAMCOS2_MCU_ANALOG_PORT_DEFAULT \
@ -1081,7 +1065,7 @@ static INPUT_PORTS_START( finallap )
PORT_DIPNAME( 0x10, 0x10, "PortH 0x10")
PORT_DIPSETTING( 0x10, "H" )
PORT_DIPSETTING( 0x00, "L" )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE PORT_NAME("Shift Gear")/* Gear Shift */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE PORT_NAME("Shift Gear")
PORT_DIPNAME( 0x40, 0x40, "PortH 0x40")
PORT_DIPSETTING( 0x40, "H" )
PORT_DIPSETTING( 0x00, "L" )
@ -1144,7 +1128,7 @@ static INPUT_PORTS_START( finalap3 )
PORT_DIPNAME( 0x10, 0x10, "PortH 0x10")
PORT_DIPSETTING( 0x10, "H" )
PORT_DIPSETTING( 0x00, "L" )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE PORT_NAME("Shift Gear")/* Gear Shift */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE PORT_NAME("Shift Gear")
PORT_DIPNAME( 0x40, 0x40, "PortH 0x40")
PORT_DIPSETTING( 0x40, "H" )
PORT_DIPSETTING( 0x00, "L" )
@ -1195,7 +1179,7 @@ static INPUT_PORTS_START( fourtrax )
PORT_DIPSETTING( 0x00, "L" )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_0)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Service Button")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
@ -1469,7 +1453,7 @@ static INPUT_PORTS_START( sgunner2 )
PORT_START("MCUH") /* M37450 - PORT 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_0) /* Make it accessible by default*/ \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Service Button")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@ -1479,8 +1463,8 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dirtfox )
PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Gear Shift Up") /* Gear shift up */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Gear Shift Down")/* Gear shift down */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Gear Shift Up")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Gear Shift Down")
NAMCOS2_MCU_PORT_C_DEFAULT
@ -2878,9 +2862,9 @@ ROM_START( finallapjb )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c3", 0x180000, CRC(c2c56743) SHA1(3f338599ffd2e13452cdc3dbf3697fd8aa04bcd2) )
NAMCOS2_GFXROM_LOAD_128K( "fl2_c4.bin", 0x200000, CRC(cdc1de2e) SHA1(701dcc4fc25e7b6118947a5accabd43c0475ebe9) )
NAMCOS2_GFXROM_LOAD_128K( "fl2-c4", 0x200000, CRC(cdc1de2e) SHA1(701dcc4fc25e7b6118947a5accabd43c0475ebe9) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl2_c6.bin", 0x300000, CRC(8e78a3c3) SHA1(d1cd7fad038d52430f933b3ee2440554d2aeade9) )
NAMCOS2_GFXROM_LOAD_128K( "fl2-c6", 0x300000, CRC(8e78a3c3) SHA1(d1cd7fad038d52430f933b3ee2440554d2aeade9) )
ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl1_sha.bin", 0x000000, CRC(b7e1c7a3) SHA1(b82f9b340d95b80a12286647adba8c139b4d081a) )
@ -3612,7 +3596,7 @@ ROM_START( marvland )
ROM_LOAD16_BYTE( "mv2_spr1", 0x000001, 0x010000, CRC(dbd94def) SHA1(56a8d7acd483bc4d12c8bc5b7e90ffdb132be670) )
ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "mv2_snd0", 0x0c000, 0x04000, CRC(a5b99162) SHA1(cafe8d1dae1e981c7ff9b70076b3e1d52cd806f7) )
ROM_LOAD( "mv2_snd0", 0x00c000, 0x004000, CRC(a5b99162) SHA1(cafe8d1dae1e981c7ff9b70076b3e1d52cd806f7) )
ROM_CONTINUE( 0x010000, 0x01c000 )
ROM_RELOAD( 0x010000, 0x020000 )
@ -3663,7 +3647,7 @@ ROM_START( marvlandj )
ROM_LOAD16_BYTE( "mv1-spr1.bin", 0x000001, 0x010000, CRC(1c5599f5) SHA1(6bdf11da4e2a56c6bb6011977b045d9537d0597f) )
ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "mv1-snd0.bin", 0x0c000, 0x04000, CRC(51b8ccd7) SHA1(5aacb020c12d9a3c43c098f3abd8358bc18acc64) )
ROM_LOAD( "mv1-snd0.bin", 0x00c000, 0x004000, CRC(51b8ccd7) SHA1(5aacb020c12d9a3c43c098f3abd8358bc18acc64) )
ROM_CONTINUE( 0x010000, 0x01c000 )
ROM_RELOAD( 0x010000, 0x020000 )
@ -3712,7 +3696,7 @@ ROM_START( metlhawk )
ROM_LOAD16_BYTE( "mh1sp1f.13k", 0x000001, 0x010000, CRC(8ccf98e0) SHA1(c4a0b573553fd609751e6f227f7ee3f28f78f589) )
ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "mh1s0.7j", 0x0c000, 0x04000, CRC(79e054cf) SHA1(934a15a1bdb2751f28cc23471d1c5e5b9af80815) )
ROM_LOAD( "mh1s0.7j", 0x00c000, 0x004000, CRC(79e054cf) SHA1(934a15a1bdb2751f28cc23471d1c5e5b9af80815) )
ROM_CONTINUE( 0x010000, 0x01c000 )
ROM_RELOAD( 0x010000, 0x020000 )
@ -3783,7 +3767,7 @@ ROM_START( metlhawkj )
ROM_LOAD16_BYTE( "mh1sp1f.13k", 0x000001, 0x010000, CRC(8ccf98e0) SHA1(c4a0b573553fd609751e6f227f7ee3f28f78f589) )
ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "mh1s0.7j", 0x0c000, 0x04000, CRC(79e054cf) SHA1(934a15a1bdb2751f28cc23471d1c5e5b9af80815) )
ROM_LOAD( "mh1s0.7j", 0x00c000, 0x004000, CRC(79e054cf) SHA1(934a15a1bdb2751f28cc23471d1c5e5b9af80815) )
ROM_CONTINUE( 0x010000, 0x01c000 )
ROM_RELOAD( 0x010000, 0x020000 )
@ -3854,7 +3838,7 @@ ROM_START( mirninja )
ROM_LOAD16_BYTE( "mn1_spr1.bin", 0x000001, 0x010000, CRC(2bc66f60) SHA1(7b778ee3a24f57d43c9bcffbdb77cf8be2463c2d) )
ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "mn_snd0.bin", 0x0c000, 0x04000, CRC(6aa1ae84) SHA1(2186f93c4ccc4c202fa14d80b440060237659fc5) )
ROM_LOAD( "mn_snd0.bin", 0x00c000, 0x004000, CRC(6aa1ae84) SHA1(2186f93c4ccc4c202fa14d80b440060237659fc5) )
ROM_CONTINUE( 0x010000, 0x01c000 )
ROM_RELOAD( 0x010000, 0x020000 )
@ -5007,8 +4991,7 @@ ROM_START( bubbletr )
ROM_RELOAD( 0x010000, 0x020000 )
ROM_REGION( 0x010000, "mcu", 0 ) /* I/O MCU */
/* note, these weren't present in this set, taken from golly ghost and may be wrong for bubble
trouble */
/* note, these weren't present in this set, taken from golly ghost and may be wrong for bubble trouble */
ROM_LOAD( "sys2mcpu.bin", 0x0000, 0x2000, CRC(a342a97e) SHA1(2c420d34dba21e409bf78ddca710fc7de65a6642) )
ROM_LOAD( "gl1edr0c.ic7", 0x8000, 0x8000, BAD_DUMP CRC(db60886f) SHA1(a1183c058c0470a4ef8b0f69a3637b1640c5b5a4) )
@ -5379,13 +5362,12 @@ DRIVER_INIT_MEMBER(namcos2_state,marvland)
DRIVER_INIT_MEMBER(namcos2_state,metlhawk)
{
/* unscramble sprites */
int i, j, k, l;
UINT8 *data = memregion("gfx1")->base();
for(i=0; i<0x200000; i+=32*32)
for (int i=0; i<0x200000; i+=32*32)
{
for(j=0; j<32*32; j+=32*4)
for (int j=0; j<32*32; j+=32*4)
{
for(k=0; k<32; k+=4)
for (int k=0; k<32; k+=4)
{
UINT8 v;
int a;
@ -5412,7 +5394,8 @@ DRIVER_INIT_MEMBER(namcos2_state,metlhawk)
data[a+3] = v;
a = i+j+k;
for(l=0; l<4; l++) {
for (int l=0; l<4; l++)
{
v = data[a+l+32];
data[a+l+32] = data[a+l+32*3];
data[a+l+32*3] = v;
@ -5420,19 +5403,21 @@ DRIVER_INIT_MEMBER(namcos2_state,metlhawk)
} /* next k */
} /* next j */
} /* next i */
/* 90 degrees prepare a turned character */
for(i=0; i<0x200000; i+=32*32)
for (int i=0; i<0x200000; i+=32*32)
{
for(j=0; j<32; j++)
for (int j=0; j<32; j++)
{
for(k=0; k<32; k++)
for (int k=0; k<32; k++)
{
data[0x200000+i+j*32+k] = data[i+j+k*32];
} /* next k */
} /* next j */
} /* next i */
m_gametype = NAMCOS2_METAL_HAWK;
} /* metlhawk */
}
DRIVER_INIT_MEMBER(namcos2_state,mirninja)
{