From: Martin Schwidefsky Make use of the new flip buffer interface for the s390 specific console device drivers (3215, sclp, vt220 sclp and ctctty). Signed-off-by: Martin Schwidefsky Cc: Alan Cox Signed-off-by: Andrew Morton --- drivers/s390/char/con3215.c | 25 ++++++++----------------- drivers/s390/char/sclp_tty.c | 21 ++++++++------------- drivers/s390/char/sclp_vt220.c | 12 ++---------- drivers/s390/net/ctctty.c | 28 +++++++--------------------- 4 files changed, 25 insertions(+), 61 deletions(-) diff -puN drivers/s390/char/con3215.c~tty-layer-buffering-revamp-s390-fixes drivers/s390/char/con3215.c --- 25/drivers/s390/char/con3215.c~tty-layer-buffering-revamp-s390-fixes Wed Sep 7 15:49:08 2005 +++ 25-akpm/drivers/s390/char/con3215.c Wed Sep 7 15:49:08 2005 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -432,8 +433,6 @@ raw3215_irq(struct ccw_device *cdev, uns if (count > slen) count = slen; } else - if (count >= TTY_FLIPBUF_SIZE - tty->flip.count) - count = TTY_FLIPBUF_SIZE - tty->flip.count - 1; EBCASC(raw->inbuf, count); cchar = ctrlchar_handle(raw->inbuf, count, tty); switch (cchar & CTRLCHAR_MASK) { @@ -441,28 +440,20 @@ raw3215_irq(struct ccw_device *cdev, uns break; case CTRLCHAR_CTRL: - tty->flip.count++; - *tty->flip.flag_buf_ptr++ = TTY_NORMAL; - *tty->flip.char_buf_ptr++ = cchar; + tty_insert_flip_char(tty, cchar, TTY_NORMAL); tty_flip_buffer_push(raw->tty); break; case CTRLCHAR_NONE: - memcpy(tty->flip.char_buf_ptr, - raw->inbuf, count); if (count < 2 || - (strncmp(raw->inbuf+count-2, "^n", 2) && - strncmp(raw->inbuf+count-2, "\252n", 2)) ) { - /* don't add the auto \n */ - tty->flip.char_buf_ptr[count] = '\n'; - memset(tty->flip.flag_buf_ptr, - TTY_NORMAL, count + 1); + (strncmp(raw->inbuf+count-2, "\252n", 2) && + strncmp(raw->inbuf+count-2, "^n", 2)) ) { + /* add the auto \n */ + raw->inbuf[count] = '\n'; count++; } else - count-=2; - tty->flip.char_buf_ptr += count; - tty->flip.flag_buf_ptr += count; - tty->flip.count += count; + count -= 2; + tty_insert_flip_string(tty, raw->inbuf, count); tty_flip_buffer_push(raw->tty); break; } diff -puN drivers/s390/char/sclp_tty.c~tty-layer-buffering-revamp-s390-fixes drivers/s390/char/sclp_tty.c --- 25/drivers/s390/char/sclp_tty.c~tty-layer-buffering-revamp-s390-fixes Wed Sep 7 15:49:08 2005 +++ 25-akpm/drivers/s390/char/sclp_tty.c Wed Sep 7 15:49:08 2005 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -496,25 +497,19 @@ sclp_tty_input(unsigned char* buf, unsig case CTRLCHAR_SYSRQ: break; case CTRLCHAR_CTRL: - sclp_tty->flip.count++; - *sclp_tty->flip.flag_buf_ptr++ = TTY_NORMAL; - *sclp_tty->flip.char_buf_ptr++ = cchar; + tty_insert_flip_char(sclp_tty, cchar, TTY_NORMAL); tty_flip_buffer_push(sclp_tty); break; case CTRLCHAR_NONE: /* send (normal) input to line discipline */ - memcpy(sclp_tty->flip.char_buf_ptr, buf, count); if (count < 2 || - (strncmp ((const char *) buf + count - 2, "^n", 2) && - strncmp ((const char *) buf + count - 2, "\0252n", 2))) { - sclp_tty->flip.char_buf_ptr[count] = '\n'; - count++; + (strncmp((const char *) buf + count - 2, "^n", 2) && + strncmp((const char *) buf + count - 2, "\252n", 2))) { + /* add the auto \n */ + tty_insert_flip_string(sclp_tty, buf, count); + tty_insert_flip_char(sclp_tty, '\n', TTY_NORMAL); } else - count -= 2; - memset(sclp_tty->flip.flag_buf_ptr, TTY_NORMAL, count); - sclp_tty->flip.char_buf_ptr += count; - sclp_tty->flip.flag_buf_ptr += count; - sclp_tty->flip.count += count; + tty_insert_flip_string(sclp_tty, buf, count - 2); tty_flip_buffer_push(sclp_tty); break; } diff -puN drivers/s390/char/sclp_vt220.c~tty-layer-buffering-revamp-s390-fixes drivers/s390/char/sclp_vt220.c --- 25/drivers/s390/char/sclp_vt220.c~tty-layer-buffering-revamp-s390-fixes Wed Sep 7 15:49:08 2005 +++ 25-akpm/drivers/s390/char/sclp_vt220.c Wed Sep 7 15:49:08 2005 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -482,16 +483,7 @@ sclp_vt220_receiver_fn(struct evbuf_head /* Send input to line discipline */ buffer++; count--; - /* Prevent buffer overrun by discarding input. Note that - * because buffer_push works asynchronously, we cannot wait - * for the buffer to be emptied. */ - if (count + sclp_vt220_tty->flip.count > TTY_FLIPBUF_SIZE) - count = TTY_FLIPBUF_SIZE - sclp_vt220_tty->flip.count; - memcpy(sclp_vt220_tty->flip.char_buf_ptr, buffer, count); - memset(sclp_vt220_tty->flip.flag_buf_ptr, TTY_NORMAL, count); - sclp_vt220_tty->flip.char_buf_ptr += count; - sclp_vt220_tty->flip.flag_buf_ptr += count; - sclp_vt220_tty->flip.count += count; + tty_insert_flip_string(sclp_vt220_tty, buffer, count); tty_flip_buffer_push(sclp_vt220_tty); break; } diff -puN drivers/s390/net/ctctty.c~tty-layer-buffering-revamp-s390-fixes drivers/s390/net/ctctty.c --- 25/drivers/s390/net/ctctty.c~tty-layer-buffering-revamp-s390-fixes Wed Sep 7 15:49:08 2005 +++ 25-akpm/drivers/s390/net/ctctty.c Wed Sep 7 15:49:08 2005 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -101,25 +102,17 @@ static spinlock_t ctc_tty_lock; static int ctc_tty_try_read(ctc_tty_info * info, struct sk_buff *skb) { - int c; int len; struct tty_struct *tty; DBF_TEXT(trace, 5, __FUNCTION__); if ((tty = info->tty)) { if (info->mcr & UART_MCR_RTS) { - c = TTY_FLIPBUF_SIZE - tty->flip.count; len = skb->len; - if (c >= len) { - memcpy(tty->flip.char_buf_ptr, skb->data, len); - memset(tty->flip.flag_buf_ptr, 0, len); - tty->flip.count += len; - tty->flip.char_buf_ptr += len; - tty->flip.flag_buf_ptr += len; - tty_flip_buffer_push(tty); - kfree_skb(skb); - return 1; - } + tty_insert_flip_string(tty, skb->data, len); + tty_flip_buffer_push(tty); + kfree_skb(skb); + return 1; } } return 0; @@ -138,19 +131,12 @@ ctc_tty_readmodem(ctc_tty_info *info) DBF_TEXT(trace, 5, __FUNCTION__); if ((tty = info->tty)) { if (info->mcr & UART_MCR_RTS) { - int c = TTY_FLIPBUF_SIZE - tty->flip.count; struct sk_buff *skb; - if ((c > 0) && (skb = skb_dequeue(&info->rx_queue))) { + if ((skb = skb_dequeue(&info->rx_queue))) { int len = skb->len; - if (len > c) - len = c; - memcpy(tty->flip.char_buf_ptr, skb->data, len); + tty_insert_flip_string(tty, skb->data, len); skb_pull(skb, len); - memset(tty->flip.flag_buf_ptr, 0, len); - tty->flip.count += len; - tty->flip.char_buf_ptr += len; - tty->flip.flag_buf_ptr += len; tty_flip_buffer_push(tty); if (skb->len > 0) skb_queue_head(&info->rx_queue, skb); _