#include "linux/sched.h"
#include "linux/slab.h"
#include "linux/list.h"
-#include "linux/kd.h"
-#include "linux/interrupt.h"
#include "linux/devfs_fs_kernel.h"
+#include "asm/irq.h"
#include "asm/uaccess.h"
#include "chan_kern.h"
#include "irq_user.h"
#include "user_util.h"
#include "kern_util.h"
#include "os.h"
-#include "irq_kern.h"
#define LINE_BUFSIZE 4096
-static irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused)
+void line_interrupt(int irq, void *data, struct pt_regs *unused)
{
- struct tty_struct *tty = data;
- struct line *line = tty->driver_data;
+ struct line *dev = data;
- if (line)
- chan_interrupt(&line->chan_list, &line->task, tty, irq);
- return IRQ_HANDLED;
+ if(dev->count > 0)
+ chan_interrupt(&dev->chan_list, &dev->task, dev->tty, irq,
+ dev);
}
-static void line_timer_cb(void *arg)
+void line_timer_cb(void *arg)
{
- struct tty_struct *tty = arg;
- struct line *line = tty->driver_data;
-
- line_interrupt(line->driver->read_irq, arg, NULL);
-}
-
-static int write_room(struct line *dev)
-{
- int n;
-
- if (dev->buffer == NULL)
- return (LINE_BUFSIZE - 1);
+ struct line *dev = arg;
- n = dev->head - dev->tail;
- if (n <= 0)
- n = LINE_BUFSIZE + n;
- return (n - 1);
+ line_interrupt(dev->driver->read_irq, dev, NULL);
}
-static int buffer_data(struct line *line, const char *buf, int len)
+static void buffer_data(struct line *line, const char *buf, int len)
{
- int end, room;
+ int end;
if(line->buffer == NULL){
line->buffer = kmalloc(LINE_BUFSIZE, GFP_ATOMIC);
- if (line->buffer == NULL) {
+ if(line->buffer == NULL){
printk("buffer_data - atomic allocation failed\n");
- return(0);
+ return;
}
line->head = line->buffer;
line->tail = line->buffer;
}
-
- room = write_room(line);
- len = (len > room) ? room : len;
-
end = line->buffer + LINE_BUFSIZE - line->tail;
if(len < end){
memcpy(line->tail, buf, len);
memcpy(line->buffer, buf, len);
line->tail = line->buffer + len;
}
-
- return(len);
}
static int flush_buffer(struct line *line)
{
int n, count;
- if ((line->buffer == NULL) || (line->head == line->tail))
- return(1);
+ if((line->buffer == NULL) || (line->head == line->tail)) return(1);
- if (line->tail < line->head) {
+ if(line->tail < line->head){
count = line->buffer + LINE_BUFSIZE - line->head;
n = write_chan(&line->chan_list, line->head, count,
line->driver->write_irq);
- if (n < 0)
- return(n);
- if (n == count)
- line->head = line->buffer;
+ if(n < 0) return(n);
+ if(n == count) line->head = line->buffer;
else {
line->head += n;
return(0);
count = line->tail - line->head;
n = write_chan(&line->chan_list, line->head, count,
line->driver->write_irq);
- if (n < 0)
- return(n);
+ if(n < 0) return(n);
line->head += n;
- return (line->head == line->tail);
+ return(line->head == line->tail);
}
-int line_write(struct tty_struct *tty, int from_user,
- const unsigned char *buf, int len)
+int line_write(struct line *lines, struct tty_struct *tty, int from_user,
+ const char *buf, int len)
{
- struct line *line = tty->driver_data;
+ struct line *line;
char *new;
unsigned long flags;
- int n, err, ret = 0;
+ int n, err, i;
- if (tty->stopped)
- return 0;
+ if(tty->stopped) return 0;
- if (from_user) {
+ if(from_user){
new = kmalloc(len, GFP_KERNEL);
- if (new == NULL)
- return 0;
+ if(new == NULL)
+ return(0);
n = copy_from_user(new, buf, len);
+ if(n == len)
+ return(-EFAULT);
buf = new;
- if (n == len) {
- len = -EFAULT;
- goto out_free;
- }
- len -= n;
}
+ i = tty->index;
+ line = &lines[i];
+
down(&line->sem);
- if (line->head != line->tail) {
+ if(line->head != line->tail){
local_irq_save(flags);
- ret = buffer_data(line, buf, len);
+ buffer_data(line, buf, len);
err = flush_buffer(line);
local_irq_restore(flags);
- if (err < 0)
- ret = err;
- } else {
+ if(err <= 0)
+ goto out;
+ }
+ else {
n = write_chan(&line->chan_list, buf, len,
line->driver->write_irq);
- if (n < 0) {
- ret = n;
- goto out_up;
+ if(n < 0){
+ len = n;
+ goto out;
}
- len -= n;
- ret += n;
- if (len > 0)
- ret += buffer_data(line, buf + n, len);
+ if(n < len)
+ buffer_data(line, buf + n, len - n);
}
- out_up:
+ out:
up(&line->sem);
- out_free:
- if(from_user)
- kfree(buf);
- return(ret);
-}
-
-void line_put_char(struct tty_struct *tty, unsigned char ch)
-{
- line_write(tty, 0, &ch, sizeof(ch));
-}
-
-void line_set_termios(struct tty_struct *tty, struct termios * old)
-{
- /* nothing */
-}
-
-int line_chars_in_buffer(struct tty_struct *tty)
-{
- return 0;
-}
-
-static struct {
- int cmd;
- char *level;
- char *name;
-} tty_ioctls[] = {
- /* don't print these, they flood the log ... */
- { TCSBRK, NULL, "TCSBRK" },
- { TCGETS, NULL, "TCGETS" },
- { TCSETSW, NULL, "TCSETSW" },
-
- /* general tty stuff */
- { TCSETS, KERN_DEBUG, "TCSETS" },
- { TCFLSH, KERN_DEBUG, "TCFLSH" },
- { TCSETSF, KERN_DEBUG, "TCSETSF" },
- { TCGETA, KERN_DEBUG, "TCGETA" },
- { TIOCMGET, KERN_DEBUG, "TIOCMGET" },
- { TCSBRKP, KERN_DEBUG, "TCSBRKP" },
- { TIOCMSET, KERN_DEBUG, "TIOCMSET" },
-
- /* linux-specific ones */
- { TIOCLINUX, KERN_INFO, "TIOCLINUX" },
- { KDGKBMODE, KERN_INFO, "KDGKBMODE" },
- { KDGKBTYPE, KERN_INFO, "KDGKBTYPE" },
- { KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" },
-};
-
-int line_ioctl(struct tty_struct *tty, struct file * file,
- unsigned int cmd, unsigned long arg)
-{
- int ret;
- int i;
-
- ret = 0;
- switch(cmd) {
-#if 0
- case TCwhatever:
- /* do something */
- break;
-#endif
- default:
- for (i = 0; i < ARRAY_SIZE(tty_ioctls); i++)
- if (cmd == tty_ioctls[i].cmd)
- break;
- if (i < ARRAY_SIZE(tty_ioctls)) {
- if (NULL != tty_ioctls[i].level)
- printk("%s%s: %s: ioctl %s called\n",
- tty_ioctls[i].level, __FUNCTION__,
- tty->name, tty_ioctls[i].name);
- } else {
- printk(KERN_ERR "%s: %s: unknown ioctl: 0x%x\n",
- __FUNCTION__, tty->name, cmd);
- }
- ret = -ENOIOCTLCMD;
- break;
- }
- return(ret);
+ return(len);
}
-static irqreturn_t line_write_interrupt(int irq, void *data,
- struct pt_regs *unused)
+void line_write_interrupt(int irq, void *data, struct pt_regs *unused)
{
- struct tty_struct *tty = data;
- struct line *line = tty->driver_data;
+ struct line *dev = data;
+ struct tty_struct *tty = dev->tty;
int err;
- err = flush_buffer(line);
- if(err == 0)
- return(IRQ_NONE);
+ err = flush_buffer(dev);
+ if(err == 0) return;
else if(err < 0){
- line->head = line->buffer;
- line->tail = line->buffer;
+ dev->head = dev->buffer;
+ dev->tail = dev->buffer;
}
- if(tty == NULL)
- return(IRQ_NONE);
+ if(tty == NULL) return;
if(test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
(tty->ldisc.write_wakeup != NULL))
* writes.
*/
- if(waitqueue_active(&tty->write_wait))
+ if (waitqueue_active(&tty->write_wait))
wake_up_interruptible(&tty->write_wait);
- return(IRQ_HANDLED);
+
}
-int line_setup_irq(int fd, int input, int output, struct tty_struct *tty)
+int line_write_room(struct tty_struct *tty)
{
- struct line *line = tty->driver_data;
+ struct line *dev = tty->driver_data;
+ int n;
+
+ if(dev->buffer == NULL) return(LINE_BUFSIZE - 1);
+
+ n = dev->head - dev->tail;
+ if(n <= 0) n = LINE_BUFSIZE + n;
+ return(n - 1);
+}
+
+int line_setup_irq(int fd, int input, int output, void *data)
+{
+ struct line *line = data;
struct line_driver *driver = line->driver;
int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM;
- if (input)
- err = um_request_irq(driver->read_irq, fd, IRQ_READ,
- line_interrupt, flags,
- driver->read_irq_name, tty);
- if (err)
- return(err);
- if (output)
- err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
- line_write_interrupt, flags,
- driver->write_irq_name, tty);
+ if(input) err = um_request_irq(driver->read_irq, fd, IRQ_READ,
+ line_interrupt, flags,
+ driver->read_irq_name, line);
+ if(err) return(err);
+ if(output) err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
+ line_write_interrupt, flags,
+ driver->write_irq_name, line);
line->have_irq = 1;
return(err);
}
-void line_disable(struct tty_struct *tty, int current_irq)
+void line_disable(struct line *line, int current_irq)
{
- struct line *line = tty->driver_data;
+ if(!line->have_irq) return;
- if (!line->have_irq)
- return;
-
- if (line->driver->read_irq == current_irq)
- free_irq_later(line->driver->read_irq, tty);
+ if(line->driver->read_irq == current_irq)
+ free_irq_later(line->driver->read_irq, line);
else
- free_irq(line->driver->read_irq, tty);
+ free_irq(line->driver->read_irq, line);
if(line->driver->write_irq == current_irq)
- free_irq_later(line->driver->write_irq, tty);
+ free_irq_later(line->driver->write_irq, line);
else
- free_irq(line->driver->write_irq, tty);
+ free_irq(line->driver->write_irq, line);
line->have_irq = 0;
}
struct chan_opts *opts)
{
struct line *line;
- int err = 0;
+ int n, err = 0;
- line = &lines[tty->index];
- tty->driver_data = line;
+ if(tty == NULL) n = 0;
+ else n = tty->index;
+ line = &lines[n];
down(&line->sem);
- if (tty->count == 1) {
- if (!line->valid) {
+ if(line->count == 0){
+ if(!line->valid){
err = -ENODEV;
goto out;
}
- if (list_empty(&line->chan_list)) {
+ if(list_empty(&line->chan_list)){
err = parse_chan_pair(line->init_str, &line->chan_list,
- line->init_pri, tty->index, opts);
+ line->init_pri, n, opts);
if(err) goto out;
err = open_chan(&line->chan_list);
if(err) goto out;
}
- enable_chan(&line->chan_list, tty);
- INIT_WORK(&line->task, line_timer_cb, tty);
+ enable_chan(&line->chan_list, line);
+ INIT_WORK(&line->task, line_timer_cb, line);
}
if(!line->sigio){
- chan_enable_winch(&line->chan_list, tty);
+ chan_enable_winch(&line->chan_list, line);
line->sigio = 1;
}
- chan_window_size(&line->chan_list, &tty->winsize.ws_row,
- &tty->winsize.ws_col);
- line->count++;
-out:
+ /* This is outside the if because the initial console is opened
+ * with tty == NULL
+ */
+ line->tty = tty;
+
+ if(tty != NULL){
+ tty->driver_data = line;
+ chan_window_size(&line->chan_list, &tty->winsize.ws_row,
+ &tty->winsize.ws_col);
+ }
+
+ line->count++;
+ out:
up(&line->sem);
return(err);
}
-void line_close(struct tty_struct *tty, struct file * filp)
+void line_close(struct line *lines, struct tty_struct *tty)
{
- struct line *line = tty->driver_data;
+ struct line *line;
+ int n;
+
+ if(tty == NULL) n = 0;
+ else n = tty->index;
+ line = &lines[n];
down(&line->sem);
line->count--;
- if (tty->count == 1) {
- line_disable(tty, -1);
- tty->driver_data = NULL;
- }
+
+ /* I don't like this, but I can't think of anything better. What's
+ * going on is that the tty is in the process of being closed for
+ * the last time. Its count hasn't been dropped yet, so it's still
+ * at 1. This may happen when line->count != 0 because of the initial
+ * console open (without a tty) bumping it up to 1.
+ */
+ if((line->tty != NULL) && (line->tty->count == 1))
+ line->tty = NULL;
+ if(line->count == 0)
+ line_disable(line, -1);
up(&line->sem);
}
if(*end != '='){
printk(KERN_ERR "line_setup failed to parse \"%s\"\n",
init);
- return(0);
+ return(1);
}
init = end;
}
if((n >= 0) && (n >= num)){
printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
n, num);
- return(0);
+ return(1);
}
- else if (n >= 0){
- if (lines[n].count > 0) {
+ else if(n >= 0){
+ if(lines[n].count > 0){
printk("line_setup - device %d is open\n", n);
- return(0);
+ return(1);
}
- if (lines[n].init_pri <= INIT_ONE){
+ if(lines[n].init_pri <= INIT_ONE){
lines[n].init_pri = INIT_ONE;
- if (!strcmp(init, "none"))
- lines[n].valid = 0;
+ if(!strcmp(init, "none")) lines[n].valid = 0;
else {
lines[n].init_str = init;
lines[n].valid = 1;
else if(!all_allowed){
printk("line_setup - can't configure all devices from "
"mconsole\n");
- return(0);
+ return(1);
}
else {
for(i = 0; i < num; i++){
}
}
}
- return(1);
+ return(0);
}
int line_config(struct line *lines, int num, char *str)
printk("line_config - uml_strdup failed\n");
return(-ENOMEM);
}
- return(!line_setup(lines, num, new, 0));
+ return(line_setup(lines, num, new, 0));
}
int line_get_config(char *name, struct line *lines, int num, char *str,
dev = simple_strtoul(name, &end, 0);
if((*end != '\0') || (end == name)){
- *error_out = "line_get_config failed to parse device number";
+ *error_out = "line_setup failed to parse device number";
return(0);
}
}
line = &lines[dev];
-
down(&line->sem);
+
if(!line->valid)
CONFIG_CHUNK(str, size, n, "none", 1);
else if(line->count == 0)
CONFIG_CHUNK(str, size, n, line->init_str, 1);
else n = chan_config_string(&line->chan_list, str, size, error_out);
- up(&line->sem);
+ up(&line->sem);
return(n);
}
char config[sizeof("conxxxx=none\0")];
sprintf(config, "%s=none", str);
- return(!line_setup(lines, num, config, 0));
-}
-
-int line_write_room(struct tty_struct *tty)
-{
- struct line *dev = tty->driver_data;
- int room;
-
- if (tty->stopped)
- return 0;
- room = write_room(dev);
- if (0 == room)
- printk(KERN_DEBUG "%s: %s: no room left in buffer\n",
- __FUNCTION__,tty->name);
- return room;
+ return(line_setup(lines, num, config, 0));
}
struct tty_driver *line_register_devfs(struct lines *set,
return NULL;
driver->driver_name = line_driver->name;
- driver->name = line_driver->device_name;
- driver->devfs_name = line_driver->devfs_name;
+ driver->name = line_driver->devfs_name;
driver->major = line_driver->major;
driver->minor_start = line_driver->minor_start;
driver->type = line_driver->type;
driver->init_termios = tty_std_termios;
tty_set_operations(driver, ops);
- if (tty_register_driver(driver)) {
- printk("%s: can't register %s driver\n",
- __FUNCTION__,line_driver->name);
- put_tty_driver(driver);
- return NULL;
- }
+ if (tty_register_driver(driver))
+ panic("line_register_devfs : Couldn't register driver\n");
from = line_driver->symlink_from;
to = line_driver->symlink_to;
for(i = 0; i < nlines; i++){
if(!lines[i].valid)
- tty_unregister_device(driver, i);
+ tty_unregister_devfs(driver, i);
}
mconsole_register_dev(&line_driver->mc);
int fd;
int tty_fd;
int pid;
- struct tty_struct *tty;
+ struct line *line;
};
-irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
+void winch_interrupt(int irq, void *data, struct pt_regs *unused)
{
struct winch *winch = data;
struct tty_struct *tty;
- struct line *line;
int err;
char c;
- if(winch->fd != -1){
- err = generic_read(winch->fd, &c, NULL);
- if(err < 0){
- if(err != -EAGAIN){
- printk("winch_interrupt : read failed, "
- "errno = %d\n", -err);
- printk("fd %d is losing SIGWINCH support\n",
- winch->tty_fd);
- return(IRQ_HANDLED);
- }
- goto out;
+ err = generic_read(winch->fd, &c, NULL);
+ if(err < 0){
+ if(err != -EAGAIN){
+ printk("winch_interrupt : read failed, errno = %d\n",
+ -err);
+ printk("fd %d is losing SIGWINCH support\n",
+ winch->tty_fd);
+ free_irq(irq, data);
+ return;
}
+ goto out;
}
- tty = winch->tty;
- line = tty->driver_data;
- if (tty != NULL) {
- chan_window_size(&line->chan_list,
+ tty = winch->line->tty;
+ if(tty != NULL){
+ chan_window_size(&winch->line->chan_list,
&tty->winsize.ws_row,
&tty->winsize.ws_col);
kill_pg(tty->pgrp, SIGWINCH, 1);
}
out:
- if(winch->fd != -1)
- reactivate_fd(winch->fd, WINCH_IRQ);
- return(IRQ_HANDLED);
+ reactivate_fd(winch->fd, WINCH_IRQ);
}
DECLARE_MUTEX(winch_handler_sem);
LIST_HEAD(winch_handlers);
-void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)
+void register_winch_irq(int fd, int tty_fd, int pid, void *line)
{
struct winch *winch;
down(&winch_handler_sem);
winch = kmalloc(sizeof(*winch), GFP_KERNEL);
- if (winch == NULL) {
+ if(winch == NULL){
printk("register_winch_irq - kmalloc failed\n");
goto out;
}
.fd = fd,
.tty_fd = tty_fd,
.pid = pid,
- .tty = tty });
+ .line = line });
list_add(&winch->list, &winch_handlers);
if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
list_for_each(ele, &winch_handlers){
winch = list_entry(ele, struct winch, list);
- if(winch->fd != -1){
- deactivate_fd(winch->fd, WINCH_IRQ);
- os_close_file(winch->fd);
- }
+ close(winch->fd);
if(winch->pid != -1)
os_kill_process(winch->pid, 1);
}
}
+
__uml_exitcall(winch_cleanup);
char *add_xterm_umid(char *base)
projects / linux-flexiantxendom0-3.2.10.git / blobdiff