Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mxser: extract mxser_receive_chars_old

Browse Source 
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-17-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2021-06-18 08:14:22 +02:00 committed by Greg Kroah-Hartman
parent e5ce1bceda
commit 0c4194218c
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/tty/mxser.c
View File

@ -2086,28 +2086,21 @@ static bool mxser_receive_chars_new(struct tty_struct *tty,
return true; return true;
} }
static u8 mxser_receive_chars(struct tty_struct *tty, static u8 mxser_receive_chars_old(struct tty_struct *tty,
struct mxser_port *port, u8 status) struct mxser_port *port, u8 status, int *cnt)
{ {
unsigned char ch; enum mxser_must_hwid hwid = port->board->must_hwid;
int recv_room = tty->receive_room;
int ignored = 0; int ignored = 0;
int cnt = 0;
int recv_room;
int max = 256; int max = 256;
u8 ch;
recv_room = tty->receive_room;
if (recv_room == 0 && !port->ldisc_stop_rx)
mxser_stoprx(tty);
if (mxser_receive_chars_new(tty, port, status, &cnt))
goto end_intr;
do { do {
if (max-- < 0) if (max-- < 0)
break; break;
ch = inb(port->ioaddr + UART_RX); ch = inb(port->ioaddr + UART_RX);
if (port->board->must_hwid && (status & UART_LSR_OE)) if (hwid && (status & UART_LSR_OE))
outb(0x23, port->ioaddr + UART_FCR); outb(0x23, port->ioaddr + UART_FCR);
status &= port->read_status_mask; status &= port->read_status_mask;
if (status & port->ignore_status_mask) { if (status & port->ignore_status_mask) {
@ -2135,8 +2128,8 @@ static u8 mxser_receive_chars(struct tty_struct *tty,
flag = TTY_BREAK; flag = TTY_BREAK;
} }
tty_insert_flip_char(&port->port, ch, flag); tty_insert_flip_char(&port->port, ch, flag);
cnt++; (*cnt)++;
if (cnt >= recv_room) { if (*cnt >= recv_room) {
if (!port->ldisc_stop_rx) if (!port->ldisc_stop_rx)
mxser_stoprx(tty); mxser_stoprx(tty);
break; break;
@ -2144,13 +2137,26 @@ static u8 mxser_receive_chars(struct tty_struct *tty,
} }
if (port->board->must_hwid) if (hwid)
break; break;
status = inb(port->ioaddr + UART_LSR); status = inb(port->ioaddr + UART_LSR);
} while (status & UART_LSR_DR); } while (status & UART_LSR_DR);
end_intr: return status;
}
static u8 mxser_receive_chars(struct tty_struct *tty,
struct mxser_port *port, u8 status)
{
int cnt = 0;
if (tty->receive_room == 0 && !port->ldisc_stop_rx)
mxser_stoprx(tty);
if (!mxser_receive_chars_new(tty, port, status, &cnt))
status = mxser_receive_chars_old(tty, port, status, &cnt);
mxvar_log.rxcnt[tty->index] += cnt; mxvar_log.rxcnt[tty->index] += cnt;
port->mon_data.rxcnt += cnt; port->mon_data.rxcnt += cnt;
port->mon_data.up_rxcnt += cnt; port->mon_data.up_rxcnt += cnt;