* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/posix_types.h"
#include "linux/tty.h"
#include "linux/tty_flip.h"
#include "irq_user.h"
#include "mconsole_kern.h"
#include "init.h"
-#include "2_5compat.h"
-#define MAX_TTYS (8)
+#define MAX_TTYS (16)
+
+/* ----------------------------------------------------------------------------- */
/* Referenced only by tty_driver below - presumably it's locked correctly
* by the tty driver.
static struct tty_driver *console_driver;
-static struct chan_ops init_console_ops = {
- .type = "you shouldn't see this",
- .init = NULL,
- .open = NULL,
- .close = NULL,
- .read = NULL,
- .write = NULL,
- .console_write = generic_write,
- .window_size = NULL,
- .free = NULL,
- .winch = 0,
-};
-
-static struct chan init_console_chan = {
- .list = { },
- .primary = 1,
- .input = 0,
- .output = 1,
- .opened = 1,
- .fd = 1,
- .pri = INIT_STATIC,
- .ops = &init_console_ops,
- .data = NULL
-};
-
void stdio_announce(char *dev_name, int dev)
{
printk(KERN_INFO "Virtual console %d assigned device '%s'\n", dev,
static int con_config(char *str);
static int con_get_config(char *dev, char *str, int size, char **error_out);
-static int con_remove(char *str);
+static int con_remove(int n);
static struct line_driver driver = {
.name = "UML console",
.device_name = "tty",
- .devfs_name = "vc/",
.major = TTY_MAJOR,
.minor_start = 0,
.type = TTY_DRIVER_TYPE_CONSOLE,
.name = "con",
.config = con_config,
.get_config = con_get_config,
+ .id = line_id,
.remove = con_remove,
},
};
* individual elements are protected by individual semaphores.
*/
struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver),
- [ 1 ... MAX_TTYS - 1 ] =
+ [ 1 ... MAX_TTYS - 1 ] =
LINE_INIT(CONFIG_CON_CHAN, &driver) };
static int con_config(char *str)
{
- return(line_config(vts, sizeof(vts)/sizeof(vts[0]), str));
+ return line_config(vts, ARRAY_SIZE(vts), str, &opts);
}
static int con_get_config(char *dev, char *str, int size, char **error_out)
{
- return(line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,
- size, error_out));
-}
-
-static int con_remove(char *str)
-{
- return(line_remove(vts, sizeof(vts)/sizeof(vts[0]), str));
+ return line_get_config(dev, vts, ARRAY_SIZE(vts), str, size, error_out);
}
-static int open_console(struct tty_struct *tty)
+static int con_remove(int n)
{
- return(line_open(vts, tty, &opts));
+ return line_remove(vts, ARRAY_SIZE(vts), n);
}
static int con_open(struct tty_struct *tty, struct file *filp)
{
- return(open_console(tty));
-}
-
-static void con_close(struct tty_struct *tty, struct file *filp)
-{
- line_close(vts, tty);
-}
-
-static int con_write(struct tty_struct *tty, int from_user,
- const unsigned char *buf, int count)
-{
- return(line_write(vts, tty, from_user, buf, count));
-}
-
-static void set_termios(struct tty_struct *tty, struct termios * old)
-{
-}
-
-static int chars_in_buffer(struct tty_struct *tty)
-{
- return(0);
+ return line_open(vts, tty);
}
+/* Set in an initcall, checked in an exitcall */
static int con_init_done = 0;
-static struct tty_operations console_ops = {
+static const struct tty_operations console_ops = {
.open = con_open,
- .close = con_close,
- .write = con_write,
- .chars_in_buffer = chars_in_buffer,
- .set_termios = set_termios,
+ .close = line_close,
+ .write = line_write,
+ .put_char = line_put_char,
.write_room = line_write_room,
+ .chars_in_buffer = line_chars_in_buffer,
+ .flush_buffer = line_flush_buffer,
+ .flush_chars = line_flush_chars,
+ .set_termios = line_set_termios,
+ .ioctl = line_ioctl,
+ .throttle = line_throttle,
+ .unthrottle = line_unthrottle,
};
-int stdio_init(void)
-{
- char *new_title;
-
- printk(KERN_INFO "Initializing stdio console driver\n");
-
- console_driver = line_register_devfs(&console_lines, &driver,
- &console_ops, vts,
- sizeof(vts)/sizeof(vts[0]));
-
- lines_init(vts, sizeof(vts)/sizeof(vts[0]));
-
- new_title = add_xterm_umid(opts.xterm_title);
- if(new_title != NULL) opts.xterm_title = new_title;
-
- open_console(NULL);
- con_init_done = 1;
- return(0);
-}
-
-late_initcall(stdio_init);
-
static void uml_console_write(struct console *console, const char *string,
- unsigned len)
+ unsigned len)
{
struct line *line = &vts[console->index];
+ unsigned long flags;
- if(con_init_done)
- down(&line->sem);
+ spin_lock_irqsave(&line->lock, flags);
console_write_chan(&line->chan_list, string, len);
- if(con_init_done)
- up(&line->sem);
+ spin_unlock_irqrestore(&line->lock, flags);
}
static struct tty_driver *uml_console_device(struct console *c, int *index)
static int uml_console_setup(struct console *co, char *options)
{
- return(0);
+ struct line *line = &vts[co->index];
+
+ return console_open_chan(line, co, &opts);
}
static struct console stdiocons = {
- name: "tty",
- write: uml_console_write,
- device: uml_console_device,
- setup: uml_console_setup,
- flags: CON_PRINTBUFFER,
- index: -1,
+ .name = "tty",
+ .write = uml_console_write,
+ .device = uml_console_device,
+ .setup = uml_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+ .data = &vts,
};
-static int __init stdio_console_init(void)
+int stdio_init(void)
{
- INIT_LIST_HEAD(&vts[0].chan_list);
- list_add(&init_console_chan.list, &vts[0].chan_list);
- register_console(&stdiocons);
- return(0);
-}
+ char *new_title;
-console_initcall(stdio_console_init);
+ console_driver = line_register_devfs(&console_lines, &driver,
+ &console_ops, vts,
+ ARRAY_SIZE(vts));
+ if (console_driver == NULL)
+ return -1;
+ printk(KERN_INFO "Initialized stdio console driver\n");
-static int console_chan_setup(char *str)
-{
- return(line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1));
-}
+ lines_init(vts, ARRAY_SIZE(vts), &opts);
-__setup("con", console_chan_setup);
-__channel_help(console_chan_setup, "con");
+ new_title = add_xterm_umid(opts.xterm_title);
+ if(new_title != NULL)
+ opts.xterm_title = new_title;
+
+ con_init_done = 1;
+ register_console(&stdiocons);
+ return 0;
+}
+late_initcall(stdio_init);
static void console_exit(void)
{
- if(!con_init_done) return;
- close_lines(vts, sizeof(vts)/sizeof(vts[0]));
+ if (!con_init_done)
+ return;
+ close_lines(vts, ARRAY_SIZE(vts));
}
-
__uml_exitcall(console_exit);
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+static int console_chan_setup(char *str)
+{
+ return line_setup(vts, ARRAY_SIZE(vts), str);
+}
+__setup("con", console_chan_setup);
+__channel_help(console_chan_setup, "con");
git://git.onelab.eu / linux-2.6.git / blobdiff