diff options
Diffstat (limited to 'src/devices/machine/68561mpcc.cpp')
-rw-r--r-- | src/devices/machine/68561mpcc.cpp | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index 3bbd73ac990..77bad6bf7a3 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -44,25 +44,23 @@ FEATURES //************************************************************************** // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) -#define LOG_READ (1U << 4) -#define LOG_CMD (1U << 5) -#define LOG_TX (1U << 6) -#define LOG_RCV (1U << 7) -#define LOG_CTS (1U << 8) -#define LOG_DCD (1U << 9) -#define LOG_SYNC (1U << 10) -#define LOG_CHAR (1U << 11) -#define LOG_RX (1U << 12) +#define LOG_SETUP (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_CMD (1U << 4) +#define LOG_TX (1U << 5) +#define LOG_RCV (1U << 6) +#define LOG_CTS (1U << 7) +#define LOG_DCD (1U << 8) +#define LOG_SYNC (1U << 9) +#define LOG_CHAR (1U << 10) +#define LOG_RX (1U << 11) //#define VERBOSE ( LOG_SETUP | LOG_GENERAL | LOG_INT) //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) @@ -171,14 +169,6 @@ void mpcc_device::device_start() { LOGSETUP("%s\n", FUNCNAME); - // resolve callbacks - m_out_txd_cb.resolve_safe(); - m_out_dtr_cb.resolve_safe(); - m_out_rts_cb.resolve_safe(); - m_out_rtxc_cb.resolve_safe(); - m_out_trxc_cb.resolve_safe(); - m_out_int_cb.resolve_safe(); - // state saving save_item(NAME(m_int_state)); save_item(NAME(m_rsr)); @@ -256,7 +246,7 @@ void mpcc_device::device_reset() /* * Serial device implementation */ -WRITE_LINE_MEMBER(mpcc_device::cts_w) +void mpcc_device::cts_w(int state) { if (state == CLEAR_LINE) { @@ -280,7 +270,7 @@ WRITE_LINE_MEMBER(mpcc_device::cts_w) m_sisr |= REG_SISR_CTSLVL; } -WRITE_LINE_MEMBER(mpcc_device::dsr_w) +void mpcc_device::dsr_w(int state) { if (state == ASSERT_LINE) { @@ -303,7 +293,7 @@ WRITE_LINE_MEMBER(mpcc_device::dsr_w) m_sisr &= ~REG_SISR_DSRLVL; } -WRITE_LINE_MEMBER(mpcc_device::dcd_w) +void mpcc_device::dcd_w(int state) { if (state == CLEAR_LINE) { @@ -648,7 +638,7 @@ void mpcc_device::rcv_complete() // write_rx - called by terminal through rs232/diserial // when character is sent to board //------------------------------------------------- -WRITE_LINE_MEMBER(mpcc_device::write_rx) +void mpcc_device::write_rx(int state) { LOGRCV("%s(%d)\n", FUNCNAME, state); m_rxd = state; @@ -812,7 +802,7 @@ void mpcc_device::update_interrupts(int source) //------------------------------------------------- // Read register //------------------------------------------------- -READ8_MEMBER( mpcc_device::read ) +uint8_t mpcc_device::read(offs_t offset) { uint8_t data = 0; @@ -849,7 +839,7 @@ READ8_MEMBER( mpcc_device::read ) //------------------------------------------------- // Write register //------------------------------------------------- -WRITE8_MEMBER( mpcc_device::write ) +void mpcc_device::write(offs_t offset, uint8_t data) { LOGSETUP(" * %s Reg %02x <- %02x \n", tag(), offset, data); switch(offset) |