vserver 1.9.5.x5

[linux-2.6.git] / arch / um / drivers / chan_kern.c

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 7a8d750..f30ae1b 100644 (file)
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -189,7 +189,7 @@ int open_chan(struct list_head *chans)
        return(err);
 }
 
-void chan_enable_winch(struct list_head *chans, void *line)
+void chan_enable_winch(struct list_head *chans, struct tty_struct *tty)
 {
        struct list_head *ele;
        struct chan *chan;
@@ -197,13 +197,13 @@ void chan_enable_winch(struct list_head *chans, void *line)
        list_for_each(ele, chans){
                chan = list_entry(ele, struct chan, list);
                if(chan->primary && chan->output && chan->ops->winch){
-                       register_winch(chan->fd, line);
+                       register_winch(chan->fd, tty);
                        return;
                }
        }
 }
 
-void enable_chan(struct list_head *chans, void *data)
+void enable_chan(struct list_head *chans, struct tty_struct *tty)
 {
        struct list_head *ele;
        struct chan *chan;
@@ -212,7 +212,7 @@ void enable_chan(struct list_head *chans, void *data)
                chan = list_entry(ele, struct chan, list);
                if(!chan->opened) continue;
 
-               line_setup_irq(chan->fd, chan->input, chan->output, data);
+               line_setup_irq(chan->fd, chan->input, chan->output, tty);
        }
 }
 
@@ -240,18 +240,20 @@ int write_chan(struct list_head *chans, const char *buf, int len,
               int write_irq)
 {
        struct list_head *ele;
-       struct chan *chan;
+       struct chan *chan = NULL;
        int n, ret = 0;
 
-       list_for_each(ele, chans){
+       list_for_each(ele, chans) {
                chan = list_entry(ele, struct chan, list);
-               if(!chan->output || (chan->ops->write == NULL)) continue;
+               if (!chan->output || (chan->ops->write == NULL))
+                       continue;
                n = chan->ops->write(chan->fd, buf, len, chan->data);
-               if(chan->primary){
+               if (chan->primary) {
                        ret = n;
-                       if((ret == -EAGAIN) || ((ret >= 0) && (ret < len))){
+                       if ((ret == -EAGAIN) || ((ret >= 0) && (ret < len))){
                                reactivate_fd(chan->fd, write_irq);
-                               if(ret == -EAGAIN) ret = 0;
+                               if (ret == -EAGAIN)
+                                       ret = 0;
                        }
                }
        }
@@ -274,6 +276,20 @@ int console_write_chan(struct list_head *chans, const char *buf, int len)
        return(ret);
 }
 
+int console_open_chan(struct line *line, struct console *co, struct chan_opts *opts)
+{
+       if (!list_empty(&line->chan_list))
+               return 0;
+
+       if (0 != parse_chan_pair(line->init_str, &line->chan_list,
+                                line->init_pri, co->index, opts))
+               return -1;
+       if (0 != open_chan(&line->chan_list))
+               return -1;
+       printk("Console initialized on /dev/%s%d\n",co->name,co->index);
+       return 0;
+}
+
 int chan_window_size(struct list_head *chans, unsigned short *rows_out,
                      unsigned short *cols_out)
 {
@@ -383,11 +399,7 @@ struct chan_type {
 };
 
 struct chan_type chan_table[] = {
-#ifdef CONFIG_FD_CHAN
        { "fd", &fd_ops },
-#else
-       { "fd", &not_configged_ops },
-#endif
 
 #ifdef CONFIG_NULL_CHAN
        { "null", &null_ops },
@@ -516,7 +528,7 @@ int chan_out_fd(struct list_head *chans)
 }
 
 void chan_interrupt(struct list_head *chans, struct work_struct *task,
-                   struct tty_struct *tty, int irq, void *dev)
+                   struct tty_struct *tty, int irq)
 {
        struct list_head *ele, *next;
        struct chan *chan;
@@ -542,7 +554,7 @@ void chan_interrupt(struct list_head *chans, struct work_struct *task,
                        if(chan->primary){
                                if(tty != NULL)
                                        tty_hangup(tty);
-                               line_disable(dev, irq);
+                               line_disable(tty, irq);
                                close_chan(chans);
                                free_chan(chans);
                                return;