p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

n_tty: Factor 'real raw' receive_buf into standalone fn 

Convert to modal receive_buf() processing; factor real_raw
receive_buf() into n_tty_receive_buf_real_raw().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2013-06-15 10:21:22 -04:00 committed by Greg Kroah-Hartman
parent 781ad1c793
commit 4a23a4df50
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/tty/n_tty.c
View File

@ -242,7 +242,7 @@ static void n_tty_write_wakeup(struct tty_struct *tty)
kill_fasync(&tty->fasync, SIGIO, POLL_OUT); kill_fasync(&tty->fasync, SIGIO, POLL_OUT);
} }
static inline void n_tty_check_throttle(struct tty_struct *tty) static void n_tty_check_throttle(struct tty_struct *tty)
{ {
if (tty->driver->type == TTY_DRIVER_TYPE_PTY) if (tty->driver->type == TTY_DRIVER_TYPE_PTY)
return; return;
@ -1481,6 +1481,28 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
* publishes read_head and canon_head * publishes read_head and canon_head
*/ */
static void
n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{
struct n_tty_data *ldata = tty->disc_data;
size_t n, head;
head = ldata->read_head & (N_TTY_BUF_SIZE - 1);
n = N_TTY_BUF_SIZE - max(read_cnt(ldata), head);
n = min_t(size_t, count, n);
memcpy(read_buf_addr(ldata, head), cp, n);
ldata->read_head += n;
cp += n;
count -= n;
head = ldata->read_head & (N_TTY_BUF_SIZE - 1);
n = N_TTY_BUF_SIZE - max(read_cnt(ldata), head);
n = min_t(size_t, count, n);
memcpy(read_buf_addr(ldata, head), cp, n);
ldata->read_head += n;
}
static void __receive_buf(struct tty_struct *tty, const unsigned char *cp, static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) char *fp, int count)
{ {
@ -1488,23 +1510,9 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
char flags = TTY_NORMAL; char flags = TTY_NORMAL;
char buf[64]; char buf[64];
if (ldata->real_raw) { if (ldata->real_raw)
size_t n, head; n_tty_receive_buf_real_raw(tty, cp, fp, count);
else {
head = ldata->read_head & (N_TTY_BUF_SIZE - 1);
n = N_TTY_BUF_SIZE - max(read_cnt(ldata), head);
n = min_t(size_t, count, n);
memcpy(read_buf_addr(ldata, head), cp, n);
ldata->read_head += n;
cp += n;
count -= n;
head = ldata->read_head & (N_TTY_BUF_SIZE - 1);
n = N_TTY_BUF_SIZE - max(read_cnt(ldata), head);
n = min_t(size_t, count, n);
memcpy(read_buf_addr(ldata, head), cp, n);
ldata->read_head += n;
} else {
while (count--) { while (count--) {
if (fp) if (fp)
flags = *fp++; flags = *fp++;
@ -1540,8 +1548,6 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
if (waitqueue_active(&tty->read_wait)) if (waitqueue_active(&tty->read_wait))
wake_up_interruptible(&tty->read_wait); wake_up_interruptible(&tty->read_wait);
} }
n_tty_check_throttle(tty);
} }
static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp, static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
@ -1549,6 +1555,7 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
{ {
down_read(&tty->termios_rwsem); down_read(&tty->termios_rwsem);
__receive_buf(tty, cp, fp, count); __receive_buf(tty, cp, fp, count);
n_tty_check_throttle(tty);
up_read(&tty->termios_rwsem); up_read(&tty->termios_rwsem);
} }
@ -1564,8 +1571,10 @@ static int n_tty_receive_buf2(struct tty_struct *tty, const unsigned char *cp,
if (!room) if (!room)
ldata->no_room = 1; ldata->no_room = 1;
count = min(count, room); count = min(count, room);
if (count) if (count) {
__receive_buf(tty, cp, fp, count); __receive_buf(tty, cp, fp, count);
n_tty_check_throttle(tty);
}
up_read(&tty->termios_rwsem); up_read(&tty->termios_rwsem);