summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mos6551.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/mos6551.cpp')
-rw-r--r--src/devices/machine/mos6551.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 97f31a39b52..91595615d6c 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -9,12 +9,14 @@
#include "emu.h"
#include "mos6551.h"
-#define LOG 0
+//#define VERBOSE 1
+#include "logmacro.h"
-const device_type MOS6551 = device_creator<mos6551_device>;
+
+DEFINE_DEVICE_TYPE(MOS6551, mos6551_device, "mos6551", "MOS 6551 ACIA")
mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__),
+ device_t(mconfig, MOS6551, tag, owner, clock),
m_internal_clock(*this, "clock"),
m_irq_handler(*this),
m_txd_handler(*this),
@@ -552,7 +554,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
if (!m_rxd && !m_dtr)
{
- if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag());
+ LOG("MOS6551: RX START BIT\n");
}
else
{
@@ -574,7 +576,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX false START BIT\n", tag());
+ LOG("MOS6551: RX false START BIT\n");
}
}
break;
@@ -586,11 +588,11 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
if (m_rx_bits < m_wordlength)
{
- if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
+ LOG("MOS6551: RX DATA BIT %d %d\n", m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
+ LOG("MOS6551: RX PARITY BIT %x\n", m_rxd);
}
if (m_rxd)
@@ -615,7 +617,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag());
+ LOG("MOS6551: RX STOP BIT\n");
if (!(m_status & SR_RDRF))
{
@@ -715,11 +717,11 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
}
else if (!(m_status & SR_TDRE))
{
- if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag(), m_tdr);
+ LOG("MOS6551: TX DATA %x\n", m_tdr);
m_tx_output = OUTPUT_TXD;
- if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag());
+ LOG("MOS6551: TX START BIT\n");
m_status |= SR_TDRE;
}
@@ -727,7 +729,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
m_tx_output = OUTPUT_BREAK;
- if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag());
+ LOG("MOS6551: TX BREAK START\n");
}
else
{
@@ -757,7 +759,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
+ LOG("MOS6551: TX DATA BIT %d %d\n", m_tx_bits, m_txd);
}
}
else if (m_tx_bits == m_wordlength && m_parity != PARITY_NONE)
@@ -783,7 +785,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag(), m_txd);
+ LOG("MOS6551: TX PARITY BIT %d\n", m_txd);
}
}
else
@@ -794,7 +796,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag());
+ LOG("MOS6551: TX STOP BIT\n");
}
}
}
@@ -807,7 +809,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
if (!m_brk)
{
- if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag());
+ LOG("MOS6551: TX BREAK END\n");
m_tx_counter = 0;
m_tx_state = STATE_STOP;