Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-28 15:14:21 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5911 from JoakimLarsson/baudout

Browse Source 
ins8250.cpp: fixed regression caused by local BRG used for baudout pin
This commit is contained in:
Joakim Larsson Edström 2019-11-16 23:55:05 +01:00 committed by GitHub
commit 5eacbd3b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,9 +252,11 @@ READ_LINE_MEMBER(ins8250_uart_device::intrpt_r)
TIMER_CALLBACK_MEMBER(ins8250_uart_device::brg_clock) TIMER_CALLBACK_MEMBER(ins8250_uart_device::brg_clock)
{ {
bool state = m_brg_clock;
if (!is_transmit_register_empty()) if (!is_transmit_register_empty())
{ {
tx_clock_w(m_brg_clock); device_serial_interface::tx_clock_w(m_brg_clock);
m_brg_clock = !state;
} }
if (is_receive_register_synchronized()) if (is_receive_register_synchronized())
{ {
@ -266,8 +268,8 @@ TIMER_CALLBACK_MEMBER(ins8250_uart_device::brg_clock)
{ {
m_out_baudout_cb(m_brg_clock); m_out_baudout_cb(m_brg_clock);
} }
m_brg_clock = !state;
} }
m_brg_clock = !m_brg_clock;
m_brg->adjust(((clock() && (m_regs.dl) ? (attotime::from_hz(clock()) * m_regs.dl * 16) : attotime::never) / 2)); m_brg->adjust(((clock() && (m_regs.dl) ? (attotime::from_hz(clock()) * m_regs.dl * 16) : attotime::never) / 2));
} }
@ -275,7 +277,6 @@ TIMER_CALLBACK_MEMBER(ins8250_uart_device::brg_clock)
void ins8250_uart_device::update_baud_rate() void ins8250_uart_device::update_baud_rate()
{ {
LOG("%.1f baud selected (divisor = %d)\n", double(clock()) / (m_regs.dl * 16), m_regs.dl); LOG("%.1f baud selected (divisor = %d)\n", double(clock()) / (m_regs.dl * 16), m_regs.dl);
m_brg->adjust(((clock() && (m_regs.dl) ? (attotime::from_hz(clock()) * m_regs.dl * 16) : attotime::never) / 2)); m_brg->adjust(((clock() && (m_regs.dl) ? (attotime::from_hz(clock()) * m_regs.dl * 16) : attotime::never) / 2));
} }
@ -671,7 +672,7 @@ void ins8250_uart_device::device_start()
m_out_int_cb.resolve_safe(); m_out_int_cb.resolve_safe();
m_out_out1_cb.resolve_safe(); m_out_out1_cb.resolve_safe();
m_out_out2_cb.resolve_safe(); m_out_out2_cb.resolve_safe();
m_out_baudout_cb.resolve_safe(); m_out_baudout_cb.resolve();
set_tra_rate(0); set_tra_rate(0);
set_rcv_rate(0); set_rcv_rate(0);
m_brg = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ins8250_uart_device::brg_clock), this)); m_brg = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ins8250_uart_device::brg_clock), this));
@ -716,7 +717,7 @@ void ins8250_uart_device::device_reset()
m_out_dtr_cb(1); m_out_dtr_cb(1);
m_out_out1_cb(1); m_out_out1_cb(1);
m_out_out2_cb(1); m_out_out2_cb(1);
m_out_baudout_cb(1); if (!m_out_baudout_cb.isnull()) m_out_baudout_cb(1);
} }
void ns16550_device::device_start() void ns16550_device::device_start()