diff options
author | Alan Cox <alan@linux.intel.com> | 2010-02-18 11:43:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:55:11 -0500 |
commit | 2832fc11f1360668482beec06dbcd631ae5f0cf1 (patch) | |
tree | c56360c6fe1a2cb10241ee9e004937303a52e19b /drivers/char/tty_buffer.c | |
parent | e4a3d94658b5760fc947d7f7185c57db47ca362a (diff) |
USB: tty: Add a function to insert a string of characters with the same flag
The USB drivers often want to insert a series of bytes all with the same
flag set - provide a helper for this case.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/tty_buffer.c')
-rw-r--r-- | drivers/char/tty_buffer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c index 66fa4e10d76b..4c133459ab7e 100644 --- a/drivers/char/tty_buffer.c +++ b/drivers/char/tty_buffer.c | |||
@@ -231,9 +231,10 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size) | |||
231 | EXPORT_SYMBOL_GPL(tty_buffer_request_room); | 231 | EXPORT_SYMBOL_GPL(tty_buffer_request_room); |
232 | 232 | ||
233 | /** | 233 | /** |
234 | * tty_insert_flip_string - Add characters to the tty buffer | 234 | * tty_insert_flip_string_fixed_flag - Add characters to the tty buffer |
235 | * @tty: tty structure | 235 | * @tty: tty structure |
236 | * @chars: characters | 236 | * @chars: characters |
237 | * @flag: flag value for each character | ||
237 | * @size: size | 238 | * @size: size |
238 | * | 239 | * |
239 | * Queue a series of bytes to the tty buffering. All the characters | 240 | * Queue a series of bytes to the tty buffering. All the characters |
@@ -242,8 +243,8 @@ EXPORT_SYMBOL_GPL(tty_buffer_request_room); | |||
242 | * Locking: Called functions may take tty->buf.lock | 243 | * Locking: Called functions may take tty->buf.lock |
243 | */ | 244 | */ |
244 | 245 | ||
245 | int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, | 246 | int tty_insert_flip_string_fixed_flag(struct tty_struct *tty, |
246 | size_t size) | 247 | const unsigned char *chars, char flag, size_t size) |
247 | { | 248 | { |
248 | int copied = 0; | 249 | int copied = 0; |
249 | do { | 250 | do { |
@@ -253,7 +254,7 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, | |||
253 | if (unlikely(space == 0)) | 254 | if (unlikely(space == 0)) |
254 | break; | 255 | break; |
255 | memcpy(tb->char_buf_ptr + tb->used, chars, space); | 256 | memcpy(tb->char_buf_ptr + tb->used, chars, space); |
256 | memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space); | 257 | memset(tb->flag_buf_ptr + tb->used, flag, space); |
257 | tb->used += space; | 258 | tb->used += space; |
258 | copied += space; | 259 | copied += space; |
259 | chars += space; | 260 | chars += space; |
@@ -262,7 +263,7 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, | |||
262 | } while (unlikely(size > copied)); | 263 | } while (unlikely(size > copied)); |
263 | return copied; | 264 | return copied; |
264 | } | 265 | } |
265 | EXPORT_SYMBOL(tty_insert_flip_string); | 266 | EXPORT_SYMBOL(tty_insert_flip_string_fixed_flag); |
266 | 267 | ||
267 | /** | 268 | /** |
268 | * tty_insert_flip_string_flags - Add characters to the tty buffer | 269 | * tty_insert_flip_string_flags - Add characters to the tty buffer |