X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Fchan_user.c;h=7319ddd172312fd87ffd541fa11d598c43dff20f;hb=9c920a8402f2bb9bd931801d429b65f4eb6a262b;hp=bbc5b4c28e80105db31c699b47e419bee0a1cd2e;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index bbc5b4c28..7319ddd17 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -21,19 +21,31 @@
 #include "choose-mode.h"
 #include "mode.h"
 
-static void winch_handler(int sig)
+void generic_close(int fd, void *unused)
 {
+	os_close_file(fd);
 }
 
-struct winch_data {
-	int pty_fd;
-	int pipe_fd;
-	int close_me;
-};
+int generic_read(int fd, char *c_out, void *unused)
+{
+	int n;
+
+	n = os_read_file(fd, c_out, sizeof(*c_out));
+
+	if(n == -EAGAIN) 
+		return(0);
+	else if(n == 0) 
+		return(-EIO);
+	return(n);
+}
+
+/* XXX Trivial wrapper around os_write_file */
+
+int generic_write(int fd, const char *buf, int n, void *unused)
+{
+	return(os_write_file(fd, buf, n));
+}
 
-/* XXX This breaks horribly (by hanging UML) when moved to chan_kern.c - 
- * needs investigation
- */
 int generic_console_write(int fd, const char *buf, int n, void *unused)
 {
 	struct termios save, new;
@@ -50,6 +62,39 @@ int generic_console_write(int fd, const char *buf, int n, void *unused)
 	return(err);
 }
 
+int generic_window_size(int fd, void *unused, unsigned short *rows_out,
+			unsigned short *cols_out)
+{
+	int rows, cols;
+	int ret;
+
+	ret = os_window_size(fd, &rows, &cols);
+	if(ret < 0)
+		return(ret);
+
+	ret = ((*rows_out != rows) || (*cols_out != cols));
+
+	*rows_out = rows;
+	*cols_out = cols;
+
+	return(ret);
+}
+
+void generic_free(void *data)
+{
+	kfree(data);
+}
+
+static void winch_handler(int sig)
+{
+}
+
+struct winch_data {
+	int pty_fd;
+	int pipe_fd;
+	int close_me;
+};
+
 static int winch_thread(void *arg)
 {
 	struct winch_data *data = arg;