diff options
Diffstat (limited to 'include/linux/tty_driver.h')
-rw-r--r-- | include/linux/tty_driver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 5c8473bb6882..659487e3ebeb 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
@@ -53,7 +53,7 @@ | |||
53 | * device-specific ioctl's. If the ioctl number passed in cmd | 53 | * device-specific ioctl's. If the ioctl number passed in cmd |
54 | * is not recognized by the driver, it should return ENOIOCTLCMD. | 54 | * is not recognized by the driver, it should return ENOIOCTLCMD. |
55 | * | 55 | * |
56 | * void (*set_termios)(struct tty_struct *tty, struct termios * old); | 56 | * void (*set_termios)(struct tty_struct *tty, struct ktermios * old); |
57 | * | 57 | * |
58 | * This routine allows the tty driver to be notified when | 58 | * This routine allows the tty driver to be notified when |
59 | * device's termios settings have changed. Note that a | 59 | * device's termios settings have changed. Note that a |
@@ -132,7 +132,7 @@ struct tty_operations { | |||
132 | int (*chars_in_buffer)(struct tty_struct *tty); | 132 | int (*chars_in_buffer)(struct tty_struct *tty); |
133 | int (*ioctl)(struct tty_struct *tty, struct file * file, | 133 | int (*ioctl)(struct tty_struct *tty, struct file * file, |
134 | unsigned int cmd, unsigned long arg); | 134 | unsigned int cmd, unsigned long arg); |
135 | void (*set_termios)(struct tty_struct *tty, struct termios * old); | 135 | void (*set_termios)(struct tty_struct *tty, struct ktermios * old); |
136 | void (*throttle)(struct tty_struct * tty); | 136 | void (*throttle)(struct tty_struct * tty); |
137 | void (*unthrottle)(struct tty_struct * tty); | 137 | void (*unthrottle)(struct tty_struct * tty); |
138 | void (*stop)(struct tty_struct *tty); | 138 | void (*stop)(struct tty_struct *tty); |
@@ -165,7 +165,7 @@ struct tty_driver { | |||
165 | int num; /* number of devices allocated */ | 165 | int num; /* number of devices allocated */ |
166 | short type; /* type of tty driver */ | 166 | short type; /* type of tty driver */ |
167 | short subtype; /* subtype of tty driver */ | 167 | short subtype; /* subtype of tty driver */ |
168 | struct termios init_termios; /* Initial termios */ | 168 | struct ktermios init_termios; /* Initial termios */ |
169 | int flags; /* tty driver flags */ | 169 | int flags; /* tty driver flags */ |
170 | int refcount; /* for loadable tty drivers */ | 170 | int refcount; /* for loadable tty drivers */ |
171 | struct proc_dir_entry *proc_entry; /* /proc fs entry */ | 171 | struct proc_dir_entry *proc_entry; /* /proc fs entry */ |
@@ -175,8 +175,8 @@ struct tty_driver { | |||
175 | * Pointer to the tty data structures | 175 | * Pointer to the tty data structures |
176 | */ | 176 | */ |
177 | struct tty_struct **ttys; | 177 | struct tty_struct **ttys; |
178 | struct termios **termios; | 178 | struct ktermios **termios; |
179 | struct termios **termios_locked; | 179 | struct ktermios **termios_locked; |
180 | void *driver_state; /* only used for the PTY driver */ | 180 | void *driver_state; /* only used for the PTY driver */ |
181 | 181 | ||
182 | /* | 182 | /* |
@@ -193,7 +193,7 @@ struct tty_driver { | |||
193 | int (*chars_in_buffer)(struct tty_struct *tty); | 193 | int (*chars_in_buffer)(struct tty_struct *tty); |
194 | int (*ioctl)(struct tty_struct *tty, struct file * file, | 194 | int (*ioctl)(struct tty_struct *tty, struct file * file, |
195 | unsigned int cmd, unsigned long arg); | 195 | unsigned int cmd, unsigned long arg); |
196 | void (*set_termios)(struct tty_struct *tty, struct termios * old); | 196 | void (*set_termios)(struct tty_struct *tty, struct ktermios * old); |
197 | void (*throttle)(struct tty_struct * tty); | 197 | void (*throttle)(struct tty_struct * tty); |
198 | void (*unthrottle)(struct tty_struct * tty); | 198 | void (*unthrottle)(struct tty_struct * tty); |
199 | void (*stop)(struct tty_struct *tty); | 199 | void (*stop)(struct tty_struct *tty); |