diff options
author | Alan Cox <alan@redhat.com> | 2008-07-16 16:55:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:12:36 -0400 |
commit | 52d417388d154f68f8ab753de03b1fba1814de81 (patch) | |
tree | 7d89c6954fb64fc64f0b64f37c951f79cc56a32b /drivers/char/epca.h | |
parent | 7a4d29f426f17479395980ded8fa5e3bdd6d94e4 (diff) |
epca: use tty_port
Switch the EPCA driver to include and begin using a tty_port structure
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/epca.h')
-rw-r--r-- | drivers/char/epca.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/epca.h b/drivers/char/epca.h index 3c77c02b5d65..d414bf2dbf7c 100644 --- a/drivers/char/epca.h +++ b/drivers/char/epca.h | |||
@@ -84,6 +84,7 @@ static char *board_desc[] = | |||
84 | struct channel | 84 | struct channel |
85 | { | 85 | { |
86 | long magic; | 86 | long magic; |
87 | struct tty_port port; | ||
87 | unsigned char boardnum; | 88 | unsigned char boardnum; |
88 | unsigned char channelnum; | 89 | unsigned char channelnum; |
89 | unsigned char omodem; /* FEP output modem status */ | 90 | unsigned char omodem; /* FEP output modem status */ |
@@ -117,10 +118,7 @@ struct channel | |||
117 | unsigned short rxbufhead; | 118 | unsigned short rxbufhead; |
118 | unsigned short rxbufsize; | 119 | unsigned short rxbufsize; |
119 | int close_delay; | 120 | int close_delay; |
120 | int count; | ||
121 | int blocked_open; | ||
122 | unsigned long event; | 121 | unsigned long event; |
123 | int asyncflags; | ||
124 | uint dev; | 122 | uint dev; |
125 | unsigned long statusflags; | 123 | unsigned long statusflags; |
126 | unsigned long c_iflag; | 124 | unsigned long c_iflag; |
@@ -132,9 +130,6 @@ struct channel | |||
132 | struct board_info *board; | 130 | struct board_info *board; |
133 | struct board_chan __iomem *brdchan; | 131 | struct board_chan __iomem *brdchan; |
134 | struct digi_struct digiext; | 132 | struct digi_struct digiext; |
135 | struct tty_struct *tty; | ||
136 | wait_queue_head_t open_wait; | ||
137 | wait_queue_head_t close_wait; | ||
138 | struct work_struct tqueue; | 133 | struct work_struct tqueue; |
139 | struct global_data __iomem *mailbox; | 134 | struct global_data __iomem *mailbox; |
140 | }; | 135 | }; |