summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/namcos2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/namcos2.c')
-rw-r--r--src/mame/drivers/namcos2.c72
1 files changed, 39 insertions, 33 deletions
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 748b66c819f..66b6a58fa75 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -739,7 +739,7 @@ static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 )
/* input ports and dips are mapped here */
AM_RANGE(0x0000, 0x0000) AM_READ(SMH_NOP) /* Keep logging quiet */
AM_RANGE(0x0001, 0x0001) AM_READ(namcos2_input_port_0_r)
- AM_RANGE(0x0002, 0x0002) AM_READ(input_port_1_r)
+ AM_RANGE(0x0002, 0x0002) AM_READ_PORT("MCUC")
AM_RANGE(0x0003, 0x0003) AM_READ(namcos2_mcu_port_d_r)
AM_RANGE(0x0007, 0x0007) AM_READ(namcos2_input_port_10_r)
AM_RANGE(0x0010, 0x0010) AM_READ(namcos2_mcu_analog_ctrl_r)
@@ -747,11 +747,11 @@ static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0008, 0x003f) AM_READ(SMH_RAM) /* Fill in register to stop logging */
AM_RANGE(0x0040, 0x01bf) AM_READ(SMH_RAM)
AM_RANGE(0x01c0, 0x1fff) AM_READ(SMH_ROM)
- AM_RANGE(0x2000, 0x2000) AM_READ(input_port_11_r)
+ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW")
AM_RANGE(0x3000, 0x3000) AM_READ(namcos2_input_port_12_r)
- AM_RANGE(0x3001, 0x3001) AM_READ(input_port_13_r)
- AM_RANGE(0x3002, 0x3002) AM_READ(input_port_14_r)
- AM_RANGE(0x3003, 0x3003) AM_READ(input_port_15_r)
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("MCUDI1")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("MCUDI2")
+ AM_RANGE(0x3003, 0x3003) AM_READ_PORT("MCUDI3")
AM_RANGE(0x5000, 0x57ff) AM_READ(namcos2_dpram_byte_r)
AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_NOP) /* watchdog */
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
@@ -888,7 +888,7 @@ static INPUT_PORTS_START( default )
INPUT_PORTS_END
static INPUT_PORTS_START( gollygho )
- PORT_START_TAG("INB")
+ PORT_START_TAG("MCUB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -900,21 +900,21 @@ static INPUT_PORTS_START( gollygho )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("GUNX1")
+ PORT_START_TAG("AN0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_REVERSE
- PORT_START_TAG("GUNY1")
+ PORT_START_TAG("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_REVERSE
- PORT_START_TAG("GUNX2")
+ PORT_START_TAG("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("GUNY2")
+ PORT_START_TAG("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("NOP0")
+ PORT_START_TAG("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP1")
+ PORT_START_TAG("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP2")
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP3")
+ PORT_START_TAG("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
@@ -925,7 +925,7 @@ static INPUT_PORTS_START( gollygho )
INPUT_PORTS_END
static INPUT_PORTS_START( bubbletr )
- PORT_START_TAG("INB")
+ PORT_START_TAG("MCUB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -937,21 +937,21 @@ static INPUT_PORTS_START( bubbletr )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("GUNX1")
+ PORT_START_TAG("AN0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("GUNY1")
+ PORT_START_TAG("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("GUNX2")
+ PORT_START_TAG("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2")
+ PORT_START_TAG("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("NOP0")
+ PORT_START_TAG("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP1")
+ PORT_START_TAG("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP2")
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP3")
+ PORT_START_TAG("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
@@ -1135,15 +1135,20 @@ static INPUT_PORTS_START( fourtrax )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("AN02") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
+ /* Tags and additional input ports AN5 & AN6 are needed for the port handler */
+ PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN13") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
+ PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN24") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
+ PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN35") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
+ PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN46") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
+ PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("AN5")
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("AN7") /* Steering Wheel 7 */ /* sensitivity, delta, min, max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(75) PORT_KEYDELTA(100) PORT_PLAYER(1)
@@ -1206,17 +1211,18 @@ static INPUT_PORTS_START( assault )
NAMCOS2_MCU_DIPSW_DEFAULT
- PORT_START_TAG("3000") /* 63B05Z0 - $3000 */
+ /* These are tagged this way to make easier reads by tag */
+ PORT_START_TAG("MCUDI0") /* 63B05Z0 - $3000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT )
- PORT_START /* 63B05Z0 - $3001 */
+ PORT_START_TAG("MCUDI1") /* 63B05Z0 - $3001 */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("MCUDI2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3002 */
+ PORT_START_TAG("MCUDI3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-// PORT_START /* 63B05Z0 - $3003 */
-// PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( suzuka )