TTY: switch tty_insert_flip_char
Now, we start converting tty buffer functions to actually use tty_port. This will allow us to get rid of the need of tty in many call sites. Only tty_port will needed and hence no more tty_port_tty_get in those paths. tty_insert_flip_char is the next one to proceed. This one is used all over the code, so the patch is huge. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -913,7 +913,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
|
||||
while ((count_pull < skb->len) && (len > 0)) {
|
||||
/* push every character but the last to the tty buffer directly */
|
||||
if (count_put)
|
||||
tty_insert_flip_char(tty, last, TTY_NORMAL);
|
||||
tty_insert_flip_char(port, last, TTY_NORMAL);
|
||||
len--;
|
||||
if (dev->drv[di]->DLEflag & DLEmask) {
|
||||
last = DLE;
|
||||
@@ -953,16 +953,16 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
|
||||
* Now we can dequeue it.
|
||||
*/
|
||||
if (cisco_hack)
|
||||
tty_insert_flip_char(tty, last, 0xFF);
|
||||
tty_insert_flip_char(port, last, 0xFF);
|
||||
else
|
||||
tty_insert_flip_char(tty, last, TTY_NORMAL);
|
||||
tty_insert_flip_char(port, last, TTY_NORMAL);
|
||||
#ifdef CONFIG_ISDN_AUDIO
|
||||
ISDN_AUDIO_SKB_LOCK(skb) = 0;
|
||||
#endif
|
||||
skb = skb_dequeue(&dev->drv[di]->rpqueue[channel]);
|
||||
dev_kfree_skb(skb);
|
||||
} else {
|
||||
tty_insert_flip_char(tty, last, TTY_NORMAL);
|
||||
tty_insert_flip_char(port, last, TTY_NORMAL);
|
||||
/* Not yet emptied this buff, so it
|
||||
* must stay in the queue, for further calls
|
||||
* but we pull off the data we got until now.
|
||||
|
@@ -92,11 +92,11 @@ isdn_tty_try_read(modem_info *info, struct sk_buff *skb)
|
||||
unsigned char *dp = skb->data;
|
||||
while (--l) {
|
||||
if (*dp == DLE)
|
||||
tty_insert_flip_char(tty, DLE, 0);
|
||||
tty_insert_flip_char(tty, *dp++, 0);
|
||||
tty_insert_flip_char(port, DLE, 0);
|
||||
tty_insert_flip_char(port, *dp++, 0);
|
||||
}
|
||||
if (*dp == DLE)
|
||||
tty_insert_flip_char(tty, DLE, 0);
|
||||
tty_insert_flip_char(port, DLE, 0);
|
||||
last = *dp;
|
||||
} else {
|
||||
#endif
|
||||
@@ -107,9 +107,9 @@ isdn_tty_try_read(modem_info *info, struct sk_buff *skb)
|
||||
}
|
||||
#endif
|
||||
if (info->emu.mdmreg[REG_CPPP] & BIT_CPPP)
|
||||
tty_insert_flip_char(tty, last, 0xFF);
|
||||
tty_insert_flip_char(port, last, 0xFF);
|
||||
else
|
||||
tty_insert_flip_char(tty, last, TTY_NORMAL);
|
||||
tty_insert_flip_char(port, last, TTY_NORMAL);
|
||||
tty_flip_buffer_push(tty);
|
||||
kfree_skb(skb);
|
||||
|
||||
@@ -2287,7 +2287,7 @@ isdn_tty_at_cout(char *msg, modem_info *info)
|
||||
if (skb) {
|
||||
*sp++ = c;
|
||||
} else {
|
||||
if (tty_insert_flip_char(tty, c, TTY_NORMAL) == 0)
|
||||
if (tty_insert_flip_char(port, c, TTY_NORMAL) == 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user