2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
|
|
|
|
|
* Licensed under the GPL
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef __LINE_H__
|
|
|
|
|
#define __LINE_H__
|
|
|
|
|
|
|
|
|
|
#include "linux/list.h"
|
|
|
|
|
#include "linux/workqueue.h"
|
|
|
|
|
#include "linux/tty.h"
|
|
|
|
|
#include "linux/interrupt.h"
|
2005-05-01 17:58:56 +02:00
|
|
|
#include "linux/spinlock.h"
|
2005-04-17 00:20:36 +02:00
|
|
|
#include "chan_user.h"
|
|
|
|
|
#include "mconsole_kern.h"
|
|
|
|
|
|
|
|
|
|
struct line_driver {
|
|
|
|
|
char *name;
|
|
|
|
|
char *device_name;
|
|
|
|
|
char *devfs_name;
|
|
|
|
|
short major;
|
|
|
|
|
short minor_start;
|
|
|
|
|
short type;
|
|
|
|
|
short subtype;
|
|
|
|
|
int read_irq;
|
|
|
|
|
char *read_irq_name;
|
|
|
|
|
int write_irq;
|
|
|
|
|
char *write_irq_name;
|
|
|
|
|
char *symlink_from;
|
|
|
|
|
char *symlink_to;
|
|
|
|
|
struct mc_device mc;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct line {
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 09:18:57 +01:00
|
|
|
struct tty_struct *tty;
|
2005-04-17 00:20:36 +02:00
|
|
|
char *init_str;
|
|
|
|
|
int init_pri;
|
|
|
|
|
struct list_head chan_list;
|
|
|
|
|
int valid;
|
|
|
|
|
int count;
|
2006-01-06 09:18:58 +01:00
|
|
|
int throttled;
|
2005-05-01 17:58:56 +02:00
|
|
|
/*This lock is actually, mostly, local to*/
|
|
|
|
|
spinlock_t lock;
|
|
|
|
|
|
|
|
|
|
/* Yes, this is a real circular buffer.
|
|
|
|
|
* XXX: And this should become a struct kfifo!
|
|
|
|
|
*
|
|
|
|
|
* buffer points to a buffer allocated on demand, of length
|
|
|
|
|
* LINE_BUFSIZE, head to the start of the ring, tail to the end.*/
|
2005-04-17 00:20:36 +02:00
|
|
|
char *buffer;
|
|
|
|
|
char *head;
|
|
|
|
|
char *tail;
|
2005-05-01 17:58:56 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
int sigio;
|
|
|
|
|
struct work_struct task;
|
|
|
|
|
struct line_driver *driver;
|
|
|
|
|
int have_irq;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define LINE_INIT(str, d) \
|
2006-03-31 12:30:15 +02:00
|
|
|
{ .init_str = str, \
|
|
|
|
|
.init_pri = INIT_STATIC, \
|
|
|
|
|
.valid = 1, \
|
|
|
|
|
.lock = SPIN_LOCK_UNLOCKED, \
|
|
|
|
|
.driver = d }
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
|
struct lines {
|
|
|
|
|
int num;
|
|
|
|
|
};
|
|
|
|
|
|
2006-03-31 12:30:15 +02:00
|
|
|
#define LINES_INIT(n) { .num = n }
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
|
extern void line_close(struct tty_struct *tty, struct file * filp);
|
2006-01-06 09:18:55 +01:00
|
|
|
extern int line_open(struct line *lines, struct tty_struct *tty);
|
2006-01-06 09:18:53 +01:00
|
|
|
extern int line_setup(struct line *lines, unsigned int sizeof_lines,
|
|
|
|
|
char *init);
|
2006-01-06 09:18:50 +01:00
|
|
|
extern int line_write(struct tty_struct *tty, const unsigned char *buf,
|
|
|
|
|
int len);
|
2005-04-17 00:20:36 +02:00
|
|
|
extern void line_put_char(struct tty_struct *tty, unsigned char ch);
|
|
|
|
|
extern void line_set_termios(struct tty_struct *tty, struct termios * old);
|
|
|
|
|
extern int line_chars_in_buffer(struct tty_struct *tty);
|
2005-05-01 17:58:56 +02:00
|
|
|
extern void line_flush_buffer(struct tty_struct *tty);
|
|
|
|
|
extern void line_flush_chars(struct tty_struct *tty);
|
2005-04-17 00:20:36 +02:00
|
|
|
extern int line_write_room(struct tty_struct *tty);
|
|
|
|
|
extern int line_ioctl(struct tty_struct *tty, struct file * file,
|
|
|
|
|
unsigned int cmd, unsigned long arg);
|
2006-01-06 09:18:58 +01:00
|
|
|
extern void line_throttle(struct tty_struct *tty);
|
|
|
|
|
extern void line_unthrottle(struct tty_struct *tty);
|
2005-05-01 17:58:56 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
extern char *add_xterm_umid(char *base);
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 09:18:57 +01:00
|
|
|
extern int line_setup_irq(int fd, int input, int output, struct line *line,
|
|
|
|
|
void *data);
|
2005-04-17 00:20:36 +02:00
|
|
|
extern void line_close_chan(struct line *line);
|
2006-01-06 09:18:50 +01:00
|
|
|
extern struct tty_driver * line_register_devfs(struct lines *set,
|
|
|
|
|
struct line_driver *line_driver,
|
2005-04-17 00:20:36 +02:00
|
|
|
struct tty_operations *driver,
|
|
|
|
|
struct line *lines,
|
|
|
|
|
int nlines);
|
2006-01-06 09:18:55 +01:00
|
|
|
extern void lines_init(struct line *lines, int nlines, struct chan_opts *opts);
|
2005-04-17 00:20:36 +02:00
|
|
|
extern void close_lines(struct line *lines, int nlines);
|
2005-05-01 17:58:56 +02:00
|
|
|
|
2006-01-06 09:18:50 +01:00
|
|
|
extern int line_config(struct line *lines, unsigned int sizeof_lines,
|
2006-01-06 09:18:55 +01:00
|
|
|
char *str, struct chan_opts *opts);
|
2005-06-25 23:55:25 +02:00
|
|
|
extern int line_id(char **str, int *start_out, int *end_out);
|
|
|
|
|
extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n);
|
2006-01-06 09:18:50 +01:00
|
|
|
extern int line_get_config(char *dev, struct line *lines,
|
|
|
|
|
unsigned int sizeof_lines, char *str,
|
2005-04-17 00:20:36 +02:00
|
|
|
int size, char **error_out);
|
|
|
|
|
|
|
|
|
|
#endif
|
