From b151e90f28ce25999e616f45dc6da1cacfb39036 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Mon, 18 Feb 2013 20:15:20 +0000 Subject: [PATCH] (MESS) ColecoVision: controller has a * key, not a . key [Nick3092] --- src/mess/drivers/coleco.c | 2 +- src/mess/machine/coleco.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mess/drivers/coleco.c b/src/mess/drivers/coleco.c index 058e506aa81..3de969349db 100644 --- a/src/mess/drivers/coleco.c +++ b/src/mess/drivers/coleco.c @@ -136,7 +136,7 @@ static INPUT_PORTS_START( czz50 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD) PORT_CHAR('8') PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD) PORT_CHAR('9') PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("#") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR('#') - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME(".") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('.') + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("*") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('*') PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0xb000, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mess/machine/coleco.c b/src/mess/machine/coleco.c index 2968efa8d8f..20d17672904 100644 --- a/src/mess/machine/coleco.c +++ b/src/mess/machine/coleco.c @@ -63,7 +63,7 @@ UINT8 coleco_paddle_read(running_machine &machine, int port, int joy_mode, UINT8 if (!(ipt & 0x0100)) data &= 0x01; /* 8 */ if (!(ipt & 0x0200)) data &= 0x0b; /* 9 */ if (!(ipt & 0x0400)) data &= 0x06; /* # */ - if (!(ipt & 0x0800)) data &= 0x09; /* . */ + if (!(ipt & 0x0800)) data &= 0x09; /* * */ if (!(ipt & 0x1000)) data &= 0x04; /* Blue Action Button */ if (!(ipt & 0x2000)) data &= 0x08; /* Purple Action Button */ @@ -107,7 +107,7 @@ static INPUT_PORTS_START( ctrl1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8 (pad 1)") PORT_CODE(KEYCODE_8_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9 (pad 1)") PORT_CODE(KEYCODE_9_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("# (pad 1)") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME(". (pad 1)") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("* (pad 1)") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) PORT_BIT( 0xb000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x00) @@ -133,7 +133,7 @@ static INPUT_PORTS_START( ctrl2 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8 (pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9 (pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("# (pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME(". (pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("* (pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) PORT_BIT( 0xb000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x00) @@ -161,7 +161,7 @@ static INPUT_PORTS_START( sac1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8 (SAC pad 1)") PORT_CODE(KEYCODE_8_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9 (SAC pad 1)") PORT_CODE(KEYCODE_9_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("# (SAC pad 1)") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME(". (SAC pad 1)") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("* (SAC pad 1)") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Blue Action Button P1") PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Purple Action Button P1") PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Orange Action Button P1") PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x07, EQUALS, 0x02) @@ -192,7 +192,7 @@ static INPUT_PORTS_START( sac2 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8 (SAC pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9 (SAC pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("# (SAC pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME(". (SAC pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("* (SAC pad 2)") PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Blue Action Button P2") PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Purple Action Button P2") PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Orange Action Button P2") PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0x70, EQUALS, 0x20)