mc6846: Removed nonexistant CP1 output callback and added a CP1 input interface call

This commit is contained in:
Joakim Larsson Edstrom 2020-01-30 11:03:55 +01:00
parent b14815e454
commit ba65fa40a1
2 changed files with 3 additions and 4 deletions

View File

@ -24,6 +24,8 @@
#include "mc6846.h" #include "mc6846.h"
//#define VERBOSE 1 //#define VERBOSE 1
//#define LOG_OUTPUT_STREAM std::cout
#include "logmacro.h" #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) mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MC6846, tag, owner, clock), : device_t(mconfig, MC6846, tag, owner, clock),
m_out_port_cb(*this), m_out_port_cb(*this),
m_out_cp1_cb(*this),
m_out_cp2_cb(*this), m_out_cp2_cb(*this),
m_in_port_cb(*this), m_in_port_cb(*this),
m_out_cto_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_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_port_cb.resolve(); /* 8-bit output */
m_out_cp1_cb.resolve_safe(); /* 1-bit output */
m_out_cp2_cb.resolve(); /* 1-bit output */ m_out_cp2_cb.resolve(); /* 1-bit output */
/* CPU read from the outside through chip */ /* CPU read from the outside through chip */
@ -354,6 +354,7 @@ READ8_MEMBER(mc6846_device::read)
WRITE8_MEMBER(mc6846_device::write) WRITE8_MEMBER(mc6846_device::write)
{ {
switch ( offset ) switch ( offset )
{ {
case 0: case 0:

View File

@ -21,7 +21,6 @@ public:
auto out_port() { return m_out_port_cb.bind(); } auto out_port() { return m_out_port_cb.bind(); }
auto in_port() { return m_in_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 cp2() { return m_out_cp2_cb.bind(); }
auto cto() { return m_out_cto_cb.bind(); } auto cto() { return m_out_cto_cb.bind(); }
auto irq() { return m_irq_cb.bind(); } auto irq() { return m_irq_cb.bind(); }
@ -78,7 +77,6 @@ private:
/* CPU write to the outside through chip */ /* CPU write to the outside through chip */
devcb_write8 m_out_port_cb; /* 8-bit output */ 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 */ devcb_write_line m_out_cp2_cb; /* 1-bit output */
/* CPU read from the outside through chip */ /* CPU read from the outside through chip */