summaryrefslogtreecommitdiffstats
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-06-15 10:21:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 17:10:17 -0700
commit554117bdc8c245249f364ddcdbd65ae5701a5ead (patch)
treee693ee729ced818cef938548fa3b3b503a61bf1b /drivers/tty/n_tty.c
parentd2f8d7abd1e7ac04a0b42df36b53fef00d5d73aa (diff)
downloadblackbird-op-linux-554117bdc8c245249f364ddcdbd65ae5701a5ead.tar.gz
blackbird-op-linux-554117bdc8c245249f364ddcdbd65ae5701a5ead.zip
n_tty: Factor raw mode receive_buf() into separate fn
Convert to modal receive_buf() processing; factor raw mode per-char i/o into n_tty_receive_buf_raw(). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/n_tty.c')
-rw-r--r--drivers/tty/n_tty.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 6aa90332dd3e..900ebbe0a7ab 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1259,11 +1259,6 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
struct n_tty_data *ldata = tty->disc_data;
int parmrk;
- if (ldata->raw) {
- put_tty_queue(c, ldata);
- return;
- }
-
if (I_ISTRIP(tty))
c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty))
@@ -1530,6 +1525,23 @@ n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
ldata->read_head += n;
}
+static void
+n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
+ char *fp, int count)
+{
+ struct n_tty_data *ldata = tty->disc_data;
+ char flag = TTY_NORMAL;
+
+ while (count--) {
+ if (fp)
+ flag = *fp++;
+ if (likely(flag == TTY_NORMAL))
+ put_tty_queue(*cp++, ldata);
+ else
+ n_tty_receive_char_flagged(tty, *cp++, flag);
+ }
+}
+
static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{
@@ -1537,6 +1549,8 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
if (ldata->real_raw)
n_tty_receive_buf_real_raw(tty, cp, fp, count);
+ else if (ldata->raw)
+ n_tty_receive_buf_raw(tty, cp, fp, count);
else {
char flag = TTY_NORMAL;
OpenPOWER on IntegriCloud