diff options
author | 2020-01-30 11:03:55 +0100 | |
---|---|---|
committer | 2020-01-30 11:03:55 +0100 | |
commit | ba65fa40a13a5a41796c40f4cedf217522a0c914 (patch) | |
tree | aa473970b2fba1dc3a1a28ca0db332d2cbf04de5 | |
parent | b14815e454f154dccbd0cd39ac062ed24594e3c7 (diff) |
mc6846: Removed nonexistant CP1 output callback and added a CP1 input interface call
-rw-r--r-- | src/devices/machine/mc6846.cpp | 5 | ||||
-rw-r--r-- | src/devices/machine/mc6846.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp index 31e562fd849..ecae29b48c3 100644 --- a/src/devices/machine/mc6846.cpp +++ b/src/devices/machine/mc6846.cpp @@ -24,6 +24,8 @@ #include "mc6846.h" //#define VERBOSE 1 +//#define LOG_OUTPUT_STREAM std::cout + #include "logmacro.h" @@ -47,7 +49,6 @@ DEFINE_DEVICE_TYPE(MC6846, mc6846_device, "mc6846", "MC6846 Programmable Timer") mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MC6846, tag, owner, clock), m_out_port_cb(*this), - m_out_cp1_cb(*this), m_out_cp2_cb(*this), m_in_port_cb(*this), m_out_cto_cb(*this), @@ -65,7 +66,6 @@ void mc6846_device::device_start() m_one_shot = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mc6846_device::timer_one_shot), this)); m_out_port_cb.resolve(); /* 8-bit output */ - m_out_cp1_cb.resolve_safe(); /* 1-bit output */ m_out_cp2_cb.resolve(); /* 1-bit output */ /* CPU read from the outside through chip */ @@ -354,6 +354,7 @@ READ8_MEMBER(mc6846_device::read) WRITE8_MEMBER(mc6846_device::write) { + switch ( offset ) { case 0: diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h index 1b960ae1ef3..81633923adc 100644 --- a/src/devices/machine/mc6846.h +++ b/src/devices/machine/mc6846.h @@ -21,7 +21,6 @@ public: auto out_port() { return m_out_port_cb.bind(); } auto in_port() { return m_in_port_cb.bind(); } - auto cp1() { return m_out_cp1_cb.bind(); } auto cp2() { return m_out_cp2_cb.bind(); } auto cto() { return m_out_cto_cb.bind(); } auto irq() { return m_irq_cb.bind(); } @@ -78,7 +77,6 @@ private: /* CPU write to the outside through chip */ devcb_write8 m_out_port_cb; /* 8-bit output */ - devcb_write_line m_out_cp1_cb; /* 1-bit output */ devcb_write_line m_out_cp2_cb; /* 1-bit output */ /* CPU read from the outside through chip */ |