e99525f970
This does a lot of cleanup on the UML console system. This patch should be entirely non-functional. The tidying is as follows: header cleanups - the includes should be closer to minimal and complete all printks now have a severity lots of style fixes fd_close is restructured a little in order to reduce the nesting some functions were calling the os_* wrappers when they can call libc directly port_accept had a unnecessary variable it also tested a pid unecessarily before killing it some functions were made static xterm_free is gone, as it was identical to generic_free Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
83 lines
1.5 KiB
C
83 lines
1.5 KiB
C
/*
|
|
* Copyright (C) 2001 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <termios.h>
|
|
#include "chan_user.h"
|
|
#include "kern_constants.h"
|
|
#include "os.h"
|
|
#include "um_malloc.h"
|
|
#include "user.h"
|
|
|
|
struct tty_chan {
|
|
char *dev;
|
|
int raw;
|
|
struct termios tt;
|
|
};
|
|
|
|
static void *tty_chan_init(char *str, int device, const struct chan_opts *opts)
|
|
{
|
|
struct tty_chan *data;
|
|
|
|
if (*str != ':') {
|
|
printk(UM_KERN_ERR "tty_init : channel type 'tty' must specify "
|
|
"a device\n");
|
|
return NULL;
|
|
}
|
|
str++;
|
|
|
|
data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
|
|
if (data == NULL)
|
|
return NULL;
|
|
*data = ((struct tty_chan) { .dev = str,
|
|
.raw = opts->raw });
|
|
|
|
return data;
|
|
}
|
|
|
|
static int tty_open(int input, int output, int primary, void *d,
|
|
char **dev_out)
|
|
{
|
|
struct tty_chan *data = d;
|
|
int fd, err, mode = 0;
|
|
|
|
if (input && output)
|
|
mode = O_RDWR;
|
|
else if (input)
|
|
mode = O_RDONLY;
|
|
else if (output)
|
|
mode = O_WRONLY;
|
|
|
|
fd = open(data->dev, mode);
|
|
if (fd < 0)
|
|
return -errno;
|
|
|
|
if (data->raw) {
|
|
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
|
|
if (err)
|
|
return err;
|
|
|
|
err = raw(fd);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
*dev_out = data->dev;
|
|
return fd;
|
|
}
|
|
|
|
const struct chan_ops tty_ops = {
|
|
.type = "tty",
|
|
.init = tty_chan_init,
|
|
.open = tty_open,
|
|
.close = generic_close,
|
|
.read = generic_read,
|
|
.write = generic_write,
|
|
.console_write = generic_console_write,
|
|
.window_size = generic_window_size,
|
|
.free = generic_free,
|
|
.winch = 0,
|
|
};
|