mirror of
https://github.com/holub/mame
synced 2025-04-09 18:17:44 +03:00
diserial: Use logmacro for optional logging and make the messages more useful
This commit is contained in:
parent
deb674f743
commit
ec9992e002
@ -10,6 +10,14 @@
|
||||
#include "emu.h"
|
||||
#include "diserial.h"
|
||||
|
||||
#define LOG_SETUP (1 << 1U)
|
||||
#define LOG_TX (1 << 2U)
|
||||
#define LOG_RX (1 << 3U)
|
||||
#define VERBOSE (0)
|
||||
|
||||
#define LOG_OUTPUT_FUNC device().logerror
|
||||
#include "logmacro.h"
|
||||
|
||||
device_serial_interface::device_serial_interface(const machine_config &mconfig, device_t &device) :
|
||||
device_interface(device, "serial"),
|
||||
m_start_bit_hack_for_external_clocks(false),
|
||||
@ -157,7 +165,7 @@ WRITE_LINE_MEMBER(device_serial_interface::clock_w)
|
||||
|
||||
void device_serial_interface::set_data_frame(int start_bit_count, int data_bit_count, parity_t parity, stop_bits_t stop_bits)
|
||||
{
|
||||
//device().logerror("Start bits: %d; Data bits: %d; Parity: %s; Stop bits: %s\n", start_bit_count, data_bit_count, parity_tostring(parity), stop_bits_tostring(stop_bits));
|
||||
LOGMASKED(LOG_SETUP, "Start bits: %d; Data bits: %d; Parity: %s; Stop bits: %s\n", start_bit_count, data_bit_count, parity_tostring(parity), stop_bits_tostring(stop_bits));
|
||||
|
||||
m_df_word_length = data_bit_count;
|
||||
|
||||
@ -216,7 +224,7 @@ WRITE_LINE_MEMBER(device_serial_interface::rx_w)
|
||||
receive_register_update_bit(state);
|
||||
if(m_rcv_flags & RECEIVE_REGISTER_SYNCHRONISED)
|
||||
{
|
||||
//device().logerror("Receiver is synchronized\n");
|
||||
LOGMASKED(LOG_RX, "Receiver is synchronized\n");
|
||||
if(m_rcv_clock && !(m_rcv_rate.is_never()))
|
||||
// make start delay just a bit longer to make sure we are called after the sender
|
||||
m_rcv_clock->adjust(((m_rcv_rate*3)/2), 0, m_rcv_rate);
|
||||
@ -235,7 +243,6 @@ void device_serial_interface::receive_register_update_bit(int bit)
|
||||
{
|
||||
int previous_bit;
|
||||
|
||||
//LOG(("receive register receive bit: %1x\n",bit));
|
||||
previous_bit = (m_rcv_register_data & 0x8000) ? 1 : 0;
|
||||
|
||||
/* shift previous bit 7 out */
|
||||
@ -254,7 +261,7 @@ void device_serial_interface::receive_register_update_bit(int bit)
|
||||
/* yes */
|
||||
if (bit==0)
|
||||
{
|
||||
//logerror("receive register saw start bit\n");
|
||||
LOGMASKED(LOG_RX, "Receiver saw start bit\n");
|
||||
|
||||
/* seen start bit! */
|
||||
/* not waiting for start bit now! */
|
||||
@ -270,11 +277,12 @@ void device_serial_interface::receive_register_update_bit(int bit)
|
||||
else
|
||||
if (m_rcv_flags & RECEIVE_REGISTER_SYNCHRONISED)
|
||||
{
|
||||
//device().logerror("Received bit %d\n", m_rcv_bit_count_received);
|
||||
LOGMASKED(LOG_RX, "Received bit %d as %d\n", m_rcv_bit_count_received, bit);
|
||||
m_rcv_bit_count_received++;
|
||||
|
||||
if (!bit && (m_rcv_bit_count_received > (m_rcv_bit_count - m_df_stop_bit_count)))
|
||||
{
|
||||
LOGMASKED(LOG_RX, "Framing error\n");
|
||||
m_rcv_framing_error = true;
|
||||
}
|
||||
|
||||
@ -284,7 +292,7 @@ void device_serial_interface::receive_register_update_bit(int bit)
|
||||
m_rcv_bit_count_received = 0;
|
||||
m_rcv_flags &=~RECEIVE_REGISTER_SYNCHRONISED;
|
||||
m_rcv_flags |= RECEIVE_REGISTER_WAITING_FOR_START_BIT;
|
||||
//device().logerror("Receive register full\n");
|
||||
LOGMASKED(LOG_RX, "Receive register full\n");
|
||||
m_rcv_flags |= RECEIVE_REGISTER_FULL;
|
||||
}
|
||||
}
|
||||
@ -428,13 +436,17 @@ u8 device_serial_interface::transmit_register_get_data_bit()
|
||||
|
||||
bit = (m_tra_register_data>>(m_tra_bit_count-1-m_tra_bit_count_transmitted))&1;
|
||||
|
||||
if (m_tra_bit_count_transmitted < m_df_start_bit_count)
|
||||
LOGMASKED(LOG_TX, "Transmitting start bit as %d\n", m_tra_bit_count_transmitted, bit);
|
||||
else
|
||||
LOGMASKED(LOG_TX, "Transmitting bit %d as %d\n", m_tra_bit_count_transmitted - m_df_start_bit_count, bit);
|
||||
m_tra_bit_count_transmitted++;
|
||||
//device().logerror("%d bits transmitted\n", m_tra_bit_count_transmitted);
|
||||
|
||||
/* have all bits of this stream formatted byte been sent? */
|
||||
if (m_tra_bit_count_transmitted==m_tra_bit_count)
|
||||
{
|
||||
/* yes - generate a new byte to send */
|
||||
LOGMASKED(LOG_TX, "Transmit register empty\n");
|
||||
m_tra_flags |= TRANSMIT_REGISTER_EMPTY;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user