summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar smf- <smf-@users.noreply.github.com>2014-01-10 19:43:26 +0000
committerGravatarGravatar smf- <smf-@users.noreply.github.com>2014-01-10 19:43:26 +0000
commit9176cfff3ce62370925dee8713ddb1f8e1da7d3d (patch)
tree78003924e82be19b10912538fc59e86ca22a5dfa /src
parent4cbb711937c78da2319ac9f9aff2376c03d87bda (diff)
Fixed c128 starting up and changed reset line on c64 cartridges to active low. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/bus/c64/fcc.c2
-rw-r--r--src/emu/bus/c64/final.c2
-rw-r--r--src/emu/bus/c64/final3.c2
-rw-r--r--src/emu/bus/c64/mach5.c2
-rw-r--r--src/emu/bus/c64/stardos.c2
-rw-r--r--src/emu/bus/c64/supercpu.c2
-rw-r--r--src/emu/bus/c64/warp_speed.c2
-rw-r--r--src/mess/drivers/c128.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/bus/c64/fcc.c b/src/emu/bus/c64/fcc.c
index 09b5258c6d4..1a22b9c22ba 100644
--- a/src/emu/bus/c64/fcc.c
+++ b/src/emu/bus/c64/fcc.c
@@ -99,7 +99,7 @@ machine_config_constructor c64_final_chesscard_device::device_mconfig_additions(
static INPUT_PORTS_START( c64_fcc )
PORT_START("RESET")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/final.c b/src/emu/bus/c64/final.c
index 19b1fba3195..1a7fbc40b68 100644
--- a/src/emu/bus/c64/final.c
+++ b/src/emu/bus/c64/final.c
@@ -41,7 +41,7 @@ INPUT_CHANGED_MEMBER( c64_final_cartridge_device::freeze )
static INPUT_PORTS_START( c64_final )
PORT_START("SW")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final_cartridge_device, freeze, 0)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/final3.c b/src/emu/bus/c64/final3.c
index a65318b3178..a48053ac7e6 100644
--- a/src/emu/bus/c64/final3.c
+++ b/src/emu/bus/c64/final3.c
@@ -42,7 +42,7 @@ INPUT_CHANGED_MEMBER( c64_final3_cartridge_device::freeze )
static INPUT_PORTS_START( c64_final3 )
PORT_START("SW")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final3_cartridge_device, freeze, 0)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/mach5.c b/src/emu/bus/c64/mach5.c
index 10edb846bef..55fa918d694 100644
--- a/src/emu/bus/c64/mach5.c
+++ b/src/emu/bus/c64/mach5.c
@@ -31,7 +31,7 @@ static INPUT_PORTS_START( c64_mach5 )
PORT_DIPSETTING( 0x01, "C128" )
PORT_START("S2")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/stardos.c b/src/emu/bus/c64/stardos.c
index 42d18ad3d15..ac4f9b850ce 100644
--- a/src/emu/bus/c64/stardos.c
+++ b/src/emu/bus/c64/stardos.c
@@ -55,7 +55,7 @@ const device_type C64_STARDOS = &device_creator<c64_stardos_cartridge_device>;
static INPUT_PORTS_START( c64_stardos )
PORT_START("RESET")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/supercpu.c b/src/emu/bus/c64/supercpu.c
index 6eae6a52225..dbd38f64afd 100644
--- a/src/emu/bus/c64/supercpu.c
+++ b/src/emu/bus/c64/supercpu.c
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( c64_supercpu )
PORT_DIPSETTING( 0x00, "Turbo" )
PORT_START("RESET")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
INPUT_PORTS_END
diff --git a/src/emu/bus/c64/warp_speed.c b/src/emu/bus/c64/warp_speed.c
index 3a89476332a..690629dceea 100644
--- a/src/emu/bus/c64/warp_speed.c
+++ b/src/emu/bus/c64/warp_speed.c
@@ -65,7 +65,7 @@ static INPUT_PORTS_START( c64_warp_speed )
PORT_DIPSETTING( 0x00, "C128" )
PORT_START("SW2")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)
INPUT_PORTS_END
diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c
index 272df9f3ecb..f9bf83a7d65 100644
--- a/src/mess/drivers/c128.c
+++ b/src/mess/drivers/c128.c
@@ -1347,7 +1347,7 @@ WRITE_LINE_MEMBER( c128_state::exp_dma_w )
WRITE_LINE_MEMBER( c128_state::exp_reset_w )
{
- if (state == ASSERT_LINE)
+ if (!state)
{
machine_reset();
}