From 8baa3eb9046c86975084ff040b23e52cba7c4aa9 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sun, 13 Nov 2005 16:07:10 -0800
Subject: [PATCH] --- yaml --- r: 14063 b: refs/heads/master c:
 fd9bc53b99a77aefe89d810d889aa6385565959b h: refs/heads/master i:   14061:
 003fbf9e0811679de39d6a26591ce4de23c32c46   14059:
 12e8dc08f2b4b21911447b22f39362e70a787452   14055:
 6deb8b1c936eec097c209f75dd4282601bd587ca   14047:
 96f38e3551bd2818f8132811587d11dca5b00107 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/um/drivers/fd.c        |  9 +--------
 trunk/arch/um/drivers/port_user.c |  9 +--------
 trunk/arch/um/drivers/pty.c       | 11 ++---------
 trunk/arch/um/drivers/tty.c       |  9 +--------
 trunk/arch/um/drivers/xterm.c     |  9 +--------
 6 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/[refs] b/[refs]
index 3cb62edfe743..54c22b1d35fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c50d2c4d6685db9b45cf6521046296df5bc42592
+refs/heads/master: fd9bc53b99a77aefe89d810d889aa6385565959b
diff --git a/trunk/arch/um/drivers/fd.c b/trunk/arch/um/drivers/fd.c
index f0b888f66e05..3296e86a03a5 100644
--- a/trunk/arch/um/drivers/fd.c
+++ b/trunk/arch/um/drivers/fd.c
@@ -76,13 +76,6 @@ static void fd_close(int fd, void *d)
 	}
 }
 
-static 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,
@@ -90,7 +83,7 @@ struct chan_ops fd_ops = {
 	.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,
diff --git a/trunk/arch/um/drivers/port_user.c b/trunk/arch/um/drivers/port_user.c
index ed4a1a6c5d83..c43e8bb32502 100644
--- a/trunk/arch/um/drivers/port_user.c
+++ b/trunk/arch/um/drivers/port_user.c
@@ -100,13 +100,6 @@ static void port_close(int fd, void *d)
 	os_close_file(fd);
 }
 
-static int port_console_write(int fd, const char *buf, int n, void *d)
-{
-	struct port_chan *data = d;
-
-	return(generic_console_write(fd, buf, n, &data->tt));
-}
-
 struct chan_ops port_ops = {
 	.type		= "port",
 	.init		= port_init,
@@ -114,7 +107,7 @@ struct chan_ops port_ops = {
 	.close		= port_close,
 	.read	        = generic_read,
 	.write		= generic_write,
-	.console_write	= port_console_write,
+	.console_write	= generic_console_write,
 	.window_size	= generic_window_size,
 	.free		= port_free,
 	.winch		= 1,
diff --git a/trunk/arch/um/drivers/pty.c b/trunk/arch/um/drivers/pty.c
index 0306a1b215b7..1c555c38de4d 100644
--- a/trunk/arch/um/drivers/pty.c
+++ b/trunk/arch/um/drivers/pty.c
@@ -118,13 +118,6 @@ static int pty_open(int input, int output, int primary, void *d,
 	return(fd);
 }
 
-static int pty_console_write(int fd, const char *buf, int n, void *d)
-{
-	struct pty_chan *data = d;
-
-	return(generic_console_write(fd, buf, n, &data->tt));
-}
-
 struct chan_ops pty_ops = {
 	.type		= "pty",
 	.init		= pty_chan_init,
@@ -132,7 +125,7 @@ struct chan_ops pty_ops = {
 	.close		= generic_close,
 	.read		= generic_read,
 	.write		= generic_write,
-	.console_write	= pty_console_write,
+	.console_write	= generic_console_write,
 	.window_size	= generic_window_size,
 	.free		= generic_free,
 	.winch		= 0,
@@ -145,7 +138,7 @@ struct chan_ops pts_ops = {
 	.close		= generic_close,
 	.read		= generic_read,
 	.write		= generic_write,
-	.console_write	= pty_console_write,
+	.console_write	= generic_console_write,
 	.window_size	= generic_window_size,
 	.free		= generic_free,
 	.winch		= 0,
diff --git a/trunk/arch/um/drivers/tty.c b/trunk/arch/um/drivers/tty.c
index 6fbb670ee274..94c9265a4f2c 100644
--- a/trunk/arch/um/drivers/tty.c
+++ b/trunk/arch/um/drivers/tty.c
@@ -60,13 +60,6 @@ static int tty_open(int input, int output, int primary, void *d,
 	return(fd);
 }
 
-static 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));
-}
-
 struct chan_ops tty_ops = {
 	.type		= "tty",
 	.init		= tty_chan_init,
@@ -74,7 +67,7 @@ struct chan_ops tty_ops = {
 	.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,
diff --git a/trunk/arch/um/drivers/xterm.c b/trunk/arch/um/drivers/xterm.c
index b530f1a6540d..aaa636661043 100644
--- a/trunk/arch/um/drivers/xterm.c
+++ b/trunk/arch/um/drivers/xterm.c
@@ -194,13 +194,6 @@ static void xterm_free(void *d)
 	free(d);
 }
 
-static int xterm_console_write(int fd, const char *buf, int n, void *d)
-{
-	struct xterm_chan *data = d;
-
-	return(generic_console_write(fd, buf, n, &data->tt));
-}
-
 struct chan_ops xterm_ops = {
 	.type		= "xterm",
 	.init		= xterm_init,
@@ -208,7 +201,7 @@ struct chan_ops xterm_ops = {
 	.close		= xterm_close,
 	.read		= generic_read,
 	.write		= generic_write,
-	.console_write	= xterm_console_write,
+	.console_write	= generic_console_write,
 	.window_size	= generic_window_size,
 	.free		= xterm_free,
 	.winch		= 1,