From 4408b14d3879d6310645c2e7f045021bf398e671 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 17 Jul 2008 08:50:36 +0000 Subject: Cleanups and version bump. --- src/mame/drivers/changela.c | 2 +- src/mame/drivers/legionna.c | 2 +- src/mame/drivers/segas24.c | 22 +++++++++++----------- src/mame/drivers/seibuspi.c | 10 +++++----- src/mame/drivers/seta.c | 8 ++++---- src/mame/drivers/seta2.c | 2 +- src/mame/drivers/spdodgeb.c | 2 +- src/mame/drivers/ssv.c | 6 +++--- src/mame/drivers/system16.c | 24 ++++++++++++------------ src/mame/drivers/system18.c | 2 +- src/mame/drivers/taito_b.c | 2 +- src/mame/drivers/taito_f2.c | 12 ++++++------ src/mame/drivers/taito_f3.c | 10 +++++----- src/mame/drivers/taito_z.c | 2 +- src/mame/drivers/taitojc.c | 2 +- src/mame/drivers/tatsumi.c | 12 ++++++------ src/mame/drivers/tetrisp2.c | 4 ++-- src/mame/drivers/tnzs.c | 8 ++++---- src/mame/drivers/toaplan1.c | 32 ++++++++++++++++---------------- src/mame/drivers/travrusa.c | 2 +- src/version.c | 2 +- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 0cf2c4b54b3..df6bcea4efa 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -431,7 +431,7 @@ static INPUT_PORTS_START( changela ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_DIPNAME( 0x30, 0x30, "Self Test Switch" ) PORT_DIPLOCATION("SWT:1,2") - //PORT_DIPSETTING( 0x00, "?" ) /* Not possible, 3-state switch */ + //PORT_DIPSETTING( 0x00, "?" ) /* Not possible, 3-state switch */ PORT_DIPSETTING( 0x20, "Free Game" ) /* "Puts a credit on the game without increasing the coin counter." */ PORT_DIPSETTING( 0x10, DEF_STR( Test ) ) PORT_DIPSETTING( 0x30, DEF_STR( Off ) ) diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index fc71f64a8c1..16091dd3041 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -690,7 +690,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Service_Mode ) ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - + PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0200, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0500, DEF_STR( 3C_1C ) ) diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 27312a9c1f9..1a58f815c6a 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -508,7 +508,7 @@ static WRITE16_HANDLER( fdc_ctrl_w ) static UINT8 hotrod_io_r(running_machine *machine, int port) { - switch(port) + switch(port) { case 0: return input_port_read(machine, "P1"); @@ -532,9 +532,9 @@ static UINT8 hotrod_io_r(running_machine *machine, int port) static UINT8 dcclub_io_r(running_machine *machine, int port) { - switch(port) + switch(port) { - case 0: + case 0: { static const UINT8 pos[16] = { 0, 1, 3, 2, 6, 4, 12, 8, 9 }; return (input_port_read(machine, "P1") & 0xf) | ((~pos[input_port_read(machine, "PADDLE")>>4]<<4) & 0xf0); @@ -563,7 +563,7 @@ static UINT8 mahmajn_io_r(running_machine *machine, int port) { static const char *keynames[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5", "P1", "P2" }; - switch(port) + switch(port) { case 0: return ~(1 << cur_input_line); @@ -587,7 +587,7 @@ static UINT8 mahmajn_io_r(running_machine *machine, int port) static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) { - switch(port) + switch(port) { case 3: if(data & 4) @@ -603,7 +603,7 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) static void hotrod_io_w(running_machine *machine, int port, UINT8 data) { - switch(port) + switch(port) { case 3: // Lamps break; @@ -621,7 +621,7 @@ static WRITE16_HANDLER( hotrod3_ctrl_w ) { static const char *portnames[] = { "PEDAL1", "PEDAL2", "PEDAL3", "PEDAL4" }; - if(ACCESSING_BITS_0_7) + if(ACCESSING_BITS_0_7) { data &= 3; hotrod_ctrl_cur = input_port_read_safe(machine, portnames[data], 0); @@ -630,9 +630,9 @@ static WRITE16_HANDLER( hotrod3_ctrl_w ) static READ16_HANDLER( hotrod3_ctrl_r ) { - if(ACCESSING_BITS_0_7) + if(ACCESSING_BITS_0_7) { - switch(offset) + switch(offset) { // Steering dials case 0: @@ -652,8 +652,8 @@ static READ16_HANDLER( hotrod3_ctrl_r ) case 7: return input_port_read_safe(machine, "DIAL4", 0) >> 8; - case 8: - { + case 8: + { // Serial ADCs for the accel int v = hotrod_ctrl_cur & 0x80; hotrod_ctrl_cur <<= 1; diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index f8724327563..cf47d3b1057 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -890,7 +890,7 @@ logerror("z80 data = %08x mask = %08x\n",data,mem_mask); static READ32_HANDLER( spi_controls1_r ) { - if( ACCESSING_BITS_0_7 ) + if( ACCESSING_BITS_0_7 ) { return (input_port_read(machine, "P2") << 8) | input_port_read(machine, "P1") | 0xffff0000; } @@ -899,7 +899,7 @@ static READ32_HANDLER( spi_controls1_r ) static READ32_HANDLER( spi_controls2_r ) { - if( ACCESSING_BITS_0_7 ) + if( ACCESSING_BITS_0_7 ) { return ((input_port_read(machine, "SYSTEM") | 0xffffff00) & ~0x40) | (eeprom_read_bit() << 6); } @@ -1128,7 +1128,7 @@ static INPUT_PORTS_START( spi_2button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( spi_3button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -1210,7 +1210,7 @@ static INPUT_PORTS_START( seibu386_2button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index f330ca85548..eca587c73a4 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2071,7 +2071,7 @@ static ADDRESS_MAP_START( orbs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins - //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 + //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound @@ -2837,8 +2837,8 @@ static READ8_HANDLER( ff_r ) {return 0xff;} static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(ff_r ) // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) -// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // -// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // +// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // +// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1") // P1 AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2 AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins @@ -2971,7 +2971,7 @@ static ADDRESS_MAP_START( metafox_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // AM_RANGE(0x1000, 0x1000) AM_READ_PORT("COINS") // Coins AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P1") // P1 -// AM_RANGE(0x1004, 0x1004) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x1004, 0x1004) AM_READ(SMH_NOP ) // ? AM_RANGE(0x1006, 0x1006) AM_READ_PORT("P2") // P2 AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 7e1081956a3..e5fd5423afc 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -741,7 +741,7 @@ static ADDRESS_MAP_START( penbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P2") // P2 AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection +// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection AM_RANGE(0xb00000, 0xb3ffff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 3ee7f4d8afb..92dfd6f1fe9 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -284,7 +284,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3002, 0x3002) AM_WRITE(sound_command_w) // AM_RANGE(0x3003, 0x3003) AM_WRITE(SMH_RAM) AM_RANGE(0x3004, 0x3004) AM_WRITE(spdodgeb_scrollx_lo_w) -// AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) /* mcu63701_output_w */ +// AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) /* mcu63701_output_w */ AM_RANGE(0x3006, 0x3006) AM_WRITE(spdodgeb_ctrl_w) /* scroll hi, flip screen, bank switch, palette select */ AM_RANGE(0x3800, 0x3800) AM_WRITE(mcu63701_w) AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 3227c1454a2..f6a18ced7da 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -876,8 +876,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP ) // ? -// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) // dyna @@ -885,7 +885,7 @@ static ADDRESS_MAP_START( survarts_readmem, ADDRESS_SPACE_PROGRAM, 16 ) SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start AM_RANGE(0x400000, 0x43ffff) AM_WRITE(SMH_RAM) // dyna SSV_WRITEMEM diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 4d75d2ba3b3..8eadb0d26cf 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -1396,18 +1396,18 @@ static READ16_HANDLER( passht4b_service_r ) return val; } -static READ16_HANDLER( passht4b_io1_r ) -{ +static READ16_HANDLER( passht4b_io1_r ) +{ return passht4b_io1_val; } -static READ16_HANDLER( passht4b_io2_r ) -{ +static READ16_HANDLER( passht4b_io2_r ) +{ return passht4b_io2_val; } -static READ16_HANDLER( passht4b_io3_r ) -{ +static READ16_HANDLER( passht4b_io3_r ) +{ return passht4b_io3_val; } @@ -1854,18 +1854,18 @@ MACHINE_DRIVER_END /***************************************************************************/ static READ16_HANDLER( tt_io_player1_r ) -{ - return input_port_read(machine, "P1") << 8; +{ + return input_port_read(machine, "P1") << 8; } static READ16_HANDLER( tt_io_player2_r ) -{ - return input_port_read(machine, "P2") << 8; +{ + return input_port_read(machine, "P2") << 8; } static READ16_HANDLER( tt_io_service_r ) -{ - return input_port_read(machine, "SERVICE") << 8; +{ + return input_port_read(machine, "SERVICE") << 8; } /* diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index 4c5a4fa2028..610c276a9e3 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -1285,7 +1285,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( mwalkbl ) PORT_INCLUDE( astormbl ) - + PORT_MODIFY("SERVICE") /* service */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index e5106f65d38..85d8f39d768 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -1106,7 +1106,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( nastar ) PORT_START_TAG("DSWA") - TAITO_MACHINE_NO_COCKTAIL + TAITO_MACHINE_NO_COCKTAIL TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index e22801adf4b..67c483fc8c4 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -404,8 +404,8 @@ static READ16_HANDLER( footchmp_input_r ) case 0x02: return input_port_read(machine, "IN2"); -// case 0x03: -// return (coin_word & mem_mask); +// case 0x03: +// return (coin_word & mem_mask); case 0x05: return input_port_read(machine, "IN0"); @@ -450,8 +450,8 @@ static READ16_HANDLER( ninjak_input_r ) case 0x06: return (input_port_read(machine, "IN2") << 8); -// case 0x07: -// return (coin_word & mem_mask); +// case 0x07: +// return (coin_word & mem_mask); } logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n", activecpu_get_pc(), offset); @@ -513,8 +513,8 @@ static READ16_HANDLER( deadconx_input_r ) case 0x02: return input_port_read(machine, "IN2"); -// case 0x03: -// return (coin_word & mem_mask); +// case 0x03: +// return (coin_word & mem_mask); case 0x05: return input_port_read(machine, "IN0"); diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index e97eddfce7b..942fa3321ca 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -90,7 +90,7 @@ static WRITE32_HANDLER( f3_control_w ) return; case 0x01: /* Coin counters & lockouts */ - if (ACCESSING_BITS_24_31) + if (ACCESSING_BITS_24_31) { coin_lockout_w(0,~data & 0x01000000); coin_lockout_w(1,~data & 0x02000000); @@ -101,7 +101,7 @@ static WRITE32_HANDLER( f3_control_w ) return; case 0x04: /* Eeprom */ - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); eeprom_write_bit(data & 0x04); @@ -110,7 +110,7 @@ static WRITE32_HANDLER( f3_control_w ) return; case 0x05: /* Player 3 & 4 coin counters */ - if (ACCESSING_BITS_24_31) + if (ACCESSING_BITS_24_31) { coin_lockout_w(2,~data & 0x01000000); coin_lockout_w(3,~data & 0x02000000); @@ -262,13 +262,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( kn ) PORT_INCLUDE( f3 ) - + PORT_MODIFY("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 4127a220512..7ce464131ee 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1286,7 +1286,7 @@ static READ16_HANDLER( dblaxle_steer_input_r ) } logerror("CPU #0 PC %06x: warning - read unmapped steer input offset %02x\n", activecpu_get_pc(), offset); - + return 0x00; } diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index e67c2b43e22..dba21588e41 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -868,7 +868,7 @@ static WRITE8_HANDLER(hc11_data_w) static READ8_HANDLER(hc11_analog_r) { - static const char *portnames[] = { "ANALOG1", "ANALOG2", "ANALOG3", "ANALOG4", + static const char *portnames[] = { "ANALOG1", "ANALOG2", "ANALOG3", "ANALOG4", "ANALOG5", "ANALOG6", "ANALOG7", "ANALOG8" }; return input_port_read_safe(machine, portnames[offset], 0); diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 7ddc092f13d..60d578d166e 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -165,16 +165,16 @@ static WRITE16_HANDLER(bigfight_a20000_w) { COMBINE_DATA(&bigfight_a20000[offset static WRITE16_HANDLER(bigfight_a40000_w) { COMBINE_DATA(&bigfight_a40000[offset]); } static WRITE16_HANDLER(bigfight_a60000_w) { COMBINE_DATA(&bigfight_a60000[offset]); } -static READ16_HANDLER(cyclwarr_input_r) -{ +static READ16_HANDLER(cyclwarr_input_r) +{ static const char *port[] = { "SERVICE", "P1", "P2", "DSW3" }; - return input_port_read(machine, port[offset]); + return input_port_read(machine, port[offset]); } -static READ16_HANDLER(cyclwarr_input2_r) -{ +static READ16_HANDLER(cyclwarr_input2_r) +{ static const char *port2[] = { "DSW1", "DSW2", "P3", "P4" }; - return input_port_read(machine, port2[offset]); + return input_port_read(machine, port2[offset]); } static WRITE16_HANDLER(cyclwarr_sound_w) diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index a4a4f22d8f3..81121aa9227 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -591,11 +591,11 @@ static ADDRESS_MAP_START( rocknms_main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line +// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? +// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index fa716debb73..9b8ed5b2eb8 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -722,7 +722,7 @@ static INPUT_PORTS_START( arknoid2 ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPSETTING( 0x80, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - + PORT_START_TAG("IN0") /* read at c000 (sound cpu) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -754,7 +754,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( arknid2u ) PORT_INCLUDE( arknoid2 ) - + PORT_MODIFY("DSWA") TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END @@ -954,7 +954,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( drtopplu ) PORT_INCLUDE( drtoppel ) - + PORT_MODIFY("DSWA") TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END @@ -1009,7 +1009,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( chukatau ) PORT_INCLUDE( chukatai ) - + PORT_MODIFY("DSWA") TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 4a78e483a2e..30235872d89 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -402,10 +402,10 @@ ADDRESS_MAP_END static INPUT_PORTS_START( rallybik ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -460,10 +460,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( truxton ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -545,10 +545,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( hellfire ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -625,10 +625,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( zerowing ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -709,10 +709,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( demonwld ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -792,10 +792,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( samesame ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -920,10 +920,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( outzone ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -1039,10 +1039,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( vimana ) TOAPLAN1_VBLANK_INPUT - PORT_START_TAG("P1") + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) - PORT_START_TAG("P2") + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 537ba1c21df..5c63e9c7d0d 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -112,7 +112,7 @@ static INPUT_PORTS_START( travrusa ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL - + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x03, 0x03, "Fuel Reduced on Collision" ) PORT_DIPSETTING( 0x03, DEF_STR( Low ) ) diff --git a/src/version.c b/src/version.c index 4ae153d2a04..84e795cf13a 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.126 ("__DATE__")"; +const char build_version[] = "0.126u1 ("__DATE__")"; -- cgit v1.2.3