diff options
author | Aaron Giles <aaron@aarongiles.com> | 2008-07-24 05:54:42 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2008-07-24 05:54:42 +0000 |
commit | 37c15af0df695eb5ef938e73fcf60c85bd1c56fc (patch) | |
tree | dafed2dfbd3a0dbfc99042ec453054554b49cc10 | |
parent | 6701abab273ac3c3005e5a4454078750993d8ff3 (diff) |
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Sent: Tue 7/22/2008 11:30 AM
To: submit@mamedev.org
Subject: more tags and AM_READ_PORT
Hi,
with the following patches I added tags to all ports (and used AM_READ_PORT
in the memory maps of all the drivers which didn't) in drivers starting with
B. I also added diplocations and factory settings for the games which had
either a manual or a dips listing at crazykong (and to squaitsa, thanks to
a scan from f205v) [1]. A couple of patches are separated from the main ones
because they contain changes which could need additional review
In details:
* diffB01->diffB07 contains standard addition of tags and AM_READ_PORTS to
driver starting with B (a diff each 4/5 drivers).
* bsktball.diff adds diplocations to the driver, but also removes the fake
handling of P1 Start/P1 Button1. Since other games have no separate P1 Start
in MAME (e.g bagman, or joust2 as noticed in the invalid bug 1734), I
personally see no reason to duplicate inputs in this game.
[1] In details, I added locations to: bwidow.c & bzone.c games, bestleag,
blackt96, bogeyman, bombjack, boogwing, bottom9, brkthru, darwin, buggychl,
squaitsa, btime, bnj, lnc, zoar and disco
36 files changed, 971 insertions, 1165 deletions
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 35e86fa51c4..9ff2082d0f8 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -45,23 +45,6 @@ static UINT8 *actfancr_ram; /******************************************************************************/ -static READ8_HANDLER( actfan_control_0_r ) -{ - return input_port_read(machine, "SYSTEM"); /* VBL */ -} - -static READ8_HANDLER( actfan_control_1_r ) -{ - switch (offset) - { - case 0: return input_port_read(machine, "P1"); - case 1: return input_port_read(machine, "P2"); - case 2: return input_port_read(machine, "DSW1"); - case 3: return input_port_read(machine, "DSW2"); - } - return 0xff; -} - static int trio_control_select; static WRITE8_HANDLER( triothep_control_select_w ) @@ -100,8 +83,11 @@ static ADDRESS_MAP_START( actfan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x110000, 0x110001) AM_WRITE(buffer_spriteram_w) AM_RANGE(0x120000, 0x1205ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) - AM_RANGE(0x130000, 0x130003) AM_READ(actfan_control_1_r) - AM_RANGE(0x140000, 0x140001) AM_READ(actfan_control_0_r) + AM_RANGE(0x130000, 0x130000) AM_READ_PORT("P1") + AM_RANGE(0x130001, 0x130001) AM_READ_PORT("P2") + AM_RANGE(0x130002, 0x130002) AM_READ_PORT("DSW1") + AM_RANGE(0x130003, 0x130003) AM_READ_PORT("DSW2") + AM_RANGE(0x140000, 0x140001) AM_READ_PORT("SYSTEM") /* VBL */ AM_RANGE(0x150000, 0x150001) AM_WRITE(actfancr_sound_w) AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_BASE(&actfancr_ram) /* Main ram */ ADDRESS_MAP_END @@ -140,7 +126,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( actfancr ) - PORT_START_TAG("P1") /* Player 1 controls */ + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -150,7 +136,7 @@ static INPUT_PORTS_START( actfancr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("P2") /* Player 2 controls */ + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL @@ -160,7 +146,7 @@ static INPUT_PORTS_START( actfancr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("SYSTEM") /* start buttons */ + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -214,10 +200,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( triothep ) PORT_INCLUDE( actfancr ) - PORT_MODIFY("P1") /* Player 1 controls */ + PORT_MODIFY("P1") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_MODIFY("P2") /* Player 2 controls */ + PORT_MODIFY("P2") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL PORT_MODIFY("DSW2") diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 7970a4cceec..0aec3e6f621 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -103,15 +103,9 @@ static void cage_irq_callback(running_machine *machine, int reason) * *************************************/ -static READ32_HANDLER( inputs_01_r ) -{ - return (input_port_read(machine, "IN0") << 16) | input_port_read(machine, "IN1"); -} - - static READ32_HANDLER( special_port2_r ) { - int temp = input_port_read(machine, "IN2"); + int temp = input_port_read(machine, "SERVICE"); temp ^= 0x0001; /* /A2DRDY always high for now */ temp ^= 0x0008; /* A2D.EOC always high for now */ return (temp << 16) | temp; @@ -120,7 +114,7 @@ static READ32_HANDLER( special_port2_r ) static READ32_HANDLER( special_port3_r ) { - int temp = input_port_read(machine, "IN3"); + int temp = input_port_read(machine, "COIN"); if (atarigen_video_int_state) temp ^= 0x0001; if (atarigen_scanline_int_state) temp ^= 0x0002; return (temp << 16) | temp; @@ -167,7 +161,7 @@ static READ32_HANDLER( analog_port0_r ) compute_fake_pots(pots); return (pots[0] << 24) | (pots[3] << 8); #else - return (input_port_read(machine, "IN4") << 24) | (input_port_read(machine, "IN5") << 8); + return (input_port_read(machine, "AN1") << 24) | (input_port_read(machine, "AN2") << 8); #endif } @@ -179,7 +173,7 @@ static READ32_HANDLER( analog_port1_r ) compute_fake_pots(pots); return (pots[2] << 24) | (pots[1] << 8); #else - return (input_port_read(machine, "IN6") << 24) | (input_port_read(machine, "IN7") << 8); + return (input_port_read(machine, "AN3") << 24) | (input_port_read(machine, "AN4") << 8); #endif } @@ -628,7 +622,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xe0a000, 0xe0a003) AM_WRITE(atarigen_scanline_int_ack32_w) AM_RANGE(0xe0c000, 0xe0c003) AM_WRITE(atarigen_video_int_ack32_w) AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(SMH_NOP)//watchdog_reset_w }, - AM_RANGE(0xe80000, 0xe80003) AM_READ(inputs_01_r) + AM_RANGE(0xe80000, 0xe80003) AM_READ_PORT("P1_P2") AM_RANGE(0xe82000, 0xe82003) AM_READ(special_port2_r) AM_RANGE(0xe82004, 0xe82007) AM_READ(special_port3_r) AM_RANGE(0xf80000, 0xffffff) AM_RAM @@ -642,32 +636,29 @@ ADDRESS_MAP_END * *************************************/ -#define COMMON_IN0\ - PORT_START_TAG("IN0")\ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )\ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )\ - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)\ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)\ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)\ - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)\ - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)\ - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)\ - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - -#define COMMON_IN1\ - PORT_START_TAG("IN1")\ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )\ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )\ - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)\ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)\ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)\ - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)\ - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)\ - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)\ - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) +#define COMMON_IN01\ + PORT_START_TAG("P1_P2")\ + PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )\ + PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )\ + PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)\ + PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)\ + PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)\ + PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)\ + PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)\ + PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)\ + PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)\ + PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED )\ + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )\ + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)\ + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)\ + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)\ + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)\ + PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)\ + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)\ + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) #define COMMON_IN2\ - PORT_START_TAG("IN2") /* 68.STATUS (A2=0) */ \ + PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */ \ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /A2DRDY */ \ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_TILT ) /* TILT */ \ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ23 */ \ @@ -678,7 +669,7 @@ ADDRESS_MAP_END PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) #define COMMON_IN3\ - PORT_START_TAG("IN3") /* 68.STATUS (A2=1) */ \ + PORT_START_TAG("COIN") /* 68.STATUS (A2=1) */ \ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /VBIRQ */ \ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /4MSIRQ */ \ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ0 */ \ @@ -690,9 +681,8 @@ ADDRESS_MAP_END PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) static INPUT_PORTS_START( tmek ) - COMMON_IN0 /* 68.SW (A1=0) */ - - COMMON_IN1 /* 68.SW (A1=1) */ + COMMON_IN01 /* 68.SW (A1=0) */ + /* 68.SW (A1=1) */ COMMON_IN2 @@ -705,16 +695,16 @@ static INPUT_PORTS_START( tmek ) PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) #else - PORT_START_TAG("IN4") + PORT_START_TAG("AN1") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START_TAG("IN5") + PORT_START_TAG("AN2") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN6") + PORT_START_TAG("AN3") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN7") + PORT_START_TAG("AN4") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) #endif @@ -722,24 +712,23 @@ INPUT_PORTS_END static INPUT_PORTS_START( primrage ) - COMMON_IN0 /* 68.SW (A1=0) */ - - COMMON_IN1 /* 68.SW (A1=1) bit 0x0008 does something */ + COMMON_IN01 /* 68.SW (A1=0) */ + /* 68.SW (A1=1) bit 0x0008 does something */ COMMON_IN2 /* 68.STATUS (A2=0) */ COMMON_IN3 /* 68.STATUS (A2=1) */ - PORT_START_TAG("IN4") + PORT_START_TAG("AN1") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN5") + PORT_START_TAG("AN2") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN6") + PORT_START_TAG("AN3") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN7") + PORT_START_TAG("AN4") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 353f6300348..1b9c6033813 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -81,7 +81,7 @@ static MACHINE_RESET( atarigx2 ) static READ32_HANDLER( special_port2_r ) { - int temp = input_port_read(machine, "IN2"); + int temp = input_port_read(machine, "SERVICE"); if (atarigen_cpu_to_sound_ready) temp ^= 0x0020; if (atarigen_sound_to_cpu_ready) temp ^= 0x0010; temp ^= 0x0008; /* A2D.EOC always high for now */ @@ -91,7 +91,7 @@ static READ32_HANDLER( special_port2_r ) static READ32_HANDLER( special_port3_r ) { - int temp = input_port_read(machine, "IN3"); + int temp = input_port_read(machine, "SPECIAL"); return (temp << 16) | temp; } @@ -1163,19 +1163,6 @@ static READ32_HANDLER( atarigx2_protection_r ) /************************************* * - * 32-bit stub handlers - * - *************************************/ - -static READ32_HANDLER( inputs_01_r ) -{ - return (input_port_read(machine, "IN0") << 16) | input_port_read(machine, "IN1"); -} - - - -/************************************* - * * Main CPU memory handlers * *************************************/ @@ -1198,7 +1185,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xe08000, 0xe08003) AM_WRITE(latch_w) AM_RANGE(0xe0c000, 0xe0c003) AM_WRITE(atarigen_video_int_ack32_w) AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(SMH_NOP)//watchdog_reset_w }, - AM_RANGE(0xe80000, 0xe80003) AM_READ(inputs_01_r) + AM_RANGE(0xe80000, 0xe80003) AM_READ_PORT("P1_P2") AM_RANGE(0xe82000, 0xe82003) AM_READ(special_port2_r) AM_RANGE(0xe82004, 0xe82007) AM_READ(special_port3_r) AM_RANGE(0xe86000, 0xe86003) AM_READ(atarigen_sound_upper32_r) @@ -1215,29 +1202,27 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( spclords ) - PORT_START_TAG("IN0") /* 68.SW (A1=0) */ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) /* BLUE button */ - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* Left thumb */ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Left trigger */ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* Throttle forward */ - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* Throttle button */ - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - - PORT_START_TAG("IN1") /* 68.SW (A1=1) */ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) /* RED button */ - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* Right thumb */ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* Right trigger */ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* Throttle reverse */ - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - - PORT_START_TAG("IN2") /* 68.STATUS (A2=0) */ + PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */ + PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 ) /* RED button */ + PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* Right thumb */ + PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* Right trigger */ + PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* Throttle reverse */ + PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) + PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) + PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) + PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) + PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) /* BLUE button */ + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* Left thumb */ + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Left trigger */ + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* Throttle forward */ + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) + PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* Throttle button */ + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) + + PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */ PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */ @@ -1246,7 +1231,7 @@ static INPUT_PORTS_START( spclords ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") /* 68.STATUS (A2=1) */ + PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */ PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */ @@ -1276,18 +1261,16 @@ INPUT_PORTS_END static INPUT_PORTS_START( motofren ) - PORT_START_TAG("IN0") /* 68.SW (A1=0) */ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) /* Start/fire */ - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* AUX3 */ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* AUX2 */ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* AUX1 */ - PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("IN1") /* 68.SW (A1=1) */ - PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("IN2") /* 68.STATUS (A2=0) */ + PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */ + PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) /* Start/fire */ + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* AUX3 */ + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* AUX2 */ + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* AUX1 */ + PORT_BIT( 0xf0000000, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */ PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_UNUSED ) /* +5V */ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */ @@ -1296,7 +1279,7 @@ static INPUT_PORTS_START( motofren ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") /* 68.STATUS (A2=1) */ + PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */ PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */ @@ -1322,22 +1305,20 @@ INPUT_PORTS_END static INPUT_PORTS_START( rrreveng ) - PORT_START_TAG("IN0") /* 68.SW (A1=0) */ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) - PORT_BIT( 0x3000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("IN1") /* 68.SW (A1=1) */ - PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("IN2") /* 68.STATUS (A2=0) */ + PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */ + PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0000fe00, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) + PORT_BIT( 0x30000000, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */ PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */ @@ -1346,7 +1327,7 @@ static INPUT_PORTS_START( rrreveng ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") /* 68.STATUS (A2=1) */ + PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */ PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */ @@ -2039,7 +2020,7 @@ ROM_END static DRIVER_INIT( spclords ) { atarigen_eeprom_default = NULL; - atarijsa_init(machine, "IN2", 0x0040); + atarijsa_init(machine, "SERVICE", 0x0040); atarijsa3_init_adpcm(machine, REGION_SOUND1); atarigx2_playfield_base = 0x000; @@ -2051,7 +2032,7 @@ static DRIVER_INIT( spclords ) static DRIVER_INIT( motofren ) { atarigen_eeprom_default = NULL; - atarijsa_init(machine, "IN2", 0x0040); + atarijsa_init(machine, "SERVICE", 0x0040); atarijsa3_init_adpcm(machine, REGION_SOUND1); atarigx2_playfield_base = 0x400; @@ -2089,7 +2070,7 @@ static READ32_HANDLER( rrreveng_prot_r ) static DRIVER_INIT( rrreveng ) { atarigen_eeprom_default = NULL; - atarijsa_init(machine, "IN2", 0x0040); + atarijsa_init(machine, "SERVICE", 0x0040); atarijsa3_init_adpcm(machine, REGION_SOUND1); atarigx2_playfield_base = 0x000; diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 08db8a1503a..1d4508a71b4 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -316,9 +316,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0xfe0000, 0xfe1fff) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xfe2000, 0xfe3fff) AM_WRITE(atarigen_video_int_ack_w) - AM_RANGE(0xfe4000, 0xfe5fff) AM_READ(input_port_0_word_r) - AM_RANGE(0xfe6000, 0xfe6001) AM_READ(input_port_1_word_r) - AM_RANGE(0xfe6002, 0xfe6003) AM_READ(input_port_2_word_r) + AM_RANGE(0xfe4000, 0xfe5fff) AM_READ_PORT("FE4000") + AM_RANGE(0xfe6000, 0xfe6001) AM_READ_PORT("FE6000") + AM_RANGE(0xfe6002, 0xfe6003) AM_READ_PORT("FE6002") AM_RANGE(0xfe6004, 0xfe6005) AM_READ(pedal_0_r) AM_RANGE(0xfe6006, 0xfe6007) AM_READ(pedal_1_r) AM_RANGE(0xfe8000, 0xfe9fff) AM_WRITE(atarigen_sound_upper_w) diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index d5a68aa4ea2..5635c7917e6 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -56,6 +56,7 @@ I/O C ;AY-3-8910 Data Read Reg. DIP locations verified for: - bagman (manual) + - squaitsa (manual) ***************************************************************************/ @@ -195,7 +196,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) /* writes are handled by bagman_colorram_w */ AM_RANGE(0xa800, 0xa805) AM_WRITE(bagman_ls259_w) /* TMS5110 driving state machine */ AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w) - AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) /* DSW */ + AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_RANGE(0xb800, 0xb800) AM_READNOP AM_RANGE(0xc000, 0xffff) AM_ROM /* Super Bagman only */ @@ -221,7 +222,7 @@ static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&bagman_video_enable) AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w) - AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) + AM_RANGE(0xa800, 0xa800) AM_READ_PORT("DSW") AM_RANGE(0xa005, 0xa005) AM_WRITE(SMH_NOP) /* ???? */ @@ -244,7 +245,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( bagman ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -254,7 +255,7 @@ static INPUT_PORTS_START( bagman ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) @@ -301,10 +302,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( sbagman ) PORT_INCLUDE( bagman ) - PORT_MODIFY("IN0") + PORT_MODIFY("P1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* double-function button, start and shoot */ - PORT_MODIFY("IN1") + PORT_MODIFY("P2") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL /* double-function button, start and shoot */ INPUT_PORTS_END @@ -344,7 +345,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( squaitsa ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -354,7 +355,7 @@ static INPUT_PORTS_START( squaitsa ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY // ^ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) @@ -365,28 +366,26 @@ static INPUT_PORTS_START( squaitsa ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_START_TAG("DSW") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW:1") + PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) ) + PORT_DIPNAME( 0x06, 0x06, "Max Points" ) PORT_DIPLOCATION("SW:2,3") + PORT_DIPSETTING( 0x06, "7" ) + PORT_DIPSETTING( 0x04, "11" ) + PORT_DIPSETTING( 0x02, "15" ) + PORT_DIPSETTING( 0x00, "21" ) + PORT_DIPNAME( 0x18, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW:4,5") + PORT_DIPSETTING( 0x00, "Level 1" ) + PORT_DIPSETTING( 0x08, "Level 2" ) + PORT_DIPSETTING( 0x10, "Level 3" ) + PORT_DIPSETTING( 0x18, "Level 4" ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:6") + PORT_DIPSETTING( 0x20, DEF_STR( Spanish ) ) + PORT_DIPSETTING( 0x00, DEF_STR( English ) ) + PORT_DIPNAME( 0x40, 0x40, "Body Fault" ) PORT_DIPLOCATION("SW:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x00, "Protection?" ) + PORT_DIPNAME( 0x80, 0x00, "Protection?" ) /* Left empty in the dips scan */ PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 457e96b39d5..acca29f91e1 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -242,10 +242,10 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x98a0, 0x98bf) AM_WRITE(balsente_rombank_select_w) AM_RANGE(0x98c0, 0x98df) AM_WRITE(balsente_palette_select_w) AM_RANGE(0x98e0, 0x98ff) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x9900, 0x9900) AM_READ(input_port_0_r) - AM_RANGE(0x9901, 0x9901) AM_READ(input_port_1_r) - AM_RANGE(0x9902, 0x9902) AM_READ(input_port_2_r) - AM_RANGE(0x9903, 0x9903) AM_READWRITE(input_port_3_r, SMH_NOP) + AM_RANGE(0x9900, 0x9900) AM_READ_PORT("SWH") + AM_RANGE(0x9901, 0x9901) AM_READ_PORT("SWG") + AM_RANGE(0x9902, 0x9902) AM_READ_PORT("IN0") + AM_RANGE(0x9903, 0x9903) AM_READ_PORT("IN1") AM_WRITENOP AM_RANGE(0x9a00, 0x9a03) AM_READ(balsente_random_num_r) AM_RANGE(0x9a04, 0x9a05) AM_READWRITE(balsente_m6850_r, balsente_m6850_w) AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* system+cart NOVRAM */ @@ -324,7 +324,7 @@ ADDRESS_MAP_END PORT_DIPSETTING( 0x04, "1 Or 2" ) static INPUT_PORTS_START( sentetst ) - PORT_START_TAG("IN0") + PORT_START_TAG("SWH") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("H1:1,2") PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) @@ -339,7 +339,7 @@ static INPUT_PORTS_START( sentetst ) PORT_DIPSETTING( 0x80, "Keep Top 5" ) PORT_DIPSETTING( 0x00, "Keep All" ) - PORT_START_TAG("IN1") + PORT_START_TAG("SWG") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("G1:1,2") PORT_DIPSETTING( 0x00, "Every 10,000" ) PORT_DIPSETTING( 0x01, "Every 15,000" ) @@ -359,7 +359,7 @@ static INPUT_PORTS_START( sentetst ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1) @@ -368,7 +368,7 @@ static INPUT_PORTS_START( sentetst ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -395,7 +395,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( cshift ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("G1:3") @@ -406,12 +406,12 @@ static INPUT_PORTS_START( cshift ) PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_MODIFY("AN2") @@ -425,11 +425,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( gghost ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_PLAYERS_PER_COIN PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "H1:8" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x07, 0x05, "Game Duration" ) PORT_DIPLOCATION("G1:1,2,3") PORT_DIPSETTING( 0x00, "9 Points" ) PORT_DIPSETTING( 0x02, "11 Points" ) @@ -444,12 +444,12 @@ static INPUT_PORTS_START( gghost ) PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "G1:3" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:2" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -473,11 +473,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( hattrick ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_PLAYERS_PER_COIN PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "H1:8" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x07, 0x02, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("G1:1,2,3") PORT_DIPSETTING( 0x00, "1:15" ) PORT_DIPSETTING( 0x01, "1:30" ) @@ -492,11 +492,11 @@ static INPUT_PORTS_START( hattrick ) PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) @@ -513,24 +513,24 @@ INPUT_PORTS_END static INPUT_PORTS_START( otwalls ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_PLAYERS_PER_COIN PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "H1:8" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "G1:3" ) PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "G1:4" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Player 1 Dial */ @@ -546,7 +546,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( snakjack ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("G1:1,2") PORT_DIPSETTING( 0x00, "Every 15,000" ) PORT_DIPSETTING( 0x01, "Every 20,000" ) @@ -554,7 +554,7 @@ static INPUT_PORTS_START( snakjack ) PORT_DIPSETTING( 0x03, "Every 30,000" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -562,7 +562,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( stocker ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x1c, 0x00, "Bonus Coins" ) PORT_DIPLOCATION("H1:3,4,5") PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_DIPSETTING( 0x04, "2 Coins = 1 Bonus" ) @@ -581,7 +581,7 @@ static INPUT_PORTS_START( stocker ) PORT_DIPSETTING( 0x80, "x5" ) PORT_DIPSETTING( 0xc0, "x6" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "G1:3" ) @@ -590,10 +590,10 @@ static INPUT_PORTS_START( stocker ) PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "3 Tickets" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -609,7 +609,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( triviag1 ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x20, 0x00, "Sound" ) PORT_DIPLOCATION("H1:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -620,7 +620,7 @@ static INPUT_PORTS_START( triviag1 ) PORT_DIPSETTING( 0x00, "Keep Top 5" ) PORT_DIPSETTING( 0x80, "Keep Top 10" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPNAME( 0x0c, 0x04, "Guesses" ) PORT_DIPLOCATION("G1:3,4") @@ -630,11 +630,11 @@ static INPUT_PORTS_START( triviag1 ) PORT_DIPSETTING( 0x0c, "6" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Red Button") @@ -651,14 +651,14 @@ INPUT_PORTS_END static INPUT_PORTS_START( triviaes ) PORT_INCLUDE( triviag1 ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("H1:1,2") PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x0c, 0x04, "Guesses" ) PORT_DIPLOCATION("G1:3,4") PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0x04, "3" ) @@ -670,10 +670,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( gimeabrk ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x03, 0x01, "Bonus Shot" ) PORT_DIPLOCATION("G1:1,2") PORT_DIPSETTING( 0x00, "Every 6 Balls" ) PORT_DIPSETTING( 0x01, "Every 8 Balls" ) @@ -694,7 +694,7 @@ static INPUT_PORTS_START( gimeabrk ) PORT_DIPSETTING( 0x40, "Keep Top 5" ) PORT_DIPSETTING( 0x00, "Keep All" ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -714,10 +714,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( minigolf ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x01, 0x01, "Add-A-Coin" ) PORT_DIPLOCATION("G1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -734,7 +734,7 @@ static INPUT_PORTS_START( minigolf ) PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START4 ) @@ -753,10 +753,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( minigol2 ) PORT_INCLUDE( minigolf ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "G1:3" ) PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "G1:4" ) @@ -766,7 +766,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( toggle ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("G1:3") @@ -777,11 +777,11 @@ static INPUT_PORTS_START( toggle ) PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) @@ -798,14 +798,14 @@ INPUT_PORTS_END static INPUT_PORTS_START( nametune ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("H1:1,2") PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 3C_2C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "G1:3" ) @@ -814,14 +814,14 @@ static INPUT_PORTS_START( nametune ) PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("P1 Blue Button") PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Green Button") PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Yellow Button") PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Red Button") PORT_PLAYER(1) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Red Button") PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Yellow Button") PORT_PLAYER(2) @@ -836,10 +836,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( nstocker ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("G1:1") PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) @@ -863,10 +863,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( sfootbal ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x07, 0x03, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("G1:1,2,3") PORT_DIPSETTING( 0x00, "1:30" ) PORT_DIPSETTING( 0x01, "1:40" ) @@ -881,12 +881,12 @@ static INPUT_PORTS_START( sfootbal ) PORT_DIPSETTING( 0x08, "1 Or 2" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x38, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -909,10 +909,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( spiker ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x01, 0x00, "Game Duration" ) PORT_DIPLOCATION("G1:1") PORT_DIPSETTING( 0x00, "11 Points" ) PORT_DIPSETTING( 0x01, "15 Points" ) @@ -923,11 +923,11 @@ static INPUT_PORTS_START( spiker ) PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "G1:6" ) PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) @@ -950,10 +950,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( stompin ) PORT_INCLUDE( stocker ) /* Set H:1-8 all to OFF to enable Free Play */ - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x01, 0x00, "Display Kids" ) PORT_DIPLOCATION("G1:1") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x01, DEF_STR( Yes ) ) @@ -973,13 +973,13 @@ static INPUT_PORTS_START( stompin ) PORT_DIPSETTING( 0x00, "Regular" ) PORT_DIPSETTING( 0x80, DEF_STR( None ) ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(1) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1) @@ -1011,7 +1011,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( grudge ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) PORT_DIPLOCATION("H1:1,2") PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x01, "1" ) @@ -1021,7 +1021,7 @@ static INPUT_PORTS_START( grudge ) PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x80, "1" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "G1:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "G1:2" ) PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "G1:3" ) @@ -1031,7 +1031,7 @@ static INPUT_PORTS_START( grudge ) PORT_DIPSETTING( 0x80, "2" ) PORT_DIPSETTING( 0x00, "3" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) @@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( grudge ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) @@ -1063,10 +1063,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( rescraid ) PORT_INCLUDE( stocker ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") BALSENTE_COINAGE_ALT2 - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("G1:1") PORT_DIPSETTING( 0x00, "4" ) PORT_DIPSETTING( 0x01, "5" ) @@ -1081,7 +1081,7 @@ static INPUT_PORTS_START( rescraid ) PORT_DIPSETTING( 0x40, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(1) @@ -1089,7 +1089,7 @@ static INPUT_PORTS_START( rescraid ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1) @@ -1104,7 +1104,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( shrike ) PORT_INCLUDE( sentetst ) - PORT_MODIFY("IN0") + PORT_MODIFY("SWH") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage )) PORT_DIPLOCATION("H1:1,2") PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C )) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C )) @@ -1115,7 +1115,7 @@ static INPUT_PORTS_START( shrike ) PORT_DIPSETTING( 0x00, DEF_STR( Yes )) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "H1:8" ) - PORT_MODIFY("IN1") + PORT_MODIFY("SWG") PORT_DIPNAME( 0x03, 0x03, "Minimum Game Time" ) PORT_DIPLOCATION("G1:1,2") PORT_DIPSETTING( 0x00, "1:00" ) PORT_DIPSETTING( 0x01, "1:30" ) @@ -1125,13 +1125,13 @@ static INPUT_PORTS_START( shrike ) PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "G1:4" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x20, "G1:7" ) - PORT_MODIFY("IN2") + PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_MODIFY("IN3") + PORT_MODIFY("IN1") PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) // carpet switch diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index b3d41affb46..a7ae06ee77a 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -126,10 +126,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bankp_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, SN76496_0_w) - AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, SN76496_1_w) - AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, SN76496_2_w) - AM_RANGE(0x04, 0x04) AM_READ(input_port_3_r) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(SN76496_0_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(SN76496_1_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_WRITE(SN76496_2_w) + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_RANGE(0x05, 0x05) AM_WRITE(bankp_scroll_w) AM_RANGE(0x07, 0x07) AM_WRITE(bankp_out_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 6bde32c53e0..2838077c816 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -141,8 +141,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x120000, 0x120fff) AM_MIRROR(0x01f000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0x260000, 0x260001) AM_MIRROR(0x11ff8c) AM_READ(input_port_0_word_r) - AM_RANGE(0x260002, 0x260003) AM_MIRROR(0x11ff8c) AM_READ(input_port_1_word_r) + AM_RANGE(0x260000, 0x260001) AM_MIRROR(0x11ff8c) AM_READ_PORT("260000") + AM_RANGE(0x260002, 0x260003) AM_MIRROR(0x11ff8c) AM_READ_PORT("260002") AM_RANGE(0x260010, 0x260011) AM_MIRROR(0x11ff8e) AM_READ(special_port2_r) AM_RANGE(0x260030, 0x260031) AM_MIRROR(0x11ff8e) AM_READ(atarigen_sound_r) AM_RANGE(0x260040, 0x260041) AM_MIRROR(0x11ff8e) AM_WRITE(atarigen_sound_w) diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 207a56191ab..001a326ec6d 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -91,12 +91,12 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(battlane_tileram_w) AM_SHARE(2) AM_BASE(&battlane_tileram) - AM_RANGE(0x1800, 0x18ff) AM_RAM_WRITE(battlane_spriteram_w) AM_SHARE(3) AM_BASE(&battlane_spriteram) - AM_RANGE(0x1c00, 0x1c00) AM_READWRITE(input_port_0_r, battlane_video_ctrl_w) - AM_RANGE(0x1c01, 0x1c01) AM_READWRITE(input_port_1_r, battlane_scrollx_w) - AM_RANGE(0x1c02, 0x1c02) AM_READWRITE(input_port_2_r, battlane_scrolly_w) - AM_RANGE(0x1c03, 0x1c03) AM_READWRITE(input_port_3_r, battlane_cpu_command_w) + AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(battlane_tileram_w) AM_SHARE(2) AM_BASE(&battlane_tileram) + AM_RANGE(0x1800, 0x18ff) AM_RAM_WRITE(battlane_spriteram_w) AM_SHARE(3) AM_BASE(&battlane_spriteram) + AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("P1") AM_WRITE(battlane_video_ctrl_w) + AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE(battlane_scrollx_w) + AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE(battlane_scrolly_w) + AM_RANGE(0x1c03, 0x1c03) AM_READ_PORT("DSW2") AM_WRITE(battlane_cpu_command_w) AM_RANGE(0x1c04, 0x1c04) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w) AM_RANGE(0x1c05, 0x1c05) AM_WRITE(YM3526_write_port_0_w) AM_RANGE(0x1e00, 0x1e3f) AM_WRITE(battlane_palette_w) @@ -117,7 +117,7 @@ static INTERRUPT_GEN( battlane_cpu1_interrupt ) static INPUT_PORTS_START( battlane ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -127,7 +127,7 @@ static INPUT_PORTS_START( battlane ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL @@ -135,7 +135,7 @@ static INPUT_PORTS_START( battlane ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_START_TAG("DSW1") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:1,2") diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index f4ecfa46ccc..bfc3b7fefb6 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -76,10 +76,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) - AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) - AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r) - AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r) + AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") + AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") + AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") + AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2") ADDRESS_MAP_END @@ -101,7 +101,7 @@ ADDRESS_MAP_END /*** INPUT PORTS *************************************************************/ static INPUT_PORTS_START( battlex ) - PORT_START /* IN0 */ + PORT_START_TAG("DSW1") /* IN0 */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) @@ -124,7 +124,7 @@ static INPUT_PORTS_START( battlex ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN1 */ + PORT_START_TAG("SYSTEM") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) @@ -134,7 +134,7 @@ static INPUT_PORTS_START( battlex ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START /* IN2 */ + PORT_START_TAG("INPUTS") /* IN2 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -144,7 +144,7 @@ static INPUT_PORTS_START( battlex ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_START /* IN3 */ + PORT_START_TAG("DSW2") /* IN3 */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x07, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index ff94f540736..611cc088129 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -54,11 +54,11 @@ static ADDRESS_MAP_START( battlnts_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2200, 0x23ff) AM_READWRITE(K007342_scroll_r, K007342_scroll_w) /* Scroll RAM */ AM_RANGE(0x2400, 0x24ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram)/* palette */ AM_RANGE(0x2600, 0x2607) AM_WRITE(K007342_vreg_w) /* Video Registers */ - AM_RANGE(0x2e00, 0x2e00) AM_READ(input_port_0_r) /* DIPSW #1 */ - AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_4_r) /* 2P controls */ - AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_3_r) /* 1P controls */ - AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_2_r) /* coinsw, testsw, startsw */ - AM_RANGE(0x2e04, 0x2e04) AM_READ(input_port_1_r) /* DISPW #2 */ + AM_RANGE(0x2e00, 0x2e00) AM_READ_PORT("DSW1") + AM_RANGE(0x2e01, 0x2e01) AM_READ_PORT("P2") + AM_RANGE(0x2e02, 0x2e02) AM_READ_PORT("P1") + AM_RANGE(0x2e03, 0x2e03) AM_READ_PORT("DSW3") /* coinsw, testsw, startsw */ + AM_RANGE(0x2e04, 0x2e04) AM_READ_PORT("DSW2") AM_RANGE(0x2e08, 0x2e08) AM_WRITE(battlnts_bankswitch_w) /* bankswitch control */ AM_RANGE(0x2e0c, 0x2e0c) AM_WRITE(battlnts_spritebank_w) /* sprite bank select */ AM_RANGE(0x2e10, 0x2e10) AM_WRITE(watchdog_reset_w) /* watchdog reset */ diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index f525b3e9d26..5077041085e 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -206,8 +206,8 @@ static READ8_HANDLER( controller_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_ROM AM_RANGE(0x1800, 0x1fff) AM_RAM - AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_READ(input_port_0_r) - AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READ(input_port_1_r) + AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_READ_PORT("DSW") + AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READ_PORT("INPUTS") AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(controller_r) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_READ(v128_r) AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&beaminv_videoram) AM_SIZE(&beaminv_videoram_size) @@ -235,7 +235,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( beaminv ) - PORT_START_TAG("IN0") + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x01, "4" ) @@ -254,7 +254,7 @@ static INPUT_PORTS_START( beaminv ) PORT_DIPSETTING( 0x60, "Never" ) PORT_DIPUNUSED( 0x80, IP_ACTIVE_HIGH ) - PORT_START_TAG("IN1") + PORT_START_TAG("INPUTS") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) @@ -271,38 +271,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( beaminva ) - PORT_START_TAG("IN0") - PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x00, "3" ) - PORT_DIPSETTING( 0x01, "4" ) - PORT_DIPSETTING( 0x02, "5" ) - PORT_DIPSETTING( 0x03, "6" ) + PORT_INCLUDE( beaminv ) + + PORT_MODIFY("DSW") PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x00, "1500" ) PORT_DIPSETTING( 0x04, "2000" ) PORT_DIPSETTING( 0x08, "2500" ) PORT_DIPSETTING( 0x0c, "3000" ) - PORT_DIPUNUSED( 0x10, IP_ACTIVE_HIGH ) PORT_DIPNAME( 0x60, 0x00, "Faster Bombs At" ) PORT_DIPSETTING( 0x00, "44 Enemies" ) PORT_DIPSETTING( 0x20, "39 Enemies" ) PORT_DIPSETTING( 0x40, "34 Enemies" ) PORT_DIPSETTING( 0x40, "29 Enemies" ) - PORT_DIPUNUSED( 0x80, IP_ACTIVE_HIGH ) - - PORT_START_TAG("IN1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG(P1_CONTROL_PORT_TAG) - PORT_BIT( 0xff, 0x65, IPT_PADDLE ) PORT_MINMAX(0x35,0x95) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1) - - PORT_START_TAG(P2_CONTROL_PORT_TAG) - PORT_BIT( 0xff, 0x65, IPT_PADDLE ) PORT_MINMAX(0x35,0x95) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2) INPUT_PORTS_END diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index 291e2fc44ee..1eedc992a81 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -586,9 +586,9 @@ static ADDRESS_MAP_START( berzerk_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_NOP AM_RANGE(0x40, 0x47) AM_READWRITE(berzerk_audio_r, berzerk_audio_w) - AM_RANGE(0x48, 0x48) AM_READWRITE(input_port_0_r, SMH_NOP) - AM_RANGE(0x49, 0x49) AM_READWRITE(input_port_1_r, SMH_NOP) - AM_RANGE(0x4a, 0x4a) AM_READWRITE(input_port_2_r, SMH_NOP) + AM_RANGE(0x48, 0x48) AM_READ_PORT("P1") AM_WRITENOP + AM_RANGE(0x49, 0x49) AM_READ_PORT("SYSTEM") AM_WRITENOP + AM_RANGE(0x4a, 0x4a) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0x4b, 0x4b) AM_READWRITE(SMH_NOP, magicram_control_w) AM_RANGE(0x4c, 0x4c) AM_READWRITE(nmi_enable_r, nmi_enable_w) AM_RANGE(0x4d, 0x4d) AM_READWRITE(nmi_disable_r, nmi_disable_w) @@ -596,12 +596,12 @@ static ADDRESS_MAP_START( berzerk_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x4f, 0x4f) AM_READWRITE(SMH_NOP, irq_enable_w) AM_RANGE(0x50, 0x57) AM_NOP /* second sound board, but not used */ AM_RANGE(0x58, 0x5f) AM_NOP - AM_RANGE(0x60, 0x60) AM_MIRROR(0x18) AM_READWRITE(input_port_3_r, SMH_NOP) - AM_RANGE(0x61, 0x61) AM_MIRROR(0x18) AM_READWRITE(input_port_4_r, SMH_NOP) - AM_RANGE(0x62, 0x62) AM_MIRROR(0x18) AM_READWRITE(input_port_5_r, SMH_NOP) - AM_RANGE(0x63, 0x63) AM_MIRROR(0x18) AM_READWRITE(input_port_6_r, SMH_NOP) - AM_RANGE(0x64, 0x64) AM_MIRROR(0x18) AM_READWRITE(input_port_7_r, SMH_NOP) - AM_RANGE(0x65, 0x65) AM_MIRROR(0x18) AM_READWRITE(input_port_8_r, SMH_NOP) + AM_RANGE(0x60, 0x60) AM_MIRROR(0x18) AM_READ_PORT("F3") AM_WRITENOP + AM_RANGE(0x61, 0x61) AM_MIRROR(0x18) AM_READ_PORT("F2") AM_WRITENOP + AM_RANGE(0x62, 0x62) AM_MIRROR(0x18) AM_READ_PORT("F6") AM_WRITENOP + AM_RANGE(0x63, 0x63) AM_MIRROR(0x18) AM_READ_PORT("F5") AM_WRITENOP + AM_RANGE(0x64, 0x64) AM_MIRROR(0x18) AM_READ_PORT("F4") AM_WRITENOP + AM_RANGE(0x65, 0x65) AM_MIRROR(0x18) AM_READ_PORT("SW2") AM_WRITENOP AM_RANGE(0x66, 0x66) AM_MIRROR(0x18) AM_READWRITE(led_off_r, led_off_w) AM_RANGE(0x67, 0x67) AM_MIRROR(0x18) AM_READWRITE(led_on_r, led_on_w) AM_RANGE(0x80, 0xff) AM_NOP @@ -636,8 +636,8 @@ ADDRESS_MAP_END PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) -static INPUT_PORTS_START( berzerk ) - PORT_START /* IN0 */ +static INPUT_PORTS_START( common ) + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY @@ -645,7 +645,7 @@ static INPUT_PORTS_START( berzerk ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN1 */ + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -653,7 +653,7 @@ static INPUT_PORTS_START( berzerk ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* IN2 */ + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL @@ -664,7 +664,29 @@ static INPUT_PORTS_START( berzerk ) PORT_DIPSETTING( 0x80, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_START /* IN3 */ + /* fake port for monitor type */ + PORT_START_TAG(MONITOR_TYPE_PORT_TAG) + PORT_CONFNAME( 0x01, 0x00, "Monitor Type" ) + PORT_CONFSETTING( 0x00, "Wells-Gardner" ) + PORT_CONFSETTING( 0x01, "Electrohome" ) + PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) +INPUT_PORTS_END + +static INPUT_PORTS_START( berzerk ) + PORT_INCLUDE( common ) + + PORT_START_TAG("F2") + PORT_DIPNAME( 0x03, 0x00, "Color Test" ) PORT_CODE(KEYCODE_F5) PORT_TOGGLE PORT_DIPLOCATION("F2:1,2") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x03, DEF_STR( On ) ) + PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("F2:7,8") + PORT_DIPSETTING( 0xc0, "5000 and 10000" ) + PORT_DIPSETTING( 0x40, "5000" ) + PORT_DIPSETTING( 0x80, "10000" ) + PORT_DIPSETTING( 0x00, DEF_STR( None ) ) + + PORT_START_TAG("F3") PORT_DIPNAME( 0x01, 0x00, "Input Test Mode" ) PORT_CODE(KEYCODE_F2) PORT_TOGGLE PORT_DIPLOCATION("F3:1") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -678,71 +700,45 @@ static INPUT_PORTS_START( berzerk ) PORT_DIPSETTING( 0x80, DEF_STR( French ) ) PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) ) - PORT_START /* IN4 */ - PORT_DIPNAME( 0x03, 0x00, "Color Test" ) PORT_CODE(KEYCODE_F5) PORT_TOGGLE PORT_DIPLOCATION("F2:1,2") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x03, DEF_STR( On ) ) - PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("F2:7,8") - PORT_DIPSETTING( 0xc0, "5000 and 10000" ) - PORT_DIPSETTING( 0x40, "5000" ) - PORT_DIPSETTING( 0x80, "10000" ) - PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - - PORT_START /* IN5 */ - BERZERK_COINAGE(3, F6) + PORT_START_TAG("F4") + BERZERK_COINAGE(1, F4) - PORT_START /* IN6 */ + PORT_START_TAG("F5") BERZERK_COINAGE(2, F5) - PORT_START /* IN7 */ - BERZERK_COINAGE(1, F4) + PORT_START_TAG("F6") + BERZERK_COINAGE(3, F6) - PORT_START /* IN8 */ + PORT_START_TAG("SW2") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Stats") PORT_CODE(KEYCODE_F1) - - /* fake port for monitor type */ - PORT_START_TAG(MONITOR_TYPE_PORT_TAG) - PORT_CONFNAME( 0x01, 0x00, "Monitor Type" ) - PORT_CONFSETTING( 0x00, "Wells-Gardner" ) - PORT_CONFSETTING( 0x01, "Electrohome" ) - PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Stats") PORT_CODE(KEYCODE_F1) INPUT_PORTS_END static INPUT_PORTS_START( frenzy ) - PORT_START /* IN0 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( common ) - PORT_START /* IN1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_MODIFY("SYSTEM") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) + PORT_START_TAG("F2") + /* Bit 0 does some more hardware tests. According to the manual, both bit 0 & 1 must be: + - ON for Signature Analysis (S.A.) + - OFF for game operation */ + PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) // F2:1,2 + PORT_DIPNAME( 0x04, 0x00, "Input Test Mode" ) PORT_CODE(KEYCODE_F2) PORT_TOGGLE PORT_DIPLOCATION("F2:3") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x04, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x00, "Crosshair Pattern" ) PORT_CODE(KEYCODE_F4) PORT_TOGGLE PORT_DIPLOCATION("F2:4") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) // F2:5,6,7,8 - PORT_START /* IN3 */ - PORT_DIPNAME( 0x0f, 0x03, DEF_STR( Bonus_Life ) ) + PORT_START_TAG("F3") + PORT_DIPNAME( 0x0f, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("F3:1,2,3,4") PORT_DIPSETTING( 0x01, "1000" ) PORT_DIPSETTING( 0x02, "2000" ) PORT_DIPSETTING( 0x03, "3000" ) @@ -759,27 +755,17 @@ static INPUT_PORTS_START( frenzy ) PORT_DIPSETTING( 0x0e, "14000" ) PORT_DIPSETTING( 0x0f, "15000" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) + PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_UNUSED ) // F3:5,6 + PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("F3:7,8") PORT_DIPSETTING( 0x00, DEF_STR( English ) ) PORT_DIPSETTING( 0x40, DEF_STR( German ) ) PORT_DIPSETTING( 0x80, DEF_STR( French ) ) PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) ) - PORT_START /* IN4 */ - PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Bit 0 does some more hardware tests */ - PORT_DIPNAME( 0x04, 0x00, "Input Test Mode" ) PORT_CODE(KEYCODE_F2) PORT_TOGGLE - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x00, "Crosshair Pattern" ) PORT_CODE(KEYCODE_F4) PORT_TOGGLE - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - /* The following 3 ports use all 8 bits, but I didn't feel like adding all 256 values :-) */ - PORT_START /* IN5 */ - PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit B" ) - /*PORT_DIPSETTING( 0x00, "0" ) Can't insert coins */ + PORT_START_TAG("F4") + PORT_DIPNAME( 0x0f, 0x01, "Coin Multiplier" ) PORT_DIPLOCATION("F4:1,2,3,4") // F4:1,8 + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x01, "1" ) PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x03, "3" ) @@ -797,8 +783,8 @@ static INPUT_PORTS_START( frenzy ) PORT_DIPSETTING( 0x0f, "15" ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN6 */ - PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit A" ) + PORT_START_TAG("F5") + PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit A" ) PORT_DIPLOCATION("F5:1,2,3,4") // F5:1,8 /*PORT_DIPSETTING( 0x00, "0" ) Can't insert coins */ PORT_DIPSETTING( 0x01, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -817,9 +803,9 @@ static INPUT_PORTS_START( frenzy ) PORT_DIPSETTING( 0x0f, "15" ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN7 */ - PORT_DIPNAME( 0x0f, 0x01, "Coin Multiplier" ) - PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) + PORT_START_TAG("F6") + PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit B" ) PORT_DIPLOCATION("F6:1,2,3,4") // F6:1,8 + /*PORT_DIPSETTING( 0x00, "0" ) Can't insert coins */ PORT_DIPSETTING( 0x01, "1" ) PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x03, "3" ) @@ -837,17 +823,10 @@ static INPUT_PORTS_START( frenzy ) PORT_DIPSETTING( 0x0f, "15" ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN8 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) + PORT_START_TAG("SW2") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_DIPLOCATION("SW2:1") PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Stats") PORT_CODE(KEYCODE_F1) - - /* fake port for monitor type */ - PORT_START_TAG(MONITOR_TYPE_PORT_TAG) - PORT_CONFNAME( 0x01, 0x00, "Monitor Type" ) - PORT_CONFSETTING( 0x00, "Wells-Gardner" ) - PORT_CONFSETTING( 0x01, "Electrohome" ) - PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Stats") PORT_CODE(KEYCODE_F1) INPUT_PORTS_END diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 001f11838d8..0e4fb4bc0f2 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -15,6 +15,8 @@ Changes 29/03/2005 - Pierpaolo Prazzoli - Added sprites wraparound - Added sprites color masking +Dip Locations added according to Service Mode + *******************************************************************************************/ #include "driver.h" @@ -193,11 +195,11 @@ static ADDRESS_MAP_START( bestleag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0f8000, 0x0f800b) AM_RAM AM_BASE(&bestleag_vregs) AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x300010, 0x300011) AM_READ(input_port_0_word_r) - AM_RANGE(0x300012, 0x300013) AM_READ(input_port_1_word_r) - AM_RANGE(0x300014, 0x300015) AM_READ(input_port_2_word_r) - AM_RANGE(0x300016, 0x300017) AM_READ(input_port_3_word_r) - AM_RANGE(0x300018, 0x300019) AM_READ(input_port_4_word_r) + AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM") + AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1") + AM_RANGE(0x300014, 0x300015) AM_READ_PORT("P2") + AM_RANGE(0x300016, 0x300017) AM_READ_PORT("DSWA") + AM_RANGE(0x300018, 0x300019) AM_READ_PORT("DSWB") AM_RANGE(0x30001c, 0x30001d) AM_WRITE(oki_bank_w) AM_RANGE(0x30001e, 0x30001f) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) AM_RANGE(0x304000, 0x304001) AM_WRITENOP @@ -215,7 +217,7 @@ ADDRESS_MAP_END PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) static INPUT_PORTS_START( bestleag ) - PORT_START /* System inputs */ + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -225,14 +227,14 @@ static INPUT_PORTS_START( bestleag ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START /* Player 1 controls */ + PORT_START_TAG("P1") BESTLEAG_PLAYER_INPUT( 1 ) - PORT_START /* Player 2 controls */ + PORT_START_TAG("P2") BESTLEAG_PLAYER_INPUT( 2 ) - PORT_START /* DSW0 */ - PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSWA") + PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW.A:1,2,3,4") PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) @@ -245,7 +247,7 @@ static INPUT_PORTS_START( bestleag ) PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // also set "Coin B" to "Free Play" /* 0x01 to 0x05 gives 2C_3C */ - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW.A:5,6,7,8") PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) @@ -259,27 +261,27 @@ static INPUT_PORTS_START( bestleag ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // also set "Coin A" to "Free Play" /* 0x10 to 0x50 gives 2C_3C */ - PORT_START /* DSW1 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) // Doesn't work ? + PORT_START_TAG("DSWB") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW.B:1") // Doesn't work ? PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW.B:2,3") PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x06, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x18, 0x18, "Timer Speed" ) + PORT_DIPNAME( 0x18, 0x18, "Timer Speed" ) PORT_DIPLOCATION("SW.B:4,5") PORT_DIPSETTING( 0x08, "Slow" ) // 65 PORT_DIPSETTING( 0x18, DEF_STR( Normal ) ) // 50 PORT_DIPSETTING( 0x10, "Fast" ) // 35 PORT_DIPSETTING( 0x00, "Fastest" ) // 25 - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW.B:6") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x20, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "2 Players Game" ) + PORT_DIPNAME( 0x40, 0x40, "2 Players Game" ) PORT_DIPLOCATION("SW.B:7") PORT_DIPSETTING( 0x40, "1 Credit" ) PORT_DIPSETTING( 0x00, "2 Credits" ) - PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) + PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW.B:8") INPUT_PORTS_END /* GFX Decode */ diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index fb894a22b0e..40fafe81fea 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -317,7 +317,7 @@ static READ16_HANDLER(sharedram_r) break; case 0x46/2: - return (input_port_read(machine, "IN0") & 0xffff)^0xffff; + return (input_port_read(machine, "P1") & 0xffff)^0xffff; } @@ -334,10 +334,10 @@ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x088000, 0x089fff) AM_READ(SMH_RAM) AM_WRITE(text_videoram_w) AM_BASE(&text_videoram) AM_RANGE(0x08a000, 0x08afff) AM_READ(SMH_RAM) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08b000, 0x08bfff) AM_RAM //?? - AM_RANGE(0x08c000, 0x08c001) AM_READ(input_port_0_word_r) - AM_RANGE(0x08c002, 0x08c003) AM_READ(input_port_1_word_r) - AM_RANGE(0x08c004, 0x08c005) AM_READ(input_port_2_word_r) - AM_RANGE(0x08c006, 0x08c007) AM_READ(input_port_3_word_r) + AM_RANGE(0x08c000, 0x08c001) AM_READ_PORT("P1") + AM_RANGE(0x08c002, 0x08c003) AM_READ_PORT("P2") + AM_RANGE(0x08c004, 0x08c005) AM_READ_PORT("DSW0") + AM_RANGE(0x08c006, 0x08c007) AM_READ_PORT("DSW1") AM_RANGE(0x08d000, 0x08d001) AM_WRITE(io_w) //807b0 @@ -458,7 +458,7 @@ static MACHINE_DRIVER_START( bigfghtr ) MACHINE_DRIVER_END static INPUT_PORTS_START( bigfghtr ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -473,7 +473,7 @@ static INPUT_PORTS_START( bigfghtr ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 245c875c3c8..e84e5f37f27 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -69,11 +69,11 @@ static ADDRESS_MAP_START( bigstrkb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1f8000, 0x1f87ff) AM_RAM AM_BASE(&bigstrkb_spriteram) AM_RANGE(0x1f8800, 0x1fffff) AM_RAM - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) /* Dip 1 */ - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) /* Dip 2 */ - AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r) /* System */ - AM_RANGE(0x70000a, 0x70000b) AM_READ(input_port_4_word_r) /* Player 1 */ - AM_RANGE(0x70000c, 0x70000d) AM_READ(input_port_3_word_r) /* Player 2 */ + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW0") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1") + AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") + AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("P2") + AM_RANGE(0x70000c, 0x70000d) AM_READ_PORT("P1") AM_RANGE(0x700020, 0x700027) AM_WRITEONLY AM_BASE(&bsb_vidreg1) AM_RANGE(0x700030, 0x700037) AM_WRITEONLY AM_BASE(&bsb_vidreg2) @@ -99,7 +99,7 @@ ADDRESS_MAP_END PORT_BIT( 0x80, IP_ACTIVE_LOW, start ) static INPUT_PORTS_START( bigstrkb ) - PORT_START /* DSW0 (0x700000.w) */ + PORT_START_TAG("DSW0") /* DSW0 (0x700000.w) */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) @@ -127,7 +127,7 @@ static INPUT_PORTS_START( bigstrkb ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // also set "Coin A" to "Free Play" /* 0x10 to 0x50 gives 2C_3C */ - PORT_START /* DSW1 (0x700002.w) */ + PORT_START_TAG("DSW1") /* DSW1 (0x700002.w) */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) // Check code at 0x00097c (flip screen) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -149,7 +149,7 @@ static INPUT_PORTS_START( bigstrkb ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* System inputs (0x700004.w) */ + PORT_START_TAG("SYSTEM") /* System inputs (0x700004.w) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -159,10 +159,10 @@ static INPUT_PORTS_START( bigstrkb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Player 1 controls (0x70000c.w) */ + PORT_START_TAG("P1") /* Player 1 controls (0x70000c.w) */ BIGSTRKB_PLAYER_INPUT( 1, IPT_START1 ) - PORT_START /* Player 2 controls (0x70000a.w) */ + PORT_START_TAG("P2") /* Player 2 controls (0x70000a.w) */ BIGSTRKB_PLAYER_INPUT( 2, IPT_START2 ) INPUT_PORTS_END diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 2e9ee3decba..fa440f267c9 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -97,13 +97,13 @@ logerror("%06x: hacked_controls_r %04x %04x\n",activecpu_get_pc(),offset,bionicc static WRITE16_HANDLER( bionicc_mpu_trigger_w ) { - data = input_port_read(machine, "IN0") >> 12; + data = input_port_read(machine, "SYSTEM") >> 12; bionicc_inp[0] = data ^ 0x0f; - data = input_port_read(machine, "IN2"); /* player 2 controls */ + data = input_port_read(machine, "P2"); bionicc_inp[1] = data ^ 0xff; - data = input_port_read(machine, "IN1"); /* player 1 controls */ + data = input_port_read(machine, "P1"); bionicc_inp[2] = data ^ 0xff; } @@ -150,8 +150,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xfe0d00, 0xfe3fff) AM_RAM /* RAM? */ AM_RANGE(0xfe4000, 0xfe4001) AM_WRITE(bionicc_gfxctrl_w) /* + coin counters */ - AM_RANGE(0xfe4000, 0xfe4001) AM_READ(input_port_0_word_r) - AM_RANGE(0xfe4002, 0xfe4003) AM_READ(input_port_1_word_r) + AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("SYSTEM") + AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("DSW") AM_RANGE(0xfe8010, 0xfe8017) AM_WRITE(bionicc_scroll_w) AM_RANGE(0xfe801a, 0xfe801b) AM_WRITE(bionicc_mpu_trigger_w) /* ??? not sure, but looks like it */ AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(bionicc_txvideoram_w) AM_BASE(&bionicc_txvideoram) @@ -175,7 +175,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( bionicc ) - PORT_START_TAG("IN0") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0fff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_START1 ) @@ -227,7 +227,7 @@ static INPUT_PORTS_START( bionicc ) PORT_DIPSETTING( 0x8000, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN1") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY @@ -237,7 +237,7 @@ static INPUT_PORTS_START( bionicc ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 37c5134c9ef..a3041954c1e 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -228,7 +228,7 @@ static READ16_HANDLER( bishjan_input_r ) res = input_port_read(machine, port[i]); return (res << 8) | - input_port_read(machine, "IN0") | + input_port_read(machine, "SYSTEM") | ((bishjan_hopper && !(video_screen_get_frame_number(machine->primary_screen)%10)) ? 0x00 : 0x04) // bit 2: hopper sensor ; } @@ -289,11 +289,11 @@ static ADDRESS_MAP_START( bishjan_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0xa00020, 0xa00025 ) AM_WRITE( SMH_RAM ) AM_BASE( &bishjan_scroll ) - AM_RANGE( 0xc00000, 0xc00001 ) AM_READ( input_port_1_word_r ) // c00001 sw1 - AM_RANGE( 0xc00002, 0xc00003 ) AM_READWRITE( input_port_2_word_r, bishjan_input_w ) // in c + AM_RANGE( 0xc00000, 0xc00001 ) AM_READ_PORT("DSW") // c00001 sw1 + AM_RANGE( 0xc00002, 0xc00003 ) AM_READ_PORT("JOY") AM_WRITE( bishjan_input_w ) // in c AM_RANGE( 0xc00004, 0xc00005 ) AM_READ( bishjan_input_r ) // in a & b AM_RANGE( 0xc00006, 0xc00007 ) AM_READ( bishjan_unk_r ) // c00006 in d ($18) - AM_RANGE( 0xc00008, 0xc00009 ) AM_READWRITE( input_port_0_word_r, bishjan_coin_w ) // c00009 reset + AM_RANGE( 0xc00008, 0xc00009 ) AM_READ_PORT("RESET") AM_WRITE( bishjan_coin_w ) // c00009 reset ADDRESS_MAP_END @@ -352,16 +352,16 @@ static INPUT_PORTS_START( bishjan ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_START_TAG("JOY") /* IN2 - C */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) // start (joy) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("1 Player Start (Joy Mode)") // start (joy) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) // down (joy) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) // left (joy) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) // right (joy) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) // n (joy) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // bet (joy) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_NAME("P1 Mahjong Bet (Joy Mode)") // bet (joy) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON2 ) // select (joy) - PORT_START_TAG("IN0") /* IN3 - A */ + PORT_START_TAG("SYSTEM") /* IN3 - A */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) // test PORT_BIT( 0x0004, IP_ACTIVE_HIGH,IPT_SPECIAL ) // hopper sensor diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index 1fdc8a2dc3a..0ceba26708e 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -124,11 +124,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bking_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, bking_xld1_w) - AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, bking_yld1_w) - AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, bking_xld2_w) - AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_3_r, bking_yld2_w) - AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_4_r, bking_xld3_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE(bking_xld2_w) + AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE(bking_yld2_w) + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE(bking_xld3_w) AM_RANGE(0x05, 0x05) AM_READWRITE(bking_input_port_5_r, bking_yld3_w) AM_RANGE(0x06, 0x06) AM_READWRITE(bking_input_port_6_r, bking_msk_w) AM_RANGE(0x07, 0x07) AM_WRITE(watchdog_reset_w) @@ -143,11 +143,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bking3_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, bking_xld1_w) - AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, bking_yld1_w) - AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, bking_xld2_w) - AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_3_r, bking_yld2_w) - AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_4_r, bking_xld3_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE(bking_xld2_w) + AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE(bking_yld2_w) + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE(bking_xld3_w) AM_RANGE(0x05, 0x05) AM_READWRITE(bking_input_port_5_r, bking_yld3_w) AM_RANGE(0x06, 0x06) AM_READWRITE(bking_input_port_6_r, bking_msk_w) AM_RANGE(0x07, 0x07) AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index bc82eb2119f..e682c97eec5 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -39,6 +39,9 @@ Notes: M6295 clocks 1.000MHz [8/8] pin 7 high +2008-07 +Added Dip Locations based on Service Mode + */ #include "driver.h" @@ -190,12 +193,12 @@ static WRITE16_HANDLER( blackt96_80000_w ) static ADDRESS_MAP_START( blackt96_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_WRITE(blackt96_80000_w) // PLAYER INPUT - AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_1_word_r) AM_WRITE(blackt96_c0000_w) // COIN INPUT - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(input_port_2_word_r) - AM_RANGE(0x0e8000, 0x0e8001) AM_READ(input_port_3_word_r) - AM_RANGE(0x0f0000, 0x0f0001) AM_READ(input_port_4_word_r) // DSW1 - AM_RANGE(0x0f0008, 0x0f0009) AM_READ(input_port_5_word_r) // DSW2 + AM_RANGE(0x080000, 0x080001) AM_READ_PORT("P1_P2") AM_WRITE(blackt96_80000_w) + AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN1") AM_WRITE(blackt96_c0000_w) // COIN INPUT + AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("IN2") + AM_RANGE(0x0e8000, 0x0e8001) AM_READ_PORT("IN3") + AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("DSW1") + AM_RANGE(0x0f0008, 0x0f0009) AM_READ_PORT("DSW2") AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE(&blackt96_tilemapram) // text tilemap AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(&blackt96_tilemapram2)// sprite list? @@ -207,7 +210,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( blackt96 ) - PORT_START + PORT_START_TAG("P1_P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -225,209 +228,198 @@ static INPUT_PORTS_START( blackt96 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) // Test mode lists this as Service 1, but it appears to be Coin 1 (uses Coin 1 coinage etc.) - PORT_DIPNAME( 0x0002, 0x0002, "xx") - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) // Test mode lists this as Coin 1, but it doesn't work - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, "xx") + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) // Test mode lists this as Coin 1, but it doesn't work + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - - PORT_START - PORT_DIPNAME( 0x0001, 0x0001, "2" ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - - PORT_START - PORT_DIPNAME( 0x0001, 0x0001, "3" ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + + PORT_START_TAG("IN2") + PORT_DIPNAME( 0x0001, 0x0001, "2" ) + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + + PORT_START_TAG("IN3") + PORT_DIPNAME( 0x0001, 0x0001, "3" ) + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /* Dipswitch Port A */ - PORT_START - - PORT_DIPNAME( 0x0300, 0x0100, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x0300, DEF_STR( 1C_4C ) ) - - PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x0c00, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) - - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPSETTING( 0x1000, "3" ) - - PORT_DIPNAME( 0x2000, 0x2000, "Bonus Life Type" ) - PORT_DIPSETTING( 0x2000, "Every" ) - PORT_DIPSETTING( 0x0000, "Second Only" ) - - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unused ) ) // ? - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x0300, 0x0100, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:!7,!8") + PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0200, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0100, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x0300, DEF_STR( 1C_4C ) ) + PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:!5,!6") + PORT_DIPSETTING( 0x0c00, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0400, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0800, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!4") + PORT_DIPSETTING( 0x0000, "2" ) + PORT_DIPSETTING( 0x1000, "3" ) + PORT_DIPNAME( 0x2000, 0x2000, "Bonus Life Type" ) PORT_DIPLOCATION("SW1:!3") + PORT_DIPSETTING( 0x2000, "Every" ) + PORT_DIPSETTING( 0x0000, "Second Only" ) + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:!2") // ? + PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:!1") + PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /* Dipswitch Port B */ - PORT_START - - PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH ) - - PORT_DIPNAME( 0x0200, 0x0200, "Continue" ) - - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0c00, 0x0400, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x0000, "20000 / 50000" ) - PORT_DIPSETTING( 0x0400, "60000 / 150000" ) - PORT_DIPSETTING( 0x0800, "40000 / 100000" ) - PORT_DIPSETTING( 0x0c00, "No Bonus" ) - - PORT_DIPNAME( 0x3000, 0x0000, "Demo Sound / Video Freeze" ) - PORT_DIPSETTING( 0x0000, "Demo Sound On" ) - PORT_DIPSETTING( 0x1000, "Never Finish" ) - PORT_DIPSETTING( 0x2000, "Demo Sound Off" ) - PORT_DIPSETTING( 0x3000, "Stop Video" ) - - PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Difficulty ) ) // 'Level' - PORT_DIPSETTING( 0x8000, "1" ) - PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPSETTING( 0x4000, "3" ) - PORT_DIPSETTING( 0xc000, "4" ) + PORT_START_TAG("DSW2") + PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("SW2:!8") + PORT_DIPNAME( 0x0200, 0x0200, "Continue" ) PORT_DIPLOCATION("SW2:!7") + PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0c00, 0x0400, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:!5,!6") + PORT_DIPSETTING( 0x0000, "20000 / 50000" ) + PORT_DIPSETTING( 0x0400, "60000 / 150000" ) + PORT_DIPSETTING( 0x0800, "40000 / 100000" ) + PORT_DIPSETTING( 0x0c00, "No Bonus" ) + PORT_DIPNAME( 0x3000, 0x0000, "Demo Sound / Video Freeze" ) PORT_DIPLOCATION("SW2:!3,!4") + PORT_DIPSETTING( 0x0000, "Demo Sound On" ) + PORT_DIPSETTING( 0x1000, "Never Finish" ) + PORT_DIPSETTING( 0x2000, "Demo Sound Off" ) + PORT_DIPSETTING( 0x3000, "Stop Video" ) + PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:!1,!2") // 'Level' + PORT_DIPSETTING( 0x8000, "1" ) + PORT_DIPSETTING( 0x0000, "2" ) + PORT_DIPSETTING( 0x4000, "3" ) + PORT_DIPSETTING( 0xc000, "4" ) INPUT_PORTS_END diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 37ccd1b9da2..4b343d0d607 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -76,7 +76,7 @@ static UINT8 pot_wheel = 0; static WRITE16_HANDLER( blmbycar_pot_wheel_reset_w ) { if (ACCESSING_BITS_0_7) - pot_wheel = ~input_port_read(machine, "IN1") & 0xff; + pot_wheel = ~input_port_read(machine, "WHEEL") & 0xff; } static WRITE16_HANDLER( blmbycar_pot_wheel_shift_w ) @@ -101,7 +101,7 @@ static READ16_HANDLER( blmbycar_pot_wheel_r ) static READ16_HANDLER( blmbycar_opt_wheel_r ) { - return (~input_port_read(machine, "IN1") & 0xff) << 8; + return (~input_port_read(machine, "WHEEL") & 0xff) << 8; } @@ -124,10 +124,10 @@ static ADDRESS_MAP_START( blmbycar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x106000, 0x107fff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x440000, 0x441fff) AM_READ(SMH_RAM ) // AM_RANGE(0x444000, 0x445fff) AM_READ(SMH_RAM ) // Sprites (size?) - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r ) // 2 x DSW0 - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r ) // Joystick + Buttons + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2") AM_RANGE(0x700004, 0x700005) AM_READ(blmbycar_opt_wheel_r ) // Wheel (optical) - AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r ) // + AM_RANGE(0x700006, 0x700007) AM_READ_PORT("UNK") AM_RANGE(0x700008, 0x700009) AM_READ(blmbycar_pot_wheel_r ) // Wheel (potentiometer) AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r ) // Sound ADDRESS_MAP_END @@ -174,8 +174,8 @@ static ADDRESS_MAP_START( watrball_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x106000, 0x107fff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x440000, 0x441fff) AM_READ(SMH_RAM ) // AM_RANGE(0x444000, 0x445fff) AM_READ(SMH_RAM ) // Sprites (size?) - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r ) - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r ) + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2") AM_RANGE(0x700006, 0x700007) AM_READ(SMH_NOP ) // read AM_RANGE(0x700008, 0x700009) AM_READ(waterball_unk_r ) // 0x0008 must toggle AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r ) // Sound @@ -258,7 +258,7 @@ static INPUT_PORTS_START( blmbycar ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN0") // IN1 - $700002.w + PORT_START_TAG("P1_P2") // IN1 - $700002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) @@ -277,10 +277,10 @@ static INPUT_PORTS_START( blmbycar ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN1") // IN2 - $700004.w + PORT_START_TAG("WHEEL") // IN2 - $700004.w PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) - PORT_START_TAG("IN2") // IN3 - $700006.w + PORT_START_TAG("UNK") // IN3 - $700006.w PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END @@ -325,7 +325,7 @@ static INPUT_PORTS_START( watrball ) PORT_DIPUNUSED_DIPLOC( 0x4000, 0x4000, "SW2:2" ) PORT_DIPUNUSED_DIPLOC( 0x8000, 0x8000, "SW2:1" ) - PORT_START_TAG("IN0") /* 16bit */ + PORT_START_TAG("P1_P2") /* 16bit */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 8e3053e67b4..59823db3662 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -67,11 +67,11 @@ static WRITE8_HANDLER( blockhl_sh_irqtrigger_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1f94, 0x1f94) AM_READ(input_port_4_r) - AM_RANGE(0x1f95, 0x1f95) AM_READ(input_port_0_r) - AM_RANGE(0x1f96, 0x1f96) AM_READ(input_port_1_r) - AM_RANGE(0x1f97, 0x1f97) AM_READ(input_port_2_r) - AM_RANGE(0x1f98, 0x1f98) AM_READ(input_port_3_r) + AM_RANGE(0x1f94, 0x1f94) AM_READ_PORT("DSW3") + AM_RANGE(0x1f95, 0x1f95) AM_READ_PORT("P1") + AM_RANGE(0x1f96, 0x1f96) AM_READ_PORT("P2") + AM_RANGE(0x1f97, 0x1f97) AM_READ_PORT("DSW1") + AM_RANGE(0x1f98, 0x1f98) AM_READ_PORT("DSW2") AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) AM_RANGE(0x4000, 0x57ff) AM_READ(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_READ(bankedram_r) @@ -112,7 +112,7 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( blockhl ) - PORT_START /* PLAYER 1 INPUTS */ + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -122,7 +122,7 @@ static INPUT_PORTS_START( blockhl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* PLAYER 2 INPUTS */ + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -132,7 +132,7 @@ static INPUT_PORTS_START( blockhl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* DSW #1 */ + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -168,7 +168,7 @@ static INPUT_PORTS_START( blockhl ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) // PORT_DIPSETTING( 0x00, "Invalid" ) - PORT_START /* DSW #2 */ + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, "1" ) PORT_DIPSETTING( 0x00, "2" ) @@ -185,7 +185,7 @@ static INPUT_PORTS_START( blockhl ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW #3 */ + PORT_START_TAG("DSW3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index b646a72635c..3b031a28b53 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -47,11 +47,11 @@ static WRITE16_HANDLER( blockout_sound_command_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) - AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) - AM_RANGE(0x100004, 0x100005) AM_READ(input_port_2_word_r) - AM_RANGE(0x100006, 0x100007) AM_READ(input_port_3_word_r) - AM_RANGE(0x100008, 0x100009) AM_READ(input_port_4_word_r) + AM_RANGE(0x100000, 0x100001) AM_READ_PORT("P1") + AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P2") + AM_RANGE(0x100004, 0x100005) AM_READ_PORT("SYSTEM") + AM_RANGE(0x100006, 0x100007) AM_READ_PORT("DSW1") + AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW2") AM_RANGE(0x180000, 0x1bffff) AM_READ(SMH_RAM) AM_RANGE(0x1d4000, 0x1dffff) AM_READ(SMH_RAM) AM_RANGE(0x1f4000, 0x1fffff) AM_READ(SMH_RAM) @@ -91,7 +91,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( blockout ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY @@ -101,7 +101,7 @@ static INPUT_PORTS_START( blockout ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -111,7 +111,7 @@ static INPUT_PORTS_START( blockout ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -154,10 +154,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( blckoutj ) PORT_INCLUDE( blockout ) - PORT_MODIFY("IN0") + PORT_MODIFY("P1") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_MODIFY("IN1") + PORT_MODIFY("P2") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_MODIFY("DSW2") diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index f494e4b4f99..72fffd4a50d 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -101,8 +101,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8c00, 0xff8c01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xff8e00, 0xff8e01) AM_MIRROR(0x7f81fe) AM_WRITE(blstroid_halt_until_hblank_0_w) AM_RANGE(0xff9400, 0xff9401) AM_MIRROR(0x7f83fe) AM_READ(atarigen_sound_r) - AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x7f83f8) AM_READ(input_port_0_word_r) - AM_RANGE(0xff9804, 0xff9805) AM_MIRROR(0x7f83f8) AM_READ(input_port_1_word_r) + AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x7f83f8) AM_READ_PORT("DIAL0") + AM_RANGE(0xff9804, 0xff9805) AM_MIRROR(0x7f83f8) AM_READ_PORT("DIAL1") AM_RANGE(0xff9c00, 0xff9c03) AM_MIRROR(0x7f83fc) AM_READ(inputs_r) AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xffb000, 0xffb3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index 261aa397baf..b1bfd0cd397 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -103,8 +103,8 @@ static ADDRESS_MAP_START( blueprnt_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x93ff) AM_RAM AM_MIRROR(0x400) AM_WRITE(blueprnt_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE(&blueprnt_scrollram) AM_RANGE(0xb000, 0xb0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xc000, 0xc000) AM_READWRITE(input_port_0_r, blueprnt_coin_counter_w) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") AM_WRITE(blueprnt_coin_counter_w) + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") AM_RANGE(0xc003, 0xc003) AM_READ(blueprnt_sh_dipsw_r) AM_RANGE(0xd000, 0xd000) AM_WRITE(blueprnt_sound_command_w) AM_RANGE(0xe000, 0xe000) AM_READWRITE(watchdog_reset_r, blueprnt_flipscreen_w) @@ -126,7 +126,7 @@ ADDRESS_MAP_END /* Input Ports */ static INPUT_PORTS_START( blueprnt ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT ) @@ -136,7 +136,7 @@ static INPUT_PORTS_START( blueprnt ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_SERVICE( 0x04, IP_ACTIVE_HIGH ) @@ -189,10 +189,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( saturn ) PORT_INCLUDE( blueprnt ) - PORT_MODIFY("IN0") + PORT_MODIFY("P1") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) - PORT_MODIFY("IN1") + PORT_MODIFY("P2") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL PORT_MODIFY("DILSW1") diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 52c12828a1d..d27db67af42 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -338,7 +338,7 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x093000, 0x093003) AM_WRITE(SMH_NOP) // related to music AM_RANGE(0x092800, 0x092801) AM_WRITE(AY8910_write_port_0_msb_w ) AM_RANGE(0x092802, 0x092803) AM_READ(AY8910_read_port_0_msb_r) AM_WRITE(AY8910_control_port_0_msb_w ) - AM_RANGE(0x093802, 0x093803) AM_READ(input_port_0_word_r) + AM_RANGE(0x093802, 0x093803) AM_READ_PORT("IN0") AM_RANGE(0x095000, 0x095fff) AM_RAM AM_BASE((UINT16 **)&stats_ram) AM_SIZE(&stats_ram_size) /* 8 bit */ AM_RANGE(0x097000, 0x097001) AM_READ(SMH_NOP) AM_RANGE(0x140000, 0x1bffff) AM_ROM diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 68f89eb132e..66d4766038e 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -6,6 +6,9 @@ Emulation by Bryan McPhail, mish@tendril.co.uk and T.Nogi + 2008-07 + Dip Locations added based on crazykong BogeyManor.txt + ***************************************************************************/ #include "driver.h" @@ -75,17 +78,17 @@ static ADDRESS_MAP_START( bogeyman_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2100, 0x21ff) AM_RAM_WRITE(bogeyman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x2800, 0x2bff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3000, 0x300f) AM_RAM_WRITE(bogeyman_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x3800, 0x3800) AM_READWRITE(input_port_0_r, bogeyman_8910_control_w) - AM_RANGE(0x3801, 0x3801) AM_READWRITE(input_port_1_r, bogeyman_8910_latch_w) - AM_RANGE(0x3802, 0x3802) AM_READ(input_port_2_r) - AM_RANGE(0x3803, 0x3803) AM_READ(input_port_3_r) AM_WRITENOP // ??? sound + AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1") AM_WRITE(bogeyman_8910_control_w) + AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2") AM_WRITE(bogeyman_8910_latch_w) + AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW1") + AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW2") AM_WRITENOP // ??? sound AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END /* Input Ports */ static INPUT_PORTS_START( bogeyman ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -95,7 +98,7 @@ static INPUT_PORTS_START( bogeyman ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL @@ -106,35 +109,35 @@ static INPUT_PORTS_START( bogeyman ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_START_TAG("DSW1") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) + PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) + PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) PORT_START_TAG("DSW2") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:2") PORT_DIPSETTING( 0x02, "50K" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index a1601961b67..bcb3549a96b 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -90,6 +90,9 @@ Stephh's notes (based on the game Z80 code and some tests) : * 'bombjack' : "YOU ARE LUCKY" * 'bombjac2' : "YOU ARE LUCY" +2008-07 +Dip Locations and factory settings verified with manual + ***************************************************************************/ #include "driver.h" @@ -139,12 +142,12 @@ static READ8_HANDLER( bombjack_soundlatch_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x97ff) AM_READ(SMH_RAM) /* including video and color RAM */ - AM_RANGE(0xb000, 0xb000) AM_READ(input_port_0_r) /* player 1 input */ - AM_RANGE(0xb001, 0xb001) AM_READ(input_port_1_r) /* player 2 input */ - AM_RANGE(0xb002, 0xb002) AM_READ(input_port_2_r) /* coin */ + AM_RANGE(0xb000, 0xb000) AM_READ_PORT("P1") + AM_RANGE(0xb001, 0xb001) AM_READ_PORT("P2") + AM_RANGE(0xb002, 0xb002) AM_READ_PORT("SYSTEM") AM_RANGE(0xb003, 0xb003) AM_READ(SMH_NOP) /* watchdog reset? */ - AM_RANGE(0xb004, 0xb004) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0xb005, 0xb005) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0xb004, 0xb004) AM_READ_PORT("DSW1") + AM_RANGE(0xb005, 0xb005) AM_READ_PORT("DSW2") AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -187,7 +190,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( bombjack ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY @@ -197,7 +200,7 @@ static INPUT_PORTS_START( bombjack ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ - PORT_START /* IN1 */ + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL @@ -207,38 +210,39 @@ static INPUT_PORTS_START( bombjack ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ - PORT_START /* IN2 */ + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */ - PORT_START /* DSW0 */ - PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:!1,!2") PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:!3,!4") PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x30, 0x00, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x30, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!5,!6") PORT_DIPSETTING( 0x30, "2" ) PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x10, "4" ) PORT_DIPSETTING( 0x20, "5" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Cabinet ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!7") PORT_DIPSETTING( 0x40, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:!8") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START /* DSW1 */ - PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) ) /* see notes */ + PORT_START_TAG("DSW2") + /* Manual states DSW2 bits 0-2 are unused and have to be left on OFF (0x00) */ + PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:!1,!2,!3") /* see notes */ PORT_DIPSETTING( 0x02, "Every 30k" ) PORT_DIPSETTING( 0x01, "Every 100k" ) PORT_DIPSETTING( 0x07, "50k, 100k and 300k" ) @@ -247,17 +251,17 @@ static INPUT_PORTS_START( bombjack ) PORT_DIPSETTING( 0x06, "100k and 300k" ) PORT_DIPSETTING( 0x04, "100k only" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x18, 0x00, "Bird Speed" ) + PORT_DIPNAME( 0x18, 0x10, "Bird Speed" ) PORT_DIPLOCATION("SW2:!4,!5") PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x08, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x18, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x60, 0x00, "Enemies Number & Speed" ) + PORT_DIPNAME( 0x60, 0x40, "Enemies Number & Speed" ) PORT_DIPLOCATION("SW2:!6,!7") PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x40, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x60, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x80, 0x00, "Special Coin" ) + PORT_DIPNAME( 0x80, 0x00, "Special Coin" ) PORT_DIPLOCATION("SW2:!8") PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x80, DEF_STR( Hard ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index bfcfbb8ed8f..7838aa6174c 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -72,6 +72,9 @@ * The final boss shoots a blue beam downwards during the battle. This should have alpha. It fades in to blue, then fades out to nothing again after a few seconds (Guru). (Potentially related to note above about bit 3 in priority word) + + 2008-07 + Dip Locations added according to the manual of the JPN version */ #include "driver.h" @@ -100,9 +103,9 @@ static ADDRESS_MAP_START( boogwing_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x244000, 0x244001) AM_WRITE(buffer_spriteram16_2_w) AM_RANGE(0x246000, 0x2467ff) AM_RAM AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) - AM_RANGE(0x24e6c0, 0x24e6c1) AM_READ(input_port_1_word_r) - AM_RANGE(0x24e138, 0x24e139) AM_READ(input_port_0_word_r) - AM_RANGE(0x24e344, 0x24e345) AM_READ(input_port_2_word_r) + AM_RANGE(0x24e6c0, 0x24e6c1) AM_READ_PORT("DSW") + AM_RANGE(0x24e138, 0x24e139) AM_READ_PORT("SYSTEM") + AM_RANGE(0x24e344, 0x24e345) AM_READ_PORT("INPUTS") AM_RANGE(0x24e000, 0x24e7ff) AM_WRITE(deco16_104_prot_w) AM_BASE(&deco16_prot_ram) AM_RANGE(0x260000, 0x26000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) @@ -150,14 +153,14 @@ ADDRESS_MAP_END /**********************************************************************************/ static INPUT_PORTS_START( boogwing ) - PORT_START /* 16bit */ + PORT_START_TAG("SYSTEM") /* 16bit */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START /* 16bit */ - PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSW") /* 16bit */ + PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0007, DEF_STR( 1C_1C ) ) @@ -166,7 +169,7 @@ static INPUT_PORTS_START( boogwing ) PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0003, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5,6") PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0008, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0038, DEF_STR( 1C_1C ) ) @@ -175,36 +178,36 @@ static INPUT_PORTS_START( boogwing ) PORT_DIPSETTING( 0x0020, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0018, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0010, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "Continue Coin" ) + PORT_DIPNAME( 0x0080, 0x0080, "Continue Coin" ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0080, "Normal Coin Credit" ) PORT_DIPSETTING( 0x0000, "2 Start/1 Continue" ) - PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0100, "1" ) PORT_DIPSETTING( 0x0300, "2" ) PORT_DIPSETTING( 0x0200, "3" ) PORT_DIPSETTING( 0x0000, "4" ) - PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x0800, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0c00, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0400, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x1000, 0x1000, "Coin Slots" ) + PORT_DIPNAME( 0x1000, 0x1000, "Coin Slots" ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x1000, "Common" ) PORT_DIPSETTING( 0x0000, "Individual" ) - PORT_DIPNAME( 0x2000, 0x2000, "Stage Reset" ) /* At loss of life */ + PORT_DIPNAME( 0x2000, 0x2000, "Stage Reset" ) PORT_DIPLOCATION("SW2:6") /* At loss of life */ PORT_DIPSETTING( 0x2000, "Point of Termination" ) PORT_DIPSETTING( 0x0000, "Beginning of Stage" ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) /* Manual shows as OFF and states "Don't Change" */ + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") /* Manual shows as OFF and states "Don't Change" */ PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START /* 16bit */ + PORT_START_TAG("INPUTS") /* 16bit */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 24c97d4b6df..07588af35b7 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -6,6 +6,10 @@ Similar to S.P.Y. driver by Nicola Salmoria +2008-07 +Dip locations and factory settings verified with US manual. +To be verified for Main Stadium + ***************************************************************************/ #include "driver.h" @@ -129,11 +133,11 @@ static WRITE8_HANDLER( sound_bank_w ) static ADDRESS_MAP_START( bottom9_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(bottom9_bankedram1_r) - AM_RANGE(0x1fd0, 0x1fd0) AM_READ(input_port_4_r) - AM_RANGE(0x1fd1, 0x1fd1) AM_READ(input_port_0_r) - AM_RANGE(0x1fd2, 0x1fd2) AM_READ(input_port_1_r) - AM_RANGE(0x1fd3, 0x1fd3) AM_READ(input_port_2_r) - AM_RANGE(0x1fe0, 0x1fe0) AM_READ(input_port_3_r) + AM_RANGE(0x1fd0, 0x1fd0) AM_READ_PORT("SYSTEM") + AM_RANGE(0x1fd1, 0x1fd1) AM_READ_PORT("P1") + AM_RANGE(0x1fd2, 0x1fd2) AM_READ_PORT("P2") + AM_RANGE(0x1fd3, 0x1fd3) AM_READ_PORT("DSW1") + AM_RANGE(0x1fe0, 0x1fe0) AM_READ_PORT("DSW2") AM_RANGE(0x2000, 0x27ff) AM_READ(bottom9_bankedram2_r) AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) @@ -176,7 +180,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( bottom9 ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -186,7 +190,7 @@ static INPUT_PORTS_START( bottom9 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -196,8 +200,8 @@ static INPUT_PORTS_START( bottom9 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START - PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) ) @@ -214,7 +218,7 @@ static INPUT_PORTS_START( bottom9 ) PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) ) - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) @@ -232,8 +236,8 @@ static INPUT_PORTS_START( bottom9 ) PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) - PORT_START - PORT_DIPNAME( 0x07, 0x04, "Play Time" ) + PORT_START_TAG("DSW2") + PORT_DIPNAME( 0x07, 0x04, "Play Time" ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x07, "1'00" ) PORT_DIPSETTING( 0x06, "1'10" ) PORT_DIPSETTING( 0x05, "1'20" ) @@ -242,132 +246,52 @@ static INPUT_PORTS_START( bottom9 ) PORT_DIPSETTING( 0x02, "1'50" ) PORT_DIPSETTING( 0x01, "2'00" ) PORT_DIPSETTING( 0x00, "2'10" ) - PORT_DIPNAME( 0x18, 0x08, "Bonus Time" ) + PORT_DIPNAME( 0x18, 0x08, "Bonus Time" ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x18, "00" ) PORT_DIPSETTING( 0x10, "20" ) PORT_DIPSETTING( 0x08, "30" ) PORT_DIPSETTING( 0x00, "40" ) - PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, "Difficult" ) PORT_DIPSETTING( 0x00, "Very Difficult" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x80, "Fielder Control" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:2" ) /* According to manual: N/U */ + PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPNAME( 0x80, 0x80, "Fielder Control" ) PORT_DIPLOCATION("SW3:4") PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Auto" ) INPUT_PORTS_END static INPUT_PORTS_START( mstadium ) - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 3C_2C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 4C_5C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 3C_4C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 2C_5C ) ) - PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) - PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) - PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) - PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) ) - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x40, DEF_STR( 3C_2C ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 4C_5C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 3C_4C ) ) - PORT_DIPSETTING( 0x70, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x60, DEF_STR( 2C_5C ) ) - PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) - PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) - PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) - PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) + PORT_INCLUDE( bottom9 ) - PORT_START - PORT_DIPNAME( 0x03, 0x01, "Play Inning" ) + PORT_MODIFY("DSW2") + PORT_DIPNAME( 0x03, 0x01, "Play Inning" ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPNAME( 0x0c, 0x08, "Play Inning Time" ) + PORT_DIPNAME( 0x0c, 0x08, "Play Inning Time" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x0c, "6 Min" ) PORT_DIPSETTING( 0x08, "8 Min" ) PORT_DIPSETTING( 0x04, "10 Min" ) PORT_DIPSETTING( 0x00, "12 Min" ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x20, "Difficult" ) - PORT_DIPSETTING( 0x00, "Very Difficult" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x80, "Fielder Control" ) - PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x00, "Auto" ) INPUT_PORTS_END diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index e0d7124c93b..bbc25c5d4e5 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -43,6 +43,9 @@ The test routine is at F000 Sound: YM2203 and YM3526 driven by 6809. Sound added by Bryan McPhail, 1/4/98. +2008-07 +Dip locations verified with manual for brkthru (US conv. kit) and darwin + ***************************************************************************/ #include "driver.h" @@ -102,10 +105,10 @@ static ADDRESS_MAP_START( brkthru_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1100, 0x17ff) AM_RAM - AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) /* player controls, player start */ - AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) /* cocktail player controls */ - AM_RANGE(0x1802, 0x1802) AM_READ(input_port_3_r) /* DSW 0 */ - AM_RANGE(0x1803, 0x1803) AM_READ(input_port_2_r) /* coin input & DSW */ + AM_RANGE(0x1800, 0x1800) AM_READ_PORT("P1") + AM_RANGE(0x1801, 0x1801) AM_READ_PORT("P2") + AM_RANGE(0x1802, 0x1802) AM_READ_PORT("DSW1") + AM_RANGE(0x1803, 0x1803) AM_READ_PORT("DSW2/COIN") AM_RANGE(0x1800, 0x1801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ AM_RANGE(0x1802, 0x1802) AM_WRITE(brkthru_soundlatch_w) AM_RANGE(0x1803, 0x1803) AM_WRITE(brkthru_1803_w) /* NMI enable, + ? */ @@ -121,10 +124,10 @@ static ADDRESS_MAP_START( darwin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x0000, 0x00ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x0100, 0x01ff) AM_WRITE(SMH_NOP) /*tidyup, nothing realy here?*/ - AM_RANGE(0x0800, 0x0800) AM_READ(input_port_0_r) /* player controls, player start */ - AM_RANGE(0x0801, 0x0801) AM_READ(input_port_1_r) /* cocktail player controls */ - AM_RANGE(0x0802, 0x0802) AM_READ(input_port_3_r) /* DSW 0 */ - AM_RANGE(0x0803, 0x0803) AM_READ(input_port_2_r) /* coin input & DSW */ + AM_RANGE(0x0800, 0x0800) AM_READ_PORT("P1") + AM_RANGE(0x0801, 0x0801) AM_READ_PORT("P2") + AM_RANGE(0x0802, 0x0802) AM_READ_PORT("DSW1") + AM_RANGE(0x0803, 0x0803) AM_READ_PORT("DSW2/COIN") AM_RANGE(0x0800, 0x0801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ AM_RANGE(0x0802, 0x0802) AM_WRITE(brkthru_soundlatch_w) AM_RANGE(0x0803, 0x0803) AM_WRITE(darwin_0803_w) /* NMI enable, + ? */ @@ -146,166 +149,115 @@ ADDRESS_MAP_END -#define COMMON_IN0\ - PORT_START_TAG("IN0")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )\ +static INPUT_PORTS_START( brkthru ) + PORT_START_TAG("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) -#define COMMON_IN1\ - PORT_START_TAG("IN1")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ + PORT_START_TAG("P2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) /* used only by the self test */ -static INPUT_PORTS_START( brkthru ) - COMMON_IN0 - COMMON_IN1 - - PORT_START_TAG("IN2") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x02, "2" ) - PORT_DIPSETTING( 0x03, "3" ) - PORT_DIPSETTING( 0x01, "5" ) - PORT_DIPSETTING( 0x00, "99 (Cheat)") - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x00, "20000 Points Only" ) - PORT_DIPSETTING( 0x04, "10000/20000 Points" ) - PORT_DIPSETTING( 0x0c, "20000/30000 Points" ) - PORT_DIPSETTING( 0x08, "20000/40000 Points" ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Allow_Continue ) ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0) /* Manual says Picture Flip=On, Normal=Off */ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_CHANGED(coin_inserted, 0) - - PORT_START_TAG("DSW0") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x10, 0x10, "Enemy Vehicles" ) + PORT_DIPNAME( 0x10, 0x10, "Enemy Vehicles" ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x10, "Slow" ) PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x20, 0x20, "Enemy Bullets" ) + PORT_DIPNAME( 0x20, 0x20, "Enemy Bullets" ) PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING( 0x20, "Slow" ) PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) - PORT_DIPSETTING( 0x40, "1 Player" ) - PORT_DIPSETTING( 0x00, "2 Players" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) -INPUT_PORTS_END - -static INPUT_PORTS_START( brkthruj ) - COMMON_IN0 - COMMON_IN1 - - PORT_START_TAG("IN2") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) PORT_DIPLOCATION("SW1:7") + PORT_DIPSETTING( 0x40, "1 Player" ) + PORT_DIPSETTING( 0x00, "2 Players" ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:8") + PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) + + PORT_START_TAG("DSW2/COIN") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "99 (Cheat)") - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x00, "20000 Points Only" ) PORT_DIPSETTING( 0x04, "10000/20000 Points" ) PORT_DIPSETTING( 0x0c, "20000/30000 Points" ) PORT_DIPSETTING( 0x08, "20000/40000 Points" ) - PORT_SERVICE( 0x10, IP_ACTIVE_LOW ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0) /* Manual says Pitcure Flip=On, Normal=Off */ + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:5") /* Manual says ALWAYS OFF */ + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) + /* According to the manual, bit 5 should control Flip Screen */ +// PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:6") +// PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) +// PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + /* SW2:7,8 ALWAYS OFF according to the manual */ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_CHANGED(coin_inserted, 0) +INPUT_PORTS_END - PORT_START_TAG("DSW0") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x10, 0x10, "Enemy Vehicles" ) - PORT_DIPSETTING( 0x10, "Slow" ) - PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x20, 0x20, "Enemy Bullets" ) - PORT_DIPSETTING( 0x20, "Slow" ) - PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) - PORT_DIPSETTING( 0x40, "1 Player" ) - PORT_DIPSETTING( 0x00, "2 Players" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) +static INPUT_PORTS_START( brkthruj ) + PORT_INCLUDE( brkthru ) + + PORT_MODIFY("DSW2/COIN") + PORT_SERVICE_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW2:5" ) INPUT_PORTS_END static INPUT_PORTS_START( darwin ) - COMMON_IN0 - COMMON_IN1 + PORT_INCLUDE( brkthru ) - PORT_START_TAG("IN2") /* modified by Shingo Suzuki 1999/11/02 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) + PORT_MODIFY("DSW1") + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW1:5" ) /* Manual says must be OFF */ + PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:6") + PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x40, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW1:8" ) /* Manual says must be OFF */ + + PORT_MODIFY("DSW2/COIN") /* modified by Shingo Suzuki 1999/11/02 */ + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:2") PORT_DIPSETTING( 0x02, "20k, 50k and every 50k" ) PORT_DIPSETTING( 0x00, "30k, 80k and every 80k" ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x0c, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x08, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) -// PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) + /* According to the manual, bit 5 should control Flip Screen */ +// PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:6") // PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) // PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + /* SW2:5,7,8 ALWAYS OFF according to the manual */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_CHANGED(coin_inserted, 0) - - PORT_START_TAG("DSW0") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index d98bae571c8..6302577fd7f 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -13,11 +13,13 @@ **************************************************************************** Note: The original hardware uses the Player 1 and Player 2 Start buttons - as the Jump/Shoot buttons. I've taken button 1 and mapped it to the Start - buttons to keep people from getting confused. - + as the Jump/Shoot buttons. + If you have any questions about how this driver works, don't hesitate to ask. - Mike Balfour (mab22@po.cwru.edu) + + 2008-07 + Dip locations verified with manual ***************************************************************************/ @@ -103,39 +105,40 @@ ADDRESS_MAP_END static INPUT_PORTS_START( bsktball ) PORT_START_TAG("TRACK0_X") - PORT_BIT( 0xFF, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) /* Sensitivity, clip, min, max */ + PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) /* Sensitivity, clip, min, max */ PORT_START_TAG("TRACK0_Y") - PORT_BIT( 0xFF, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) + PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_START_TAG("TRACK1_X") - PORT_BIT( 0xFF, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* Sensitivity, clip, min, max */ + PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* Sensitivity, clip, min, max */ PORT_START_TAG("TRACK1_Y") - PORT_BIT( 0xFF, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) + PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) PORT_START_TAG("IN0") - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* SPARE */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* SPARE */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) + /* 0x04 - SPARE */ + /* 0x08 - SPARE */ /* 0x10 - DR0 = PL2 H DIR */ /* 0x20 - DR1 = PL2 V DIR */ /* 0x40 - DR2 = PL1 H DIR */ /* 0x80 - DR3 = PL1 V DIR */ PORT_START_TAG("IN1") - PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* SPARE */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* TEST STEP */ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* SPARE */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* TEST STEP */ PORT_SERVICE( 0x10, IP_ACTIVE_LOW ) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* COIN 0 */ - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* COIN 1 */ - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) /* COIN 2 */ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* COIN 0 */ + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* COIN 1 */ + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) /* COIN 2 */ PORT_START_TAG("DSW") - PORT_DIPNAME( 0x07, 0x00, "Play Time per Credit" ) + PORT_DIPNAME( 0x07, 0x00, "Play Time per Credit" ) PORT_DIPLOCATION("SW:1,2,3") PORT_DIPSETTING( 0x07, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x06, "2:30" ) PORT_DIPSETTING( 0x05, "2:00" ) @@ -144,16 +147,16 @@ static INPUT_PORTS_START( bsktball ) PORT_DIPSETTING( 0x02, "0:45" ) PORT_DIPSETTING( 0x01, "0:30" ) PORT_DIPSETTING( 0x00, "1:00" ) - PORT_DIPNAME( 0x18, 0x00, DEF_STR( Coinage ) ) + PORT_DIPNAME( 0x18, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW:4,5") PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x18, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x20, 0x00, "Cost" ) + PORT_DIPNAME( 0x20, 0x00, "Cost" ) PORT_DIPLOCATION("SW:6") PORT_DIPSETTING( 0x20, "Two Coin Minimum" ) PORT_DIPSETTING( 0x00, "One Coin Minimum" ) - PORT_DIPNAME( 0xC0, 0x00, DEF_STR( Language ) ) - PORT_DIPSETTING( 0xC0, DEF_STR( German ) ) + PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:7,8") + PORT_DIPSETTING( 0xc0, DEF_STR( German ) ) PORT_DIPSETTING( 0x80, DEF_STR( French ) ) PORT_DIPSETTING( 0x40, DEF_STR( Spanish ) ) PORT_DIPSETTING( 0x00, DEF_STR( English ) ) diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 9081c439b5a..4d6d05ede93 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -74,6 +74,8 @@ db00 - dbff /ScrollRQ (S37) dcxx = /SPOSI (S36) +2008-07 +Dip locations and factory settings verified from dip listing ***************************************************************************/ @@ -129,22 +131,22 @@ static WRITE8_HANDLER( sound_enable_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) /* A22-04 (23) */ - AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) /* A22-05 (22) */ - AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* 6116 SRAM (36) */ - AM_RANGE(0x8800, 0x8fff) AM_READ(SMH_RAM) /* 6116 SRAM (35) */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) /* A22-04 (23) */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) /* A22-05 (22) */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* 6116 SRAM (36) */ + AM_RANGE(0x8800, 0x8fff) AM_READ(SMH_RAM) /* 6116 SRAM (35) */ AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xd400, 0xd400) AM_READ(buggychl_mcu_r) AM_RANGE(0xd401, 0xd401) AM_READ(buggychl_mcu_status_r) - AM_RANGE(0xd600, 0xd600) AM_READ(input_port_0_r) /* dsw */ - AM_RANGE(0xd601, 0xd601) AM_READ(input_port_1_r) /* dsw */ - AM_RANGE(0xd602, 0xd602) AM_READ(input_port_2_r) /* dsw */ - AM_RANGE(0xd603, 0xd603) AM_READ(input_port_3_r) /* player inputs */ - AM_RANGE(0xd608, 0xd608) AM_READ(input_port_4_r) /* wheel */ - AM_RANGE(0xd609, 0xd609) AM_READ(input_port_5_r) /* coin + accelerator */ -// { 0xd60a, 0xd60a, other inputs, not used? -// { 0xd60b, 0xd60b, other inputs, not used? + AM_RANGE(0xd600, 0xd600) AM_READ_PORT("DSW1") + AM_RANGE(0xd601, 0xd601) AM_READ_PORT("DSW2") + AM_RANGE(0xd602, 0xd602) AM_READ_PORT("DSW3") + AM_RANGE(0xd603, 0xd603) AM_READ_PORT("IN0") /* player inputs */ + AM_RANGE(0xd608, 0xd608) AM_READ_PORT("WHEEL") + AM_RANGE(0xd609, 0xd609) AM_READ_PORT("IN1") /* coin + accelerator */ +// AM_RANGE(0xd60a, 0xd60a) // other inputs, not used? +// AM_RANGE(0xd60b, 0xd60b) // other inputs, not used? ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -155,18 +157,18 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9fff) AM_WRITE(buggychl_sprite_lookup_w) AM_RANGE(0xa000, 0xbfff) AM_WRITE(buggychl_chargen_w) AM_BASE(&buggychl_character_ram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) -// { 0xd000, 0xd000, horizon +// AM_RANGE(0xd000, 0xd000) // horizon AM_RANGE(0xd100, 0xd100) AM_WRITE(buggychl_ctrl_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(bankswitch_w) AM_RANGE(0xd300, 0xd300) AM_WRITE(watchdog_reset_w) -// { 0xd301, 0xd301, -// { 0xd302, 0xd302, reset mcu +// AM_RANGE(0xd301, 0xd301) +// AM_RANGE(0xd302, 0xd302) // reset mcu AM_RANGE(0xd303, 0xd303) AM_WRITE(buggychl_sprite_lookup_bank_w) -// { 0xd304, 0xd307, sccon 1-4 +// AM_RANGE(0xd304, 0xd307) // sccon 1-4 AM_RANGE(0xd400, 0xd400) AM_WRITE(buggychl_mcu_w) AM_RANGE(0xd500, 0xd57f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd610, 0xd610) AM_WRITE(sound_command_w) -// { 0xd613, 0xd613, reset sound cpu & sound chips +// AM_RANGE(0xd613, 0xd613) // reset sound cpu & sound chips AM_RANGE(0xd618, 0xd618) AM_WRITE(SMH_NOP) /* accelerator clear */ AM_RANGE(0xd700, 0xd7ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_BASE(&paletteram) AM_RANGE(0xd840, 0xd85f) AM_WRITE(SMH_RAM) AM_BASE(&buggychl_scrollv) @@ -179,7 +181,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) -// AM_RANGE(0x5001, 0x5001) AM_READ(SMH_RAM) /* is command pending? */ +// AM_RANGE(0x5001, 0x5001) AM_READ(SMH_RAM) /* is command pending? */ AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostics ROM */ ADDRESS_MAP_END @@ -193,7 +195,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4810, 0x481d) AM_WRITE(MSM5232_0_w) AM_RANGE(0x4820, 0x4820) AM_WRITE(SMH_RAM) /* VOL/BAL for the 7630 on the MSM5232 output */ AM_RANGE(0x4830, 0x4830) AM_WRITE(SMH_RAM) /* TRBL/BASS for the 7630 on the MSM5232 output */ -// AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) /* to main cpu */ +// AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) /* to main cpu */ AM_RANGE(0x5001, 0x5001) AM_WRITE(nmi_enable_w) AM_RANGE(0x5002, 0x5002) AM_WRITE(nmi_disable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(sound_enable_w) @@ -224,28 +226,28 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( buggychl ) - PORT_START_TAG("IN0") - PORT_DIPNAME( 0x03, 0x03, "Game Over Bonus" ) // Arks/Flags/Fuel + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x03, 0x03, "Game Over Bonus" ) PORT_DIPLOCATION("SW1:1,2") /* Arks/Flags/Fuel */ PORT_DIPSETTING( 0x03, "2000/1000/50" ) PORT_DIPSETTING( 0x02, "1000/500/30" ) PORT_DIPSETTING( 0x01, "500/200/10" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x18, 0x18, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x18, DEF_STR( Easy ) ) // 1300 units of fuel - PORT_DIPSETTING( 0x10, DEF_STR( Normal ) ) // 1200 units of fuel - PORT_DIPSETTING( 0x08, DEF_STR( Hard ) ) // 1100 units of fuel - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) // 1000 units of fuel - PORT_SERVICE( 0x20, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x18, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5") + PORT_DIPSETTING( 0x18, DEF_STR( Easy ) ) /* 1300 units of fuel */ + PORT_DIPSETTING( 0x10, DEF_STR( Normal ) ) /* 1200 units of fuel */ + PORT_DIPSETTING( 0x08, DEF_STR( Hard ) ) /* 1100 units of fuel */ + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) /* 1000 units of fuel */ + PORT_SERVICE_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW1:6" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Only listed as OFF in the manual */ - PORT_START_TAG("IN1") - PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) + PORT_START_TAG("DSW2") + PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) ) PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) ) PORT_DIPSETTING( 0x0d, DEF_STR( 7C_1C ) ) @@ -262,7 +264,7 @@ static INPUT_PORTS_START( buggychl ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 1C_7C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_8C ) ) - PORT_DIPNAME( 0xf0, 0x00, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0xf0, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:5,6,7,8") PORT_DIPSETTING( 0xf0, DEF_STR( 9C_1C ) ) PORT_DIPSETTING( 0xe0, DEF_STR( 8C_1C ) ) PORT_DIPSETTING( 0xd0, DEF_STR( 7C_1C ) ) @@ -280,47 +282,47 @@ static INPUT_PORTS_START( buggychl ) PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) ) PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) ) - PORT_START_TAG("IN2") - PORT_DIPNAME( 0x01, 0x01, "Start button needed" ) + PORT_START_TAG("DSW3") + PORT_DIPNAME( 0x01, 0x01, "Start button needed" ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x01, DEF_STR( Yes ) ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_DIPNAME( 0x04, 0x04, "Fuel loss (Cheat)") + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Only listed as OFF in the manual */ + PORT_DIPNAME( 0x04, 0x04, "Fuel loss (Cheat)") PORT_DIPLOCATION("SW3:3") PORT_DIPSETTING( 0x04, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Crash only" ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_DIPNAME( 0x10, 0x10, "Coinage Display" ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Only listed as OFF in the manual */ + PORT_DIPNAME( 0x10, 0x10, "Coinage Display" ) PORT_DIPLOCATION("SW3:5") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x20, 0x20, "Year Display" ) + PORT_DIPNAME( 0x20, 0x20, "Year Display" ) PORT_DIPLOCATION("SW3:6") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)") + PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW3:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "Coin Slots" ) + PORT_DIPNAME( 0x80, 0x80, "Coin Slots" ) PORT_DIPLOCATION("SW3:8") PORT_DIPSETTING( 0x00, "1" ) PORT_DIPSETTING( 0x80, "2" ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 ) /* shift */ - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Test Button") PORT_CODE(KEYCODE_F1) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Test Button") PORT_CODE(KEYCODE_F1) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START_TAG("IN4") /* wheel */ - PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE - - PORT_START_TAG("IN5") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_TILT ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* accelerator */ + + PORT_START_TAG("WHEEL") /* wheel */ + PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE INPUT_PORTS_END diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index 2732ca807a4..4af376cabec 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -211,6 +211,9 @@ **In operator Information Display, this option displays same as no bonus. + 2008-07 + Dip locations added from the notes above + ***************************************************************************/ #include "driver.h" @@ -344,8 +347,8 @@ static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6800, 0x6fff) AM_READWRITE(pokey2_r, pokey2_w) AM_RANGE(0x7000, 0x7000) AM_READ(atari_vg_earom_r) AM_RANGE(0x7800, 0x7800) AM_READ(bzone_IN0_r) /* IN0 */ - AM_RANGE(0x8000, 0x8000) AM_READ(input_port_3_r) /* IN1 */ - AM_RANGE(0x8800, 0x8800) AM_READ(input_port_4_r) /* IN1 */ + AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN3") + AM_RANGE(0x8800, 0x8800) AM_READ_PORT("IN4") AM_RANGE(0x8800, 0x8800) AM_WRITE(bwidow_misc_w) /* coin counters, leds */ AM_RANGE(0x8840, 0x8840) AM_WRITE(avgdvg_go_w) AM_RANGE(0x8880, 0x8880) AM_WRITE(avgdvg_reset_w) @@ -399,20 +402,20 @@ static INPUT_PORTS_START( bwidow ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START_TAG("DSW0") - PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) + PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("D4:!7,!8") PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPSETTING ( 0x02, DEF_STR( Free_Play ) ) - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) + PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("D4:!5,!6") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x04, "*4" ) PORT_DIPSETTING ( 0x08, "*5" ) PORT_DIPSETTING ( 0x0c, "*6" ) - PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) + PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("D4:!4") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x10, "*2" ) - PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) + PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) PORT_DIPLOCATION("D4:!1,!2,!3") PORT_DIPSETTING ( 0x80, "1 each 5" ) PORT_DIPSETTING ( 0x60, "2 each 4" ) PORT_DIPSETTING ( 0x40, "1 each 4" ) @@ -421,22 +424,22 @@ static INPUT_PORTS_START( bwidow ) PORT_DIPSETTING ( 0x00, DEF_STR( None ) ) PORT_START_TAG("DSW1") - PORT_DIPNAME(0x03, 0x01, "Max Start" ) + PORT_DIPNAME(0x03, 0x01, "Max Start" ) PORT_DIPLOCATION("B4:!7,!8") PORT_DIPSETTING ( 0x00, "Lev 13" ) PORT_DIPSETTING ( 0x01, "Lev 21" ) PORT_DIPSETTING ( 0x02, "Lev 37" ) PORT_DIPSETTING ( 0x03, "Lev 53" ) - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Lives ) ) + PORT_DIPNAME(0x0c, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("B4:!5,!6") PORT_DIPSETTING ( 0x00, "3" ) PORT_DIPSETTING ( 0x04, "4" ) PORT_DIPSETTING ( 0x08, "5" ) PORT_DIPSETTING ( 0x0c, "6" ) - PORT_DIPNAME(0x30, 0x10, DEF_STR( Difficulty ) ) + PORT_DIPNAME(0x30, 0x10, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("B4:!3,!4") PORT_DIPSETTING ( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING ( 0x10, DEF_STR( Medium ) ) PORT_DIPSETTING ( 0x20, DEF_STR( Hard ) ) PORT_DIPSETTING ( 0x30, "Demo" ) - PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("B4:!1,!2") PORT_DIPSETTING ( 0x00, "20000" ) PORT_DIPSETTING ( 0x40, "30000" ) PORT_DIPSETTING ( 0x80, "40000" ) @@ -478,37 +481,37 @@ static INPUT_PORTS_START( gravitar ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START_TAG("DSW0") - PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_DIPNAME(0x0c, 0x04, DEF_STR( Lives ) ) + PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) // D4:!7,!8 + PORT_DIPNAME(0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("D4:!5,!6") PORT_DIPSETTING ( 0x00, "3" ) PORT_DIPSETTING ( 0x04, "4" ) PORT_DIPSETTING ( 0x08, "5" ) PORT_DIPSETTING ( 0x0c, "6" ) - PORT_DIPNAME(0x10, 0x00, DEF_STR( Difficulty ) ) + PORT_DIPNAME(0x10, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("D4:!4") PORT_DIPSETTING ( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING ( 0x10, DEF_STR( Hard ) ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) // D4:!3 + PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("D4:!1,!2") PORT_DIPSETTING ( 0x00, "10000" ) PORT_DIPSETTING ( 0x40, "20000" ) PORT_DIPSETTING ( 0x80, "30000" ) PORT_DIPSETTING ( 0xc0, DEF_STR( None ) ) PORT_START_TAG("DSW1") - PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) + PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("B4:!7,!8") PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPSETTING ( 0x02, DEF_STR( Free_Play ) ) - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) + PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("B4:!5,!6") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x04, "*4" ) PORT_DIPSETTING ( 0x08, "*5" ) PORT_DIPSETTING ( 0x0c, "*6" ) - PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) + PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("B4:!4") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x10, "*2" ) - PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) + PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) PORT_DIPLOCATION("B4:!1,!2,!3") PORT_DIPSETTING ( 0x80, "1 each 5" ) PORT_DIPSETTING ( 0x60, "2 each 4" ) PORT_DIPSETTING ( 0x40, "1 each 4" ) @@ -586,42 +589,42 @@ static INPUT_PORTS_START( spacduel ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START_TAG("DSW0") - PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) ) + PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("D4:!7,!8") PORT_DIPSETTING ( 0x01, "3" ) PORT_DIPSETTING ( 0x00, "4" ) PORT_DIPSETTING ( 0x03, "5" ) PORT_DIPSETTING ( 0x02, "6" ) - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Difficulty ) ) + PORT_DIPNAME(0x0c, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("D4:!5,!6") PORT_DIPSETTING ( 0x04, DEF_STR( Easy ) ) PORT_DIPSETTING ( 0x00, DEF_STR( Normal ) ) PORT_DIPSETTING ( 0x0c, DEF_STR( Medium ) ) PORT_DIPSETTING ( 0x08, DEF_STR( Hard ) ) - PORT_DIPNAME(0x30, 0x00, DEF_STR( Language ) ) + PORT_DIPNAME(0x30, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("D4:!3,!4") PORT_DIPSETTING ( 0x00, DEF_STR( English ) ) PORT_DIPSETTING ( 0x10, DEF_STR( German ) ) PORT_DIPSETTING ( 0x20, DEF_STR( French ) ) PORT_DIPSETTING ( 0x30, DEF_STR( Spanish ) ) - PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME(0xc0, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("D4:!1,!2") PORT_DIPSETTING ( 0xc0, "8000" ) PORT_DIPSETTING ( 0x00, "10000" ) PORT_DIPSETTING ( 0x40, "15000" ) PORT_DIPSETTING ( 0x80, DEF_STR( None ) ) PORT_START_TAG("DSW1") - PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) + PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("B4:!7,!8") PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPSETTING ( 0x02, DEF_STR( Free_Play ) ) - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) + PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("B4:!5,!6") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x04, "*4" ) PORT_DIPSETTING ( 0x08, "*5" ) PORT_DIPSETTING ( 0x0c, "*6" ) - PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) + PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("B4:!4") PORT_DIPSETTING ( 0x00, "*1" ) PORT_DIPSETTING ( 0x10, "*2" ) - PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) + PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" ) PORT_DIPLOCATION("B4:!1,!2,!3") PORT_DIPSETTING ( 0x80, "1 each 5" ) PORT_DIPSETTING ( 0x60, "2 each 4" ) PORT_DIPSETTING ( 0x40, "1 each 4" ) @@ -636,8 +639,8 @@ static INPUT_PORTS_START( spacduel ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start") - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Select") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start") + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Select") PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START_TAG("IN4") /* IN4 - Player 2 - spread over 8 memory locations */ diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index a058bd97ed6..1e4a08bad99 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -191,7 +191,12 @@ Left and Center same, right different denomination | On |Off | | | Right and Center same, left differnnt denomination |Off | On | | | All different denominations |Off |Off | | | - --------------------- + --------------------- + + + 2008-07 + Dip locations added from the notes above (factory settings for bzone + from the manual). ***************************************************************************/ @@ -314,8 +319,8 @@ static ADDRESS_MAP_START( bzone_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0800, 0x0800) AM_READ(bzone_IN0_r) /* IN0 */ - AM_RANGE(0x0a00, 0x0a00) AM_READ(input_port_1_r) /* DSW1 */ - AM_RANGE(0x0c00, 0x0c00) AM_READ(input_port_2_r) /* DSW2 */ + AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW0") + AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("DSW1") AM_RANGE(0x1000, 0x1000) AM_WRITE(bzone_coin_counter_w) AM_RANGE(0x1200, 0x1200) AM_WRITE(avgdvg_go_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) @@ -334,18 +339,18 @@ static ADDRESS_MAP_START( redbaron_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0800, 0x0800) AM_READ(bzone_IN0_r) /* IN0 */ - AM_RANGE(0x0a00, 0x0a00) AM_READ(input_port_1_r) /* DSW1 */ - AM_RANGE(0x0c00, 0x0c00) AM_READ(input_port_2_r) /* DSW2 */ - AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* coin out */ + AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW0") + AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("DSW1") + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* coin out */ AM_RANGE(0x1200, 0x1200) AM_WRITE(avgdvg_go_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1600, 0x1600) AM_WRITE(avgdvg_reset_w) AM_RANGE(0x1800, 0x1800) AM_READ(mb_status_r) - AM_RANGE(0x1802, 0x1802) AM_READ(input_port_4_r) /* IN4 */ + AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN4") AM_RANGE(0x1804, 0x1804) AM_READ(mb_lo_r) AM_RANGE(0x1806, 0x1806) AM_READ(mb_hi_r) AM_RANGE(0x1808, 0x1808) AM_WRITE(redbaron_sounds_w) /* and select joystick pot also */ - AM_RANGE(0x180a, 0x180a) AM_WRITE(SMH_NOP) /* sound reset, yet todo */ + AM_RANGE(0x180a, 0x180a) AM_WRITE(SMH_NOP) /* sound reset, yet todo */ AM_RANGE(0x180c, 0x180c) AM_WRITE(atari_vg_earom_ctrl_w) AM_RANGE(0x1810, 0x181f) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x1820, 0x185f) AM_READWRITE(atari_vg_earom_r, atari_vg_earom_w) @@ -380,53 +385,53 @@ ADDRESS_MAP_END #define BZONEDSW0\ PORT_START_TAG("DSW0")\ - PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) )\ - PORT_DIPSETTING ( 0x00, "2" )\ - PORT_DIPSETTING ( 0x01, "3" )\ - PORT_DIPSETTING ( 0x02, "4" )\ - PORT_DIPSETTING ( 0x03, "5" )\ - PORT_DIPNAME(0x0c, 0x04, "Missile appears at" )\ - PORT_DIPSETTING ( 0x00, "5000" )\ - PORT_DIPSETTING ( 0x04, "10000" )\ - PORT_DIPSETTING ( 0x08, "20000" )\ - PORT_DIPSETTING ( 0x0c, "30000" )\ - PORT_DIPNAME(0x30, 0x10, DEF_STR( Bonus_Life ) )\ - PORT_DIPSETTING ( 0x10, "15k and 100k" )\ - PORT_DIPSETTING ( 0x20, "20k and 100k" )\ - PORT_DIPSETTING ( 0x30, "50k and 100k" )\ - PORT_DIPSETTING ( 0x00, DEF_STR( None ) )\ - PORT_DIPNAME(0xc0, 0x00, DEF_STR( Language ) )\ - PORT_DIPSETTING ( 0x00, DEF_STR( English ))\ - PORT_DIPSETTING ( 0x40, DEF_STR( German ))\ - PORT_DIPSETTING ( 0x80, DEF_STR( French ))\ - PORT_DIPSETTING ( 0xc0, DEF_STR( Spanish )) + PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("M10:1,2")\ + PORT_DIPSETTING( 0x00, "2" )\ + PORT_DIPSETTING( 0x01, "3" )\ + PORT_DIPSETTING( 0x02, "4" )\ + PORT_DIPSETTING( 0x03, "5" )\ + PORT_DIPNAME( 0x0c, 0x04, "Missile appears at" ) PORT_DIPLOCATION("M10:3,4")\ + PORT_DIPSETTING( 0x00, "5000" )\ + PORT_DIPSETTING( 0x04, "10000" )\ + PORT_DIPSETTING( 0x08, "20000" )\ + PORT_DIPSETTING( 0x0c, "30000" )\ + PORT_DIPNAME( 0x30, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("M10:5,6")\ + PORT_DIPSETTING( 0x10, "15k and 100k" )\ + PORT_DIPSETTING( 0x20, "20k and 100k" )\ + PORT_DIPSETTING( 0x30, "50k and 100k" )\ + PORT_DIPSETTING( 0x00, DEF_STR( None ) )\ + PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("M10:7,8")\ + PORT_DIPSETTING( 0x00, DEF_STR( English ))\ + PORT_DIPSETTING( 0x40, DEF_STR( German ))\ + PORT_DIPSETTING( 0x80, DEF_STR( French ))\ + PORT_DIPSETTING( 0xc0, DEF_STR( Spanish )) #define BZONEDSW1\ PORT_START_TAG("DSW1")\ - PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) )\ - PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) )\ - PORT_DIPSETTING ( 0x02, DEF_STR( 1C_1C ) )\ - PORT_DIPSETTING ( 0x01, DEF_STR( 1C_2C ) )\ - PORT_DIPSETTING ( 0x00, DEF_STR( Free_Play ) )\ - PORT_DIPNAME(0x0c, 0x00, DEF_STR( Coin_B ) )\ - PORT_DIPSETTING ( 0x00, "*1" )\ - PORT_DIPSETTING ( 0x04, "*4" )\ - PORT_DIPSETTING ( 0x08, "*5" )\ - PORT_DIPSETTING ( 0x0c, "*6" )\ - PORT_DIPNAME(0x10, 0x00, DEF_STR( Coin_A ) )\ - PORT_DIPSETTING ( 0x00, "*1" )\ - PORT_DIPSETTING ( 0x10, "*2" )\ - PORT_DIPNAME(0xe0, 0x00, "Bonus Coins" )\ - PORT_DIPSETTING ( 0x00, DEF_STR( None ) )\ - PORT_DIPSETTING ( 0x20, "3 credits/2 coins" )\ - PORT_DIPSETTING ( 0x40, "5 credits/4 coins" )\ - PORT_DIPSETTING ( 0x60, "6 credits/4 coins" )\ - PORT_DIPSETTING ( 0x80, "6 credits/5 coins" ) + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("P10:1,2")\ + PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )\ + PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )\ + PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )\ + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )\ + PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("P10:3,4")\ + PORT_DIPSETTING( 0x00, "*1" )\ + PORT_DIPSETTING( 0x04, "*4" )\ + PORT_DIPSETTING( 0x08, "*5" )\ + PORT_DIPSETTING( 0x0c, "*6" )\ + PORT_DIPNAME( 0x10, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("P10:5")\ + PORT_DIPSETTING( 0x00, "*1" )\ + PORT_DIPSETTING( 0x10, "*2" )\ + PORT_DIPNAME( 0xe0, 0x00, "Bonus Coins" ) PORT_DIPLOCATION("P10:6,7,8")\ + PORT_DIPSETTING( 0x00, DEF_STR( None ) )\ + PORT_DIPSETTING( 0x20, "3 credits/2 coins" )\ + PORT_DIPSETTING( 0x40, "5 credits/4 coins" )\ + PORT_DIPSETTING( 0x60, "6 credits/4 coins" )\ + PORT_DIPSETTING( 0x80, "6 credits/5 coins" ) static INPUT_PORTS_START( bzone ) -BZONEIN0 -BZONEDSW0 -BZONEDSW1 + BZONEIN0 + BZONEDSW0 + BZONEDSW1 PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY @@ -441,34 +446,35 @@ INPUT_PORTS_END static INPUT_PORTS_START( redbaron ) -BZONEIN0 + BZONEIN0 + PORT_START_TAG("DSW0") /* See the table above if you are really interested */ - PORT_DIPNAME(0xff, 0xfd, DEF_STR( Coinage ) ) - PORT_DIPSETTING ( 0xfd, DEF_STR( Normal ) ) + PORT_DIPNAME( 0xff, 0xfd, DEF_STR( Coinage ) ) PORT_DIPLOCATION("M10:1,2,3,4,5,6,7,8") + PORT_DIPSETTING( 0xfd, DEF_STR( Normal ) ) PORT_START_TAG("DSW1") - PORT_DIPNAME(0x03, 0x03, DEF_STR( Language ) ) - PORT_DIPSETTING ( 0x00, DEF_STR( German ) ) - PORT_DIPSETTING ( 0x01, DEF_STR( French ) ) - PORT_DIPSETTING ( 0x02, DEF_STR( Spanish ) ) - PORT_DIPSETTING ( 0x03, DEF_STR( English ) ) - PORT_DIPNAME(0x0c, 0x04, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING ( 0x0c, "2k 10k 30k" ) - PORT_DIPSETTING ( 0x08, "4k 15k 40k" ) - PORT_DIPSETTING ( 0x04, "6k 20k 50k" ) - PORT_DIPSETTING ( 0x00, DEF_STR( None ) ) - PORT_DIPNAME(0x30, 0x20, DEF_STR( Lives ) ) - PORT_DIPSETTING ( 0x30, "2" ) - PORT_DIPSETTING ( 0x20, "3" ) - PORT_DIPSETTING ( 0x10, "4" ) - PORT_DIPSETTING ( 0x00, "5" ) - PORT_DIPNAME(0x40, 0x40, "One Play Minimum" ) - PORT_DIPSETTING ( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) - PORT_DIPNAME(0x80, 0x80, "Self Adjust Diff" ) - PORT_DIPSETTING ( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Language ) ) PORT_DIPLOCATION("P10:1,2") + PORT_DIPSETTING( 0x00, DEF_STR( German ) ) + PORT_DIPSETTING( 0x01, DEF_STR( French ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Spanish ) ) + PORT_DIPSETTING( 0x03, DEF_STR( English ) ) + PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("P10:3,4") + PORT_DIPSETTING( 0x0c, "2k 10k 30k" ) + PORT_DIPSETTING( 0x08, "4k 15k 40k" ) + PORT_DIPSETTING( 0x04, "6k 20k 50k" ) + PORT_DIPSETTING( 0x00, DEF_STR( None ) ) + PORT_DIPNAME( 0x30, 0x20, DEF_STR( Lives ) ) PORT_DIPLOCATION("P10:5,6") + PORT_DIPSETTING( 0x30, "2" ) + PORT_DIPSETTING( 0x20, "3" ) + PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPNAME( 0x40, 0x40, "One Play Minimum" ) PORT_DIPLOCATION("P10:7") + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, "Self Adjust Diff" ) PORT_DIPLOCATION("P10:8") + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) /* IN3 - the real machine reads either the X or Y axis from this port */ /* Instead, we use the two fake 5 & 6 ports and bank-switch the proper */ @@ -495,9 +501,9 @@ INPUT_PORTS_END static INPUT_PORTS_START( bradley ) -BZONEIN0 -BZONEDSW0 -BZONEDSW1 + BZONEIN0 + BZONEDSW0 + BZONEDSW1 PORT_START_TAG("IN3") PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNUSED ) diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c index 05d5d643200..0b52edb0368 100644 --- a/src/mame/machine/bsktball.c +++ b/src/mame/machine/bsktball.c @@ -147,9 +147,6 @@ READ8_HANDLER( bsktball_in0_r ) else { temp = input_port_read(machine, "IN0") & 0x0F; - /* Remap button 1 back to the Start button */ - /* NOTE: This is an ADDED feature, not a part of the original hardware! */ - temp = (temp) & (temp>>2); return (temp | DR0 | DR1 | DR2 | DR3); } |