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
/
ssl.c
diff --git
a/arch/um/drivers/ssl.c
b/arch/um/drivers/ssl.c
index
b32a770
..
ed9c590
100644
(file)
--- a/
arch/um/drivers/ssl.c
+++ b/
arch/um/drivers/ssl.c
@@
-3,7
+3,6
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/fs.h"
#include "linux/tty.h"
#include "linux/tty_driver.h"
#include "linux/fs.h"
#include "linux/tty.h"
#include "linux/tty_driver.h"
@@
-23,7
+22,7
@@
#include "irq_user.h"
#include "mconsole_kern.h"
#include "irq_user.h"
#include "mconsole_kern.h"
-static int ssl_version = 1;
+static
const
int ssl_version = 1;
/* Referenced only by tty_driver below - presumably it's locked correctly
* by the tty driver.
/* Referenced only by tty_driver below - presumably it's locked correctly
* by the tty driver.
@@
-33,7
+32,7
@@
static struct tty_driver *ssl_driver;
#define NR_PORTS 64
#define NR_PORTS 64
-void ssl_announce(char *dev_name, int dev)
+
static
void ssl_announce(char *dev_name, int dev)
{
printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
dev_name);
{
printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
dev_name);
@@
-49,12
+48,11
@@
static struct chan_opts opts = {
static int ssl_config(char *str);
static int ssl_get_config(char *dev, char *str, int size, char **error_out);
static int ssl_config(char *str);
static int ssl_get_config(char *dev, char *str, int size, char **error_out);
-static int ssl_remove(
char *str
);
+static int ssl_remove(
int n
);
static struct line_driver driver = {
.name = "UML serial line",
.device_name = "ttyS",
static struct line_driver driver = {
.name = "UML serial line",
.device_name = "ttyS",
- .devfs_name = "tts/",
.major = TTY_MAJOR,
.minor_start = 64,
.type = TTY_DRIVER_TYPE_SERIAL,
.major = TTY_MAJOR,
.minor_start = 64,
.type = TTY_DRIVER_TYPE_SERIAL,
@@
-69,6
+67,7
@@
static struct line_driver driver = {
.name = "ssl",
.config = ssl_config,
.get_config = ssl_get_config,
.name = "ssl",
.config = ssl_config,
.get_config = ssl_get_config,
+ .id = line_id,
.remove = ssl_remove,
},
};
.remove = ssl_remove,
},
};
@@
-83,26
+82,23
@@
static struct lines lines = LINES_INIT(NR_PORTS);
static int ssl_config(char *str)
{
static int ssl_config(char *str)
{
- return(line_config(serial_lines,
- sizeof(serial_lines)/sizeof(serial_lines[0]), str));
+ return line_config(serial_lines, ARRAY_SIZE(serial_lines), str, &opts);
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
{
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
{
- return(line_get_config(dev, serial_lines,
- sizeof(serial_lines)/sizeof(serial_lines[0]),
- str, size, error_out));
+ return line_get_config(dev, serial_lines, ARRAY_SIZE(serial_lines), str,
+ size, error_out);
}
}
-static int ssl_remove(
char *str
)
+static int ssl_remove(
int n
)
{
{
- return(line_remove(serial_lines,
- sizeof(serial_lines)/sizeof(serial_lines[0]), str));
+ return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n);
}
}
-int ssl_open(struct tty_struct *tty, struct file *filp)
+
static
int ssl_open(struct tty_struct *tty, struct file *filp)
{
{
- return line_open(serial_lines, tty
, &opts
);
+ return line_open(serial_lines, tty);
}
#if 0
}
#if 0
@@
-111,16
+107,6
@@
static void ssl_flush_buffer(struct tty_struct *tty)
return;
}
return;
}
-static void ssl_throttle(struct tty_struct * tty)
-{
- printk(KERN_ERR "Someone should implement ssl_throttle\n");
-}
-
-static void ssl_unthrottle(struct tty_struct * tty)
-{
- printk(KERN_ERR "Someone should implement ssl_unthrottle\n");
-}
-
static void ssl_stop(struct tty_struct *tty)
{
printk(KERN_ERR "Someone should implement ssl_stop\n");
static void ssl_stop(struct tty_struct *tty)
{
printk(KERN_ERR "Someone should implement ssl_stop\n");
@@
-136,7
+122,7
@@
void ssl_hangup(struct tty_struct *tty)
}
#endif
}
#endif
-static struct tty_operations ssl_ops = {
+static
const
struct tty_operations ssl_ops = {
.open = ssl_open,
.close = line_close,
.write = line_write,
.open = ssl_open,
.close = line_close,
.write = line_write,
@@
-147,9
+133,9
@@
static struct tty_operations ssl_ops = {
.flush_chars = line_flush_chars,
.set_termios = line_set_termios,
.ioctl = line_ioctl,
.flush_chars = line_flush_chars,
.set_termios = line_set_termios,
.ioctl = line_ioctl,
+ .throttle = line_throttle,
+ .unthrottle = line_unthrottle,
#if 0
#if 0
- .throttle = ssl_throttle,
- .unthrottle = ssl_unthrottle,
.stop = ssl_stop,
.start = ssl_start,
.hangup = ssl_hangup,
.stop = ssl_stop,
.start = ssl_start,
.hangup = ssl_hangup,
@@
-182,7
+168,7
@@
static int ssl_console_setup(struct console *co, char *options)
{
struct line *line = &serial_lines[co->index];
{
struct line *line = &serial_lines[co->index];
- return console_open_chan(line,
co,
&opts);
+ return console_open_chan(line,
co,
&opts);
}
static struct console ssl_cons = {
}
static struct console ssl_cons = {
@@
-194,16
+180,17
@@
static struct console ssl_cons = {
.index = -1,
};
.index = -1,
};
-int ssl_init(void)
+
static
int ssl_init(void)
{
char *new_title;
{
char *new_title;
- printk(KERN_INFO "Initializing software serial port version %d\n",
+ printk(KERN_INFO "Initializing software serial port version %d\n",
ssl_version);
ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops,
ssl_version);
ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops,
- serial_lines, ARRAY_SIZE(serial_lines));
+ serial_lines,
+ ARRAY_SIZE(serial_lines));
- lines_init(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0])
);
+ lines_init(serial_lines,
ARRAY_SIZE(serial_lines), &opts
);
new_title = add_xterm_umid(opts.xterm_title);
if (new_title != NULL)
new_title = add_xterm_umid(opts.xterm_title);
if (new_title != NULL)
@@
-211,7
+198,7
@@
int ssl_init(void)
ssl_init_done = 1;
register_console(&ssl_cons);
ssl_init_done = 1;
register_console(&ssl_cons);
- return
(0)
;
+ return
0
;
}
late_initcall(ssl_init);
}
late_initcall(ssl_init);
@@
-219,16
+206,13
@@
static void ssl_exit(void)
{
if (!ssl_init_done)
return;
{
if (!ssl_init_done)
return;
- close_lines(serial_lines,
- sizeof(serial_lines)/sizeof(serial_lines[0]));
+ close_lines(serial_lines, ARRAY_SIZE(serial_lines));
}
__uml_exitcall(ssl_exit);
static int ssl_chan_setup(char *str)
{
}
__uml_exitcall(ssl_exit);
static int ssl_chan_setup(char *str)
{
- return(line_setup(serial_lines,
- sizeof(serial_lines)/sizeof(serial_lines[0]),
- str, 1));
+ return line_setup(serial_lines, ARRAY_SIZE(serial_lines), str);
}
__setup("ssl", ssl_chan_setup);
}
__setup("ssl", ssl_chan_setup);