lkml.org 
[lkml]   [2005]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.15-rc1-mm1
Hi

Andrew Morton wrote:

>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.15-rc1/2.6.15-rc1-mm1
>
>
Got a compiler-error:

CC drivers/serial/jsm/jsm_tty.o
drivers/serial/jsm/jsm_tty.c: In function `jsm_input':
drivers/serial/jsm/jsm_tty.c:592: error: structure has no member named `flip'
drivers/serial/jsm/jsm_tty.c:619: error: structure has no member named `flip'
drivers/serial/jsm/jsm_tty.c:620: error: structure has no member named `flip'
...

(in file drivers/serial/jsm/jsm_tty.c, line 592)
flip_len = TTY_FLIPBUF_SIZE - tp->flip.count;

I could not find the patch but I tracked it to the change:


--- linux-2.6.15-rc1/include/linux/tty.h 2005-10-27 17:52:48.000000000 -0700
+++ devel/include/linux/tty.h 2005-11-17 00:55:12.000000000 -0800
@@ -74,8 +74,7 @@ struct screen_info {
u16 vesapm_off; /* 0x30 */
u16 pages; /* 0x32 */
u16 vesa_attributes; /* 0x34 */
- u32 capabilities; /* 0x36 */
- /* 0x3a -- 0x3f reserved for future expansion */
+ /* 0x36 -- 0x3f reserved for future expansion */
};

extern struct screen_info screen_info;
@@ -121,16 +120,22 @@ extern struct screen_info screen_info;
*/
#define TTY_FLIPBUF_SIZE 512

-struct tty_flip_buffer {
+struct tty_buffer {
+ struct tty_buffer *next;
+ char *char_buf_ptr;
+ unsigned char *flag_buf_ptr;
+ int used;
+ int size;
+ /* Data points here */
+ unsigned long data[0];
+};
+
+struct tty_bufhead {
struct work_struct work;
struct semaphore pty_sem;
- char *char_buf_ptr;
- unsigned char *flag_buf_ptr;
- int count;
- int buf_num;
- unsigned char char_buf[2*TTY_FLIPBUF_SIZE];
- char flag_buf[2*TTY_FLIPBUF_SIZE];
- unsigned char slop[4]; /* N.B. bug overwrites buffer by 1 */
+ struct tty_buffer *head; /* Queue head */
+ struct tty_buffer *tail; /* Active buffer */
+ struct tty_buffer *free; /* Free queue head */
};
/*
* The pty uses char_buf and flag_buf as a contiguous buffer
@@ -256,10 +261,11 @@ struct tty_struct {
unsigned char stopped:1, hw_stopped:1, flow_stopped:1, packet:1;
unsigned char low_latency:1, warned:1;
unsigned char ctrl_status;
+ unsigned int receive_room; /* Bytes free for queue */

struct tty_struct *link;
struct fasync_struct *fasync;
- struct tty_flip_buffer flip;
+ struct tty_bufhead buf;
int max_flip_cnt;
int alt_speed; /* For magic substitution of 38400 bps */
wait_queue_head_t write_wait;
tty_flip_buffer have been split up to tty_buffer and tty_bufhead, so I do not know what the correct replacement for flip.count is.

/Richard Knutsson


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-11-18 02:43    [W:0.081 / U:3.108 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site