diff options
Diffstat (limited to 'src/devices/machine/tms1024.cpp')
-rw-r--r-- | src/devices/machine/tms1024.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp index 596699cef69..63de6583e3a 100644 --- a/src/devices/machine/tms1024.cpp +++ b/src/devices/machine/tms1024.cpp @@ -8,18 +8,18 @@ is available for pin-compatible Mitsubishi M50780SP/M50781SP. Other than more port pins, TMS1025 is assumed to be same as TMS1024. - TODO: - - x - */ #include "emu.h" -#include "machine/tms1024.h" +#include "tms1024.h" +#define VERBOSE 0 +#include "logmacro.h" DEFINE_DEVICE_TYPE(TMS1024, tms1024_device, "tms1024", "TMS1024 I/O Expander") DEFINE_DEVICE_TYPE(TMS1025, tms1025_device, "tms1025", "TMS1025 I/O Expander") + //------------------------------------------------- // constructor //------------------------------------------------- @@ -27,8 +27,8 @@ DEFINE_DEVICE_TYPE(TMS1025, tms1025_device, "tms1025", "TMS1025 I/O Expander") tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, type, tag, owner, clock) , m_h(0), m_s(0), m_std(0), m_ms(0) - , m_read_port{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}} - , m_write_port{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}} + , m_read_port(*this, 0) + , m_write_port(*this) { } @@ -43,19 +43,12 @@ tms1025_device::tms1025_device(const machine_config &mconfig, const char *tag, d } - //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- void tms1024_device::device_start() { - // resolve callbacks (there is no port 0) - for (devcb_read8 &cb : m_read_port) - cb.resolve_safe(0); - for (devcb_write8 &cb : m_write_port) - cb.resolve_safe(); - // register for savestates save_item(NAME(m_h)); save_item(NAME(m_s)); @@ -64,24 +57,26 @@ void tms1024_device::device_start() } - //------------------------------------------------- // handlers //------------------------------------------------- -WRITE8_MEMBER(tms1024_device::write_h) +void tms1024_device::write_h(u8 data) { // H1,2,3,4: data for outputs A,B,C,D m_h = data & 0xf; } -READ8_MEMBER(tms1024_device::read_h) +u8 tms1024_device::read_h() { if (!m_ms) { // read selected port data if (m_s != 0) + { m_h = (m_read_port[m_s-1])((offs_t)(m_s-1)) & 0xf; + LOG("%s: Read %d%d%d%d from P%d\n", machine().describe_context(), BIT(m_h, 3), BIT(m_h, 2), BIT(m_h, 1), BIT(m_h, 0), m_s); + } // high-impedance otherwise } @@ -89,13 +84,13 @@ READ8_MEMBER(tms1024_device::read_h) return m_h; } -WRITE8_MEMBER(tms1024_device::write_s) +void tms1024_device::write_s(uint8_t data) { // S0,1,2: select port m_s = data & 7; } -WRITE_LINE_MEMBER(tms1024_device::write_std) +void tms1024_device::write_std(int state) { state = (state) ? 1 : 0; @@ -103,11 +98,15 @@ WRITE_LINE_MEMBER(tms1024_device::write_std) if (m_ms && !state && m_std) { if (m_s != 0) + { + LOG("%s: Write %d%d%d%d to P%d\n", machine().describe_context(), BIT(m_h, 3), BIT(m_h, 2), BIT(m_h, 1), BIT(m_h, 0), m_s); (m_write_port[m_s-1])((offs_t)(m_s-1), m_h); + } else { // reset all ports + LOG("%s: Reset all ports\n", machine().describe_context()); for (int i = PORT1; i <= PORT7; i++) (m_write_port[i])(offs_t(i), 0); } @@ -116,7 +115,7 @@ WRITE_LINE_MEMBER(tms1024_device::write_std) m_std = state; } -WRITE_LINE_MEMBER(tms1024_device::write_ms) +void tms1024_device::write_ms(int state) { // 0: multiplexer(read) mode, 1: latch(write) mode m_ms = (state) ? 1 : 0; |