Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

add and use INS8250 register defines (#2601)

Browse Source 
* replace LSR bits by defines
* replace MCR by bit defines
* replace LCR by bit defines
This commit is contained in:
Sven Schnelle 2017-08-27 15:17:55 +02:00 committed by Vas Crabb
parent 947eab7210
commit 14bc7302cd
1 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/devices/machine/ins8250.cpp
View File

@ -144,6 +144,28 @@ void pc16552_device::device_start()
#define COM_INT_PENDING_MODEM_STATUS_REGISTER 0x0008 #define COM_INT_PENDING_MODEM_STATUS_REGISTER 0x0008
#define COM_INT_PENDING_CHAR_TIMEOUT 0x0011 #define COM_INT_PENDING_CHAR_TIMEOUT 0x0011
static constexpr uint8_t INS8250_LSR_TSRE = 0x40;
static constexpr uint8_t INS8250_LSR_THRE = 0x20;
static constexpr uint8_t INS8250_LSR_BI = 0x10;
static constexpr uint8_t INS8250_LSR_FE = 0x08;
static constexpr uint8_t INS8250_LSR_PE = 0x04;
static constexpr uint8_t INS8250_LSR_OE = 0x02;
static constexpr uint8_t INS8250_LSR_DR = 0x01;
static constexpr uint8_t INS8250_MCR_DTR = 0x01;
static constexpr uint8_t INS8250_MCR_RTS = 0x02;
static constexpr uint8_t INS8250_MCR_OUT1 = 0x04;
static constexpr uint8_t INS8250_MCR_OUT2 = 0x08;
static constexpr uint8_t INS8250_MCR_LOOPBACK = 0x10;
static constexpr uint8_t INS8250_LCR_BITCOUNT_MASK= 0x03;
static constexpr uint8_t INS8250_LCR_2STOP_BITS = 0x04;
static constexpr uint8_t INS8250_LCR_PEN = 0x08;
static constexpr uint8_t INS8250_LCR_EVEN_PAR = 0x10;
static constexpr uint8_t INS8250_LCR_PARITY = 0x20;
static constexpr uint8_t INS8250_LCR_BREAK = 0x40;
static constexpr uint8_t INS8250_LCR_DLAB = 0x80;
/* ints will continue to be set for as long as there are ints pending */ /* ints will continue to be set for as long as there are ints pending */
void ins8250_uart_device::update_interrupt() void ins8250_uart_device::update_interrupt()
{ {
@ -210,7 +232,7 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
switch (offset) switch (offset)
{ {
case 0: case 0:
if (m_regs.lcr & 0x80) if (m_regs.lcr & INS8250_LCR_DLAB)
{ {
m_regs.dl = (m_regs.dl & 0xff00) | data; m_regs.dl = (m_regs.dl & 0xff00) | data;
set_rate(clock(), m_regs.dl*16); set_rate(clock(), m_regs.dl*16);
@ -218,23 +240,23 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
else else
{ {
m_regs.thr = data; m_regs.thr = data;
m_regs.lsr &= ~0x20; m_regs.lsr &= ~INS8250_LSR_THRE;
if((m_device_type >= dev_type::NS16550) && (m_regs.fcr & 1)) if((m_device_type >= dev_type::NS16550) && (m_regs.fcr & 1))
push_tx(data); push_tx(data);
clear_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY); clear_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY);
if(m_regs.lsr & 0x40) if(m_regs.lsr & INS8250_LSR_TSRE)
tra_complete(); tra_complete();
} }
break; break;
case 1: case 1:
if (m_regs.lcr & 0x80) if (m_regs.lcr & INS8250_LCR_DLAB)
{ {
m_regs.dl = (m_regs.dl & 0xff) | (data << 8); m_regs.dl = (m_regs.dl & 0xff) | (data << 8);
set_rate(clock(), m_regs.dl*16); set_rate(clock(), m_regs.dl*16);
} }
else else
{ {
if ((m_regs.lsr & 0x20) && (data & COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY)) if ((m_regs.lsr & INS8250_LSR_THRE) && (data & COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY))
trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY); trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY);
m_regs.ier = data; m_regs.ier = data;
update_interrupt(); update_interrupt();
@ -247,7 +269,7 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
m_regs.lcr = data; m_regs.lcr = data;
{ {
int data_bit_count = (m_regs.lcr & 3) + 5; int data_bit_count = (m_regs.lcr & INS8250_LCR_BITCOUNT_MASK) + 5;
parity_t parity; parity_t parity;
stop_bits_t stop_bits; stop_bits_t stop_bits;
@ -274,7 +296,7 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
break; break;
} }
if (!(m_regs.lcr & 4)) if (!(m_regs.lcr & INS8250_LCR_2STOP_BITS))
stop_bits = STOP_BITS_1; stop_bits = STOP_BITS_1;
else if (data_bit_count == 5) else if (data_bit_count == 5)
stop_bits = STOP_BITS_1_5; stop_bits = STOP_BITS_1_5;
@ -291,7 +313,7 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
update_msr(); update_msr();
if (m_regs.mcr & 0x10) /* loopback test */ if (m_regs.mcr & INS8250_MCR_LOOPBACK)
{ {
m_out_tx_cb(1); m_out_tx_cb(1);
device_serial_interface::rx_w(m_txd); device_serial_interface::rx_w(m_txd);
@ -304,10 +326,10 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
{ {
m_out_tx_cb(m_txd); m_out_tx_cb(m_txd);
device_serial_interface::rx_w(m_rxd); device_serial_interface::rx_w(m_rxd);
m_out_dtr_cb((m_regs.mcr & 1) ? 0 : 1); m_out_dtr_cb((m_regs.mcr & INS8250_MCR_DTR) ? 0 : 1);
m_out_rts_cb((m_regs.mcr & 2) ? 0 : 1); m_out_rts_cb((m_regs.mcr & INS8250_MCR_RTS) ? 0 : 1);
m_out_out1_cb((m_regs.mcr & 4) ? 0 : 1); m_out_out1_cb((m_regs.mcr & INS8250_MCR_OUT1) ? 0 : 1);
m_out_out2_cb((m_regs.mcr & 8) ? 0 : 1); m_out_out2_cb((m_regs.mcr & INS8250_MCR_OUT2) ? 0 : 1);
} }
} }
break; break;
@ -317,12 +339,12 @@ WRITE8_MEMBER( ins8250_uart_device::ins8250_w )
bits 5 - 0, you could cause an interrupt if the appropriate IER bit bits 5 - 0, you could cause an interrupt if the appropriate IER bit
is set. is set.
*/ */
m_regs.lsr = (m_regs.lsr & 0x60) | (data & ~0x60); m_regs.lsr = (m_regs.lsr & (INS8250_LSR_TSRE|INS8250_LSR_THRE)) | (data & ~(INS8250_LSR_TSRE|INS8250_LSR_THRE));
tmp = 0; tmp = 0;
tmp |= ( m_regs.lsr & 0x01 ) ? COM_INT_PENDING_RECEIVED_DATA_AVAILABLE : 0; tmp |= ( m_regs.lsr & INS8250_LSR_DR ) ? COM_INT_PENDING_RECEIVED_DATA_AVAILABLE : 0;
tmp |= ( m_regs.lsr & 0x1e ) ? COM_INT_PENDING_RECEIVER_LINE_STATUS : 0; tmp |= ( m_regs.lsr & 0x1e ) ? COM_INT_PENDING_RECEIVER_LINE_STATUS : 0;
tmp |= ( m_regs.lsr & 0x20 ) ? COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY : 0; tmp |= ( m_regs.lsr & INS8250_LSR_THRE ) ? COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY : 0;
trigger_int(tmp); trigger_int(tmp);
break; break;
@ -350,7 +372,7 @@ READ8_MEMBER( ins8250_uart_device::ins8250_r )
switch (offset) switch (offset)
{ {
case 0: case 0:
if (m_regs.lcr & 0x80) if (m_regs.lcr & INS8250_LCR_DLAB)
data = (m_regs.dl & 0xff); data = (m_regs.dl & 0xff);
else else
{ {
@ -359,14 +381,14 @@ READ8_MEMBER( ins8250_uart_device::ins8250_r )
else else
{ {
clear_int(COM_INT_PENDING_RECEIVED_DATA_AVAILABLE); clear_int(COM_INT_PENDING_RECEIVED_DATA_AVAILABLE);
if( m_regs.lsr & 0x01 ) if( m_regs.lsr & INS8250_LSR_DR )
m_regs.lsr &= ~0x01; m_regs.lsr &= ~INS8250_LSR_DR;
} }
data = m_regs.rbr; data = m_regs.rbr;
} }
break; break;
case 1: case 1:
if (m_regs.lcr & 0x80) if (m_regs.lcr & INS8250_LCR_DLAB)
data = (m_regs.dl >> 8); data = (m_regs.dl >> 8);
else else
data = m_regs.ier & 0x0f; data = m_regs.ier & 0x0f;
@ -416,12 +438,12 @@ void ns16550_device::rcv_complete()
if(m_rnum == 16) if(m_rnum == 16)
{ {
m_regs.lsr |= 0x02; //overrun m_regs.lsr |= INS8250_LSR_OE; //overrun
trigger_int(COM_INT_PENDING_RECEIVER_LINE_STATUS); trigger_int(COM_INT_PENDING_RECEIVER_LINE_STATUS);
return; return;
} }
m_regs.lsr |= 0x01; m_regs.lsr |= INS8250_LSR_DR;
m_rfifo[m_rhead] = get_received_char(); m_rfifo[m_rhead] = get_received_char();
++m_rhead &= 0x0f; ++m_rhead &= 0x0f;
m_rnum++; m_rnum++;
@ -439,10 +461,10 @@ void ns16550_device::tra_complete()
{ {
transmit_register_setup(m_tfifo[m_ttail]); transmit_register_setup(m_tfifo[m_ttail]);
++m_ttail &= 0x0f; ++m_ttail &= 0x0f;
m_regs.lsr &= ~0x40; m_regs.lsr &= ~INS8250_LSR_TSRE;
if(m_ttail == m_thead) if(m_ttail == m_thead)
{ {
m_regs.lsr |= 0x20; m_regs.lsr |= INS8250_LSR_THRE;
trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY); trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY);
} }
} }
@ -452,15 +474,15 @@ void ns16550_device::tra_complete()
void ins8250_uart_device::rcv_complete() void ins8250_uart_device::rcv_complete()
{ {
if(m_regs.lsr & 0x01) if(m_regs.lsr & INS8250_LSR_DR)
{ {
m_regs.lsr |= 0x02; //overrun m_regs.lsr |= INS8250_LSR_OE; //overrun
trigger_int(COM_INT_PENDING_RECEIVER_LINE_STATUS); trigger_int(COM_INT_PENDING_RECEIVER_LINE_STATUS);
receive_register_reset(); receive_register_reset();
} }
else else
{ {
m_regs.lsr |= 0x01; m_regs.lsr |= INS8250_LSR_DR;
receive_register_extract(); receive_register_extract();
m_regs.rbr = get_received_char(); m_regs.rbr = get_received_char();
trigger_int(COM_INT_PENDING_RECEIVED_DATA_AVAILABLE); trigger_int(COM_INT_PENDING_RECEIVED_DATA_AVAILABLE);
@ -469,21 +491,21 @@ void ins8250_uart_device::rcv_complete()
void ins8250_uart_device::tra_complete() void ins8250_uart_device::tra_complete()
{ {
if(!(m_regs.lsr & 0x20)) if(!(m_regs.lsr & INS8250_LSR_THRE))
{ {
transmit_register_setup(m_regs.thr); transmit_register_setup(m_regs.thr);
m_regs.lsr &= ~0x40; m_regs.lsr &= ~INS8250_LSR_TSRE;
m_regs.lsr |= 0x20; m_regs.lsr |= INS8250_LSR_THRE;
trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY); trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY);
} }
else else
m_regs.lsr |= 0x40; m_regs.lsr |= INS8250_LSR_TSRE;
} }
void ins8250_uart_device::tra_callback() void ins8250_uart_device::tra_callback()
{ {
m_txd = transmit_register_get_data_bit(); m_txd = transmit_register_get_data_bit();
if (m_regs.mcr & 0x10) if (m_regs.mcr & INS8250_MCR_LOOPBACK)
{ {
device_serial_interface::rx_w(m_txd); device_serial_interface::rx_w(m_txd);
} }
@ -498,9 +520,10 @@ void ins8250_uart_device::update_msr()
uint8_t data; uint8_t data;
int change; int change;
if (m_regs.mcr & 0x10) if (m_regs.mcr & INS8250_MCR_LOOPBACK)
{ {
data = (((m_regs.mcr & 0x0c) << 4) | ((m_regs.mcr & 0x01) << 5) | ((m_regs.mcr & 0x02) << 3)); data = ((m_regs.mcr & (INS8250_MCR_OUT1|INS8250_MCR_OUT2) << 4) | \
((m_regs.mcr & INS8250_MCR_DTR) << 5) | ((m_regs.mcr & INS8250_MCR_RTS) << 3));
change = (m_regs.msr ^ data) >> 4; change = (m_regs.msr ^ data) >> 4;
if(!(m_regs.msr & 0x40) && (data & 0x40)) if(!(m_regs.msr & 0x40) && (data & 0x40))
change &= ~4; change &= ~4;
@ -545,7 +568,7 @@ WRITE_LINE_MEMBER(ins8250_uart_device::rx_w)
{ {
m_rxd = state; m_rxd = state;
if (!(m_regs.mcr & 0x10)) if (!(m_regs.mcr & INS8250_MCR_LOOPBACK))
device_serial_interface::rx_w(m_rxd); device_serial_interface::rx_w(m_rxd);
} }
@ -586,7 +609,7 @@ void ins8250_uart_device::device_reset()
m_regs.iir = 1; m_regs.iir = 1;
m_regs.lcr = 0; m_regs.lcr = 0;
m_regs.mcr = 0; m_regs.mcr = 0;
m_regs.lsr = (1<<5) | (1<<6); m_regs.lsr = INS8250_LSR_THRE | INS8250_LSR_TSRE;
update_msr(); update_msr();
m_regs.msr &= 0xf0; m_regs.msr &= 0xf0;
m_int_pending = 0; m_int_pending = 0;
@ -661,7 +684,7 @@ uint8_t ns16550_device::pop_rx()
else else
{ {
m_timeout->adjust(attotime::never); m_timeout->adjust(attotime::never);
m_regs.lsr &= ~1; m_regs.lsr &= ~INS8250_LSR_DR;
} }
return data; return data;
@ -689,7 +712,7 @@ void ns16550_device::set_fcr(uint8_t data)
{ {
memset(&m_tfifo, '\0', sizeof(m_tfifo)); memset(&m_tfifo, '\0', sizeof(m_tfifo));
m_thead = m_ttail = 0; m_thead = m_ttail = 0;
m_regs.lsr |= 0x20; m_regs.lsr |= INS8250_LSR_THRE;
trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY); trigger_int(COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY);
} }
m_rintlvl = bytes_per_int[(data>>6)&3]; m_rintlvl = bytes_per_int[(data>>6)&3];