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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
um
/
drivers
/
fd.c
diff --git
a/arch/um/drivers/fd.c
b/arch/um/drivers/fd.c
index
1c6daad
..
c41f75e
100644
(file)
--- a/
arch/um/drivers/fd.c
+++ b/
arch/um/drivers/fd.c
@@
-11,6
+11,7
@@
#include "user.h"
#include "user_util.h"
#include "chan_user.h"
#include "user.h"
#include "user_util.h"
#include "chan_user.h"
+#include "os.h"
struct fd_chan {
int fd;
struct fd_chan {
int fd;
@@
-19,7
+20,7
@@
struct fd_chan {
char str[sizeof("1234567890\0")];
};
char str[sizeof("1234567890\0")];
};
-void *fd_init(char *str, int device, struct chan_opts *opts)
+
static
void *fd_init(char *str, int device, struct chan_opts *opts)
{
struct fd_chan *data;
char *end;
{
struct fd_chan *data;
char *end;
@@
-43,7
+44,7
@@
void *fd_init(char *str, int device, struct chan_opts *opts)
return(data);
}
return(data);
}
-int fd_open(int input, int output, int primary, void *d, char **dev_out)
+
static
int fd_open(int input, int output, int primary, void *d, char **dev_out)
{
struct fd_chan *data = d;
int err;
{
struct fd_chan *data = d;
int err;
@@
-62,7
+63,7
@@
int fd_open(int input, int output, int primary, void *d, char **dev_out)
return(data->fd);
}
return(data->fd);
}
-void fd_close(int fd, void *d)
+
static
void fd_close(int fd, void *d)
{
struct fd_chan *data = d;
int err;
{
struct fd_chan *data = d;
int err;
@@
-76,13
+77,6
@@
void fd_close(int fd, void *d)
}
}
}
}
-int fd_console_write(int fd, const char *buf, int n, void *d)
-{
- struct fd_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops fd_ops = {
.type = "fd",
.init = fd_init,
struct chan_ops fd_ops = {
.type = "fd",
.init = fd_init,
@@
-90,7
+84,7
@@
struct chan_ops fd_ops = {
.close = fd_close,
.read = generic_read,
.write = generic_write,
.close = fd_close,
.read = generic_read,
.write = generic_write,
- .console_write =
fd
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 1,
.window_size = generic_window_size,
.free = generic_free,
.winch = 1,