git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
drivers
/
tty.c
diff --git
a/arch/um/drivers/tty.c
b/arch/um/drivers/tty.c
index
e9eb9e3
..
d95d643
100644
(file)
--- a/
arch/um/drivers/tty.c
+++ b/
arch/um/drivers/tty.c
@@
-1,17
+1,17
@@
-/*
+/*
* Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include <stdio.h>
#include <termios.h>
* Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include <stdio.h>
#include <termios.h>
-#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
#include "chan_user.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
#include <errno.h>
#include <unistd.h>
#include "chan_user.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
+#include "um_malloc.h"
struct tty_chan {
char *dev;
struct tty_chan {
char *dev;
@@
-19,68
+19,59
@@
struct tty_chan {
struct termios tt;
};
struct termios tt;
};
-
void *tty_chan_init(char *str, int device,
struct chan_opts *opts)
+
static void *tty_chan_init(char *str, int device, const
struct chan_opts *opts)
{
struct tty_chan *data;
if(*str != ':'){
printk("tty_init : channel type 'tty' must specify "
"a device\n");
{
struct tty_chan *data;
if(*str != ':'){
printk("tty_init : channel type 'tty' must specify "
"a device\n");
- return
(NULL)
;
+ return
NULL
;
}
str++;
}
str++;
- if((data = um_kmalloc(sizeof(*data))) == NULL)
- return(NULL);
+ data = um_kmalloc(sizeof(*data));
+ if(data == NULL)
+ return NULL;
*data = ((struct tty_chan) { .dev = str,
.raw = opts->raw });
*data = ((struct tty_chan) { .dev = str,
.raw = opts->raw });
-
- return
(data)
;
+
+ return
data
;
}
}
-int tty_open(int input, int output, int primary, void *d, char **dev_out)
+static int tty_open(int input, int output, int primary, void *d,
+ char **dev_out)
{
struct tty_chan *data = d;
{
struct tty_chan *data = d;
- int fd;
+ int fd
, err
;
fd = os_open_file(data->dev, of_set_rw(OPENFLAGS(), input, output), 0);
fd = os_open_file(data->dev, of_set_rw(OPENFLAGS(), input, output), 0);
- if(fd < 0) return(fd);
+ if(fd < 0)
+ return fd;
+
if(data->raw){
if(data->raw){
- tcgetattr(fd, &data->tt);
- raw(fd, 0);
+ CATCH_EINTR(err = tcgetattr(fd, &data->tt));
+ if(err)
+ return err;
+
+ err = raw(fd);
+ if(err)
+ return err;
}
*dev_out = data->dev;
}
*dev_out = data->dev;
- return(fd);
-}
-
-int tty_console_write(int fd, const char *buf, int n, void *d)
-{
- struct tty_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
+ return fd;
}
}
-struct chan_ops tty_ops = {
+
const
struct chan_ops tty_ops = {
.type = "tty",
.init = tty_chan_init,
.open = tty_open,
.close = generic_close,
.read = generic_read,
.write = generic_write,
.type = "tty",
.init = tty_chan_init,
.open = tty_open,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
tty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
};
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
};
-
-/*
- * 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:
- */