summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-11-22 15:37:46 -0500
committer AJR <ajrhacker@users.noreply.github.com>2017-11-22 15:37:46 -0500
commit5259599bd5c70b7856ad75746ab2874989239e56 (patch)
tree88415583fb5e28ac1f1131644f31dd7f417f9fd4
parent3d32ab63d469e31d3fa5ae4c82b6dee70be62f6f (diff)
apollo: Clean up SIO device now that base device is more or less equivalent to 2681 (nw)
-rw-r--r--src/mame/includes/apollo.h1
-rw-r--r--src/mame/machine/apollo.cpp14
2 files changed, 3 insertions, 12 deletions
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index b15bd7296b6..d00be887813 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -340,7 +340,6 @@ protected:
private:
uint8_t m_csrb;
- uint8_t m_ip6;
};
DECLARE_DEVICE_TYPE(APOLLO_SIO, apollo_sio)
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 5284d636c8f..d13aa342fc2 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -714,8 +714,7 @@ TIMER_CALLBACK_MEMBER( apollo_state::apollo_rtc_timer )
apollo_sio::apollo_sio(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
duart_base_device(mconfig, APOLLO_SIO, tag, owner, clock),
- m_csrb(0),
- m_ip6(0)
+ m_csrb(0)
{
}
@@ -728,10 +727,7 @@ void apollo_sio::device_reset()
ip3_w((input_data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
ip4_w((input_data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
ip5_w((input_data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
-// ip6_w((input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
-
- // MC2681 has IP[6] (instead of /IACK on MC68681)
- m_ip6 = (input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE;
+ ip6_w((input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER( apollo_sio::read )
@@ -761,10 +757,6 @@ READ8_MEMBER( apollo_sio::read )
data = 0xff;
}
break;
- case 0x0d: /* IP */
- // MC2681 has IP[6] (instead of /IACK on MC68681)
- data = (data & ~0x40) | (m_ip6 ? 0x40 : 0);
- break;
}
// omit logging if sio is being polled from the boot rom
@@ -808,7 +800,7 @@ WRITE8_MEMBER( apollo_sio::write )
}
// device type definition
-DEFINE_DEVICE_TYPE(APOLLO_SIO, apollo_sio, "apollo_sio", "DN3000/DS3500 SIO")
+DEFINE_DEVICE_TYPE(APOLLO_SIO, apollo_sio, "apollo_sio", "DN3000/DS3500 SIO (MC2681)")
WRITE_LINE_MEMBER(apollo_state::sio_irq_handler)
{