Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

z80sio: cleanup

Browse Source
This commit is contained in:
Joakim Larsson Edstrom 2017-03-19 10:05:28 +01:00
parent d0cda52d75
commit 1fd8d64007
2 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/devices/machine/z80sio.cpp
View File

@ -21,13 +21,13 @@
6MHz 1200Kbps 6MHz 1200Kbps
10MHz 2500Kbps 10MHz 2500Kbps
-- Asynchrounous features ------------------------------------------- -- Asynchrounous features -------------------------------------------
5-8 bit per char Y * 5-8 bit per char Y
1,1.5,2 stop bits Y * 1,1.5,2 stop bits Y
odd/even parity Y * odd/even parity Y
x1,x16,x32,x64 Y * x1,x16,x32,x64 Y
break det/gen Y break det/gen Y
parity, framing & Y * parity, framing & Y
overrun error det Y overrun error det Y
-- Byte oriented synchrounous features ------------------------------- -- Byte oriented synchrounous features -------------------------------
Int/ext char sync Y Int/ext char sync Y
1/2 synch chars Y 1/2 synch chars Y
@ -41,8 +41,8 @@
1-fld resid hand Y 1-fld resid hand Y
Valid rec msg protection Y Valid rec msg protection Y
-- --
Receiver FIFO 3 * Receiver FIFO 3
Transmitter FIFO 1 * Transmitter FIFO 1
------------------------------------------------------------------------- -------------------------------------------------------------------------
* = Features that has been implemented n/a = features that will not * = Features that has been implemented n/a = features that will not
***************************************************************************/ ***************************************************************************/
@ -106,10 +106,9 @@ const device_type I8274N = device_creator<i8274N_device>; // Remove trailing N w
//------------------------------------------------- //-------------------------------------------------
// device_mconfig_additions - // device_mconfig_additions -
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_FRAGMENT( z80sio ) MACHINE_CONFIG_FRAGMENT( z80sio )
MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0) MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0)
MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0) MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
machine_config_constructor z80sio_device::device_mconfig_additions() const machine_config_constructor z80sio_device::device_mconfig_additions() const
@ -124,7 +123,6 @@ machine_config_constructor z80sio_device::device_mconfig_additions() const
//------------------------------------------------- //-------------------------------------------------
// z80sio_device - constructor // z80sio_device - constructor
//------------------------------------------------- //-------------------------------------------------
z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source) z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z80daisy_interface(mconfig, *this), device_z80daisy_interface(mconfig, *this),
@ -361,7 +359,6 @@ int z80sio_device::get_interrupt_prio(int index, int type)
int prio_level = -1; int prio_level = -1;
int priority = -1; int priority = -1;
// LOGINT("prio_level: %02x priority:%02x ", prio_level, priority);
if ((m_variant == TYPE_I8274) || (m_variant == TYPE_UPD7201)) if ((m_variant == TYPE_I8274) || (m_variant == TYPE_UPD7201))
{ {
/* These CPU variants use Bit 2 of WR2 of Channnel A to determine the priority Hi to Lo: /* These CPU variants use Bit 2 of WR2 of Channnel A to determine the priority Hi to Lo:
@ -482,8 +479,6 @@ READ8_MEMBER( z80sio_device::cd_ba_r )
int cd = BIT(offset, 1); int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA; z80sio_channel *channel = ba ? m_chanB : m_chanA;
//LOG("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" );
return cd ? channel->control_read() : channel->data_read(); return cd ? channel->control_read() : channel->data_read();
} }
@ -497,8 +492,6 @@ WRITE8_MEMBER( z80sio_device::cd_ba_w )
int cd = BIT(offset, 1); int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA; z80sio_channel *channel = ba ? m_chanB : m_chanA;
LOG("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" );
if (cd) if (cd)
channel->control_write(data); channel->control_write(data);
else else
@ -515,8 +508,6 @@ READ8_MEMBER( z80sio_device::ba_cd_r )
int cd = BIT(offset, 0); int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA; z80sio_channel *channel = ba ? m_chanB : m_chanA;
//LOG("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" );
return cd ? channel->control_read() : channel->data_read(); return cd ? channel->control_read() : channel->data_read();
} }
@ -530,8 +521,6 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
int cd = BIT(offset, 0); int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA; z80sio_channel *channel = ba ? m_chanB : m_chanA;
LOG("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" );
if (cd) if (cd)
channel->control_write(data); channel->control_write(data);
else else
@ -768,7 +757,6 @@ void z80sio_channel::rcv_complete()
//------------------------------------------------- //-------------------------------------------------
// get_clock_mode - get clock divisor // get_clock_mode - get clock divisor
//------------------------------------------------- //-------------------------------------------------
int z80sio_channel::get_clock_mode() int z80sio_channel::get_clock_mode()
{ {
//LOG("%s %s\n",FUNCNAME, tag()); //LOG("%s %s\n",FUNCNAME, tag());
@ -785,17 +773,16 @@ int z80sio_channel::get_clock_mode()
return clocks; return clocks;
} }
/* From "uPD7201/7201A MULTI PROTOCOL SERIAL COMMUNICATION CONTROLLER" by NEC: /*
"RTSA (Request to Send A): The state of the RTS bit (01 of the CR5 register) controls this pin. If From "uPD7201/7201A MULTI PROTOCOL SERIAL COMMUNICATION CONTROLLER" by NEC:
the RTS bit is reset in the asynchronous mode, a high level will not be output on the RTS pin until "RTSA (Request to Send A): The state of the RTS bit (01 of the CR5 register) controls this pin. If
all transmit characters are written and the all sent bit (D0 of the SR1 register) is set. In the the RTS bit is reset in the asynchronous mode, a high level will not be output on the RTS pin until
synchronous mode, the state of the RTS bit is used as is. That is, when the RTS bit is 0, the RTS all transmit characters are written and the all sent bit (D0 of the SR1 register) is set. In the
pin is 1. When the RTS bit is 1, the RTS pin is O." synchronous mode, the state of the RTS bit is used as is. That is, when the RTS bit is 0, the RTS
pin is 1. When the RTS bit is 1, the RTS pin is O."
CR5 = m_wr5 and SR1 = m_rr1
CR5 = m_wr5 and SR1 = m_rr1
*/ */
void z80sio_channel::set_rts(int state) void z80sio_channel::set_rts(int state)
{ {
LOG("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index); LOG("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index);
@ -828,7 +815,6 @@ void z80sio_channel::update_rts()
//------------------------------------------------- //-------------------------------------------------
// get_stop_bits - get number of stop bits // get_stop_bits - get number of stop bits
//------------------------------------------------- //-------------------------------------------------
device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits() device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
{ {
LOG("%s %s\n",FUNCNAME, tag()); LOG("%s %s\n",FUNCNAME, tag());
@ -846,7 +832,6 @@ device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
//------------------------------------------------- //-------------------------------------------------
// get_rx_word_length - get receive word length // get_rx_word_length - get receive word length
//------------------------------------------------- //-------------------------------------------------
int z80sio_channel::get_rx_word_length() int z80sio_channel::get_rx_word_length()
{ {
LOG("%s %s\n",FUNCNAME, tag()); LOG("%s %s\n",FUNCNAME, tag());
@ -867,7 +852,6 @@ int z80sio_channel::get_rx_word_length()
//------------------------------------------------- //-------------------------------------------------
// get_tx_word_length - get transmit word length // get_tx_word_length - get transmit word length
//------------------------------------------------- //-------------------------------------------------
int z80sio_channel::get_tx_word_length() int z80sio_channel::get_tx_word_length()
{ {
LOG("%s %s\n",FUNCNAME, tag()); LOG("%s %s\n",FUNCNAME, tag());
@ -970,7 +954,6 @@ uint8_t z80sio_channel::do_sioreg_rr2()
//------------------------------------------------- //-------------------------------------------------
// control_read - read control register // control_read - read control register
//------------------------------------------------- //-------------------------------------------------
uint8_t z80sio_channel::control_read() uint8_t z80sio_channel::control_read()
{ {
uint8_t data = 0; uint8_t data = 0;
@ -1339,7 +1322,6 @@ void z80sio_channel::receive_data(uint8_t data)
//------------------------------------------------- //-------------------------------------------------
// cts_w - clear to send handler // cts_w - clear to send handler
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::cts_w ) WRITE_LINE_MEMBER( z80sio_channel::cts_w )
{ {
LOG("%s(%02x) %s:%c\n",FUNCNAME, state, tag(), 'A' + m_index); LOG("%s(%02x) %s:%c\n",FUNCNAME, state, tag(), 'A' + m_index);
@ -1378,7 +1360,6 @@ WRITE_LINE_MEMBER( z80sio_channel::cts_w )
//------------------------------------------------- //-------------------------------------------------
// dcd_w - data carrier detected handler // dcd_w - data carrier detected handler
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::dcd_w ) WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
{ {
LOG("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state); LOG("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state);
@ -1416,7 +1397,6 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
//------------------------------------------------- //-------------------------------------------------
// sh_w - Sync Hunt handler // sh_w - Sync Hunt handler
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::sync_w ) WRITE_LINE_MEMBER( z80sio_channel::sync_w )
{ {
LOG("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag(), 'A' + m_index, state); LOG("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag(), 'A' + m_index, state);
@ -1449,7 +1429,6 @@ WRITE_LINE_MEMBER( z80sio_channel::sync_w )
//------------------------------------------------- //-------------------------------------------------
// rxc_w - receive clock // rxc_w - receive clock
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::rxc_w ) WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
{ {
//LOG("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'); //LOG("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A');
@ -1471,7 +1450,6 @@ WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
//------------------------------------------------- //-------------------------------------------------
// txc_w - transmit clock // txc_w - transmit clock
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER( z80sio_channel::txc_w ) WRITE_LINE_MEMBER( z80sio_channel::txc_w )
{ {
//LOG("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'); //LOG("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A');
@ -1534,7 +1512,6 @@ void z80sio_channel::update_serial()
//------------------------------------------------- //-------------------------------------------------
// set_dtr - // set_dtr -
//------------------------------------------------- //-------------------------------------------------
void z80sio_channel::set_dtr(int state) void z80sio_channel::set_dtr(int state)
{ {
LOG("%s(%d)\n", FUNCNAME, state); LOG("%s(%d)\n", FUNCNAME, state);
@ -1549,7 +1526,6 @@ void z80sio_channel::set_dtr(int state)
//------------------------------------------------- //-------------------------------------------------
// write_rx - // write_rx -
//------------------------------------------------- //-------------------------------------------------
WRITE_LINE_MEMBER(z80sio_channel::write_rx) WRITE_LINE_MEMBER(z80sio_channel::write_rx)
{ {
m_rxd = state; m_rxd = state;

8
src/devices/machine/z80sio.h
View File

@ -185,7 +185,6 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_rx ); DECLARE_WRITE_LINE_MEMBER( write_rx );
DECLARE_WRITE_LINE_MEMBER( cts_w ); DECLARE_WRITE_LINE_MEMBER( cts_w );
DECLARE_WRITE_LINE_MEMBER( dcd_w ); DECLARE_WRITE_LINE_MEMBER( dcd_w );
//DECLARE_WRITE_LINE_MEMBER( ri_w );
DECLARE_WRITE_LINE_MEMBER( rxc_w ); DECLARE_WRITE_LINE_MEMBER( rxc_w );
DECLARE_WRITE_LINE_MEMBER( txc_w ); DECLARE_WRITE_LINE_MEMBER( txc_w );
DECLARE_WRITE_LINE_MEMBER( sync_w ); DECLARE_WRITE_LINE_MEMBER( sync_w );
@ -194,11 +193,11 @@ public:
int m_txc; int m_txc;
// Register state // Register state
// read registers enum // read registers enum
uint8_t m_rr0; // REG_RR0_STATUS uint8_t m_rr0; // REG_RR0_STATUS
uint8_t m_rr1; // REG_RR1_SPEC_RCV_COND uint8_t m_rr1; // REG_RR1_SPEC_RCV_COND
uint8_t m_rr2; // REG_RR2_INTERRUPT_VECT uint8_t m_rr2; // REG_RR2_INTERRUPT_VECT
// write registers enum // write registers enum
uint8_t m_wr0; // REG_WR0_COMMAND_REGPT uint8_t m_wr0; // REG_WR0_COMMAND_REGPT
uint8_t m_wr1; // REG_WR1_INT_DMA_ENABLE uint8_t m_wr1; // REG_WR1_INT_DMA_ENABLE
uint8_t m_wr2; // REG_WR2_INT_VECTOR uint8_t m_wr2; // REG_WR2_INT_VECTOR
@ -485,8 +484,6 @@ public:
DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); } DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); }
DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); } DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); }
DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); } DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); }
//DECLARE_WRITE_LINE_MEMBER( ria_w ) { m_chanA->ri_w(state); }
//DECLARE_WRITE_LINE_MEMBER( rib_w ) { m_chanB->ri_w(state); }
DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); } DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); }
DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); } DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); }
DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); } DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); }
@ -514,6 +511,7 @@ protected:
void trigger_interrupt(int index, int state); void trigger_interrupt(int index, int state);
int get_channel_index(z80sio_channel *ch) { return (ch == m_chanA) ? 0 : 1; } int get_channel_index(z80sio_channel *ch) { return (ch == m_chanA) ? 0 : 1; }
// CPU types that has slightly different behaviour
enum enum
{ {
TYPE_Z80SIO = 0x001, TYPE_Z80SIO = 0x001,