33b37a33c2
Remove 'active' field from tty buffer structure. This was added in 2.6.16 as part of a patch to make the new tty buffering SMP safe. This field is unnecessary with the more intelligently written flush_to_ldisc that adds receive_room handling. Removing this field reverts to simpler logic where the tail buffer is always the 'active' buffer, which should not be freed by flush_to_ldisc. (active == buffer being filled with new data) The result is simpler, smaller, and faster tty buffer code. Signed-off-by: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
23 lines
966 B
C
23 lines
966 B
C
#ifndef _LINUX_TTY_FLIP_H
|
|
#define _LINUX_TTY_FLIP_H
|
|
|
|
extern int tty_buffer_request_room(struct tty_struct *tty, size_t size);
|
|
extern int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size);
|
|
extern int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size);
|
|
extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size);
|
|
extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size);
|
|
void tty_schedule_flip(struct tty_struct *tty);
|
|
|
|
static inline int tty_insert_flip_char(struct tty_struct *tty,
|
|
unsigned char ch, char flag)
|
|
{
|
|
struct tty_buffer *tb = tty->buf.tail;
|
|
if (tb && tb->used < tb->size) {
|
|
tb->flag_buf_ptr[tb->used] = flag;
|
|
tb->char_buf_ptr[tb->used++] = ch;
|
|
return 1;
|
|
}
|
|
return tty_insert_flip_string_flags(tty, &ch, &flag, 1);
|
|
}
|
|
|
|
#endif /* _LINUX_TTY_FLIP_H */
|