Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[pandora-kernel.git] / arch / um / include / line.h

diff --git a/arch/um/include/line.h b/arch/um/include/line.h
index 5323d22..642c9a0 100644 (file)
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
@@ -17,7 +17,6 @@
 struct line_driver {
        char *name;
        char *device_name;
-       char *devfs_name;
        short major;
        short minor_start;
        short type;
@@ -32,11 +31,13 @@ struct line_driver {
 };
 
 struct line {
+       struct tty_struct *tty;
        char *init_str;
        int init_pri;
        struct list_head chan_list;
        int valid;
        int count;
+       int throttled;
        /*This lock is actually, mostly, local to*/
        spinlock_t lock;
 
@@ -51,34 +52,29 @@ struct line {
 
        int sigio;
        struct work_struct task;
-       struct line_driver *driver;
+       const struct line_driver *driver;
        int have_irq;
 };
 
 #define LINE_INIT(str, d) \
-       { init_str :    str, \
-         init_pri :    INIT_STATIC, \
-         chan_list :   { }, \
-         valid :       1, \
-         buffer :      NULL, \
-         head :        NULL, \
-         tail :        NULL, \
-         sigio :       0, \
-         driver :      d, \
-          have_irq :   0 }
+       { .init_str =   str, \
+         .init_pri =   INIT_STATIC, \
+         .valid =      1, \
+         .lock =       SPIN_LOCK_UNLOCKED, \
+         .driver =     d }
 
 struct lines {
        int num;
 };
 
-#define LINES_INIT(n) {  num :         n }
+#define LINES_INIT(n) {  .num =        n }
 
 extern void line_close(struct tty_struct *tty, struct file * filp);
-extern int line_open(struct line *lines, struct tty_struct *tty, 
-                    struct chan_opts *opts);
-extern int line_setup(struct line *lines, unsigned int sizeof_lines, char *init,
-                     int all_allowed);
-extern int line_write(struct tty_struct *tty, const unsigned char *buf, int len);
+extern int line_open(struct line *lines, struct tty_struct *tty);
+extern int line_setup(struct line *lines, unsigned int sizeof_lines,
+                     char *init);
+extern int line_write(struct tty_struct *tty, const unsigned char *buf,
+                     int len);
 extern void line_put_char(struct tty_struct *tty, unsigned char ch);
 extern void line_set_termios(struct tty_struct *tty, struct termios * old);
 extern int line_chars_in_buffer(struct tty_struct *tty);
@@ -87,23 +83,27 @@ extern void line_flush_chars(struct tty_struct *tty);
 extern int line_write_room(struct tty_struct *tty);
 extern int line_ioctl(struct tty_struct *tty, struct file * file,
                      unsigned int cmd, unsigned long arg);
+extern void line_throttle(struct tty_struct *tty);
+extern void line_unthrottle(struct tty_struct *tty);
 
 extern char *add_xterm_umid(char *base);
-extern int line_setup_irq(int fd, int input, int output, struct tty_struct *tty);
+extern int line_setup_irq(int fd, int input, int output, struct line *line,
+                         void *data);
 extern void line_close_chan(struct line *line);
-extern void line_disable(struct tty_struct *tty, int current_irq);
-extern struct tty_driver * line_register_devfs(struct lines *set, 
-                               struct line_driver *line_driver, 
+extern struct tty_driver * line_register_devfs(struct lines *set,
+                               struct line_driver *line_driver,
                                struct tty_operations *driver,
                                struct line *lines,
                                int nlines);
-extern void lines_init(struct line *lines, int nlines);
+extern void lines_init(struct line *lines, int nlines, struct chan_opts *opts);
 extern void close_lines(struct line *lines, int nlines);
 
-extern int line_config(struct line *lines, unsigned int sizeof_lines, char *str);
+extern int line_config(struct line *lines, unsigned int sizeof_lines,
+                      char *str, const struct chan_opts *opts);
 extern int line_id(char **str, int *start_out, int *end_out);
 extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n);
-extern int line_get_config(char *dev, struct line *lines, unsigned int sizeof_lines, char *str,
+extern int line_get_config(char *dev, struct line *lines,
+                          unsigned int sizeof_lines, char *str,
                           int size, char **error_out);
 
 #endif