patch-2.1.91 linux/drivers/video/txtcon.c

Next file: linux/drivers/video/vfb.c
Previous file: linux/drivers/video/tgafb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.90/linux/drivers/video/txtcon.c linux/drivers/video/txtcon.c
@@ -14,48 +14,55 @@
  */
 
 
+#include <linux/errno.h>
 #include <linux/types.h>
+#include <linux/kdev_t.h>
 #include <linux/console.h>
 
 
-   /*
-    *    Interface used by the world
-    */
+    /*
+     *  Interface used by the world
+     */
 
-static int txtcon_startup(u_long *kmem_start, const char **display_desc);
+static unsigned long txtcon_startup(unsigned long kmem_start,
+				    const char **display_desc);
 static void txtcon_init(struct vc_data *conp);
-static int txtcon_deinit(struct vc_data *conp);
-static int txtcon_clear(struct vc_data *conp, int sy, int sx, int height,
-                        int width);
-static int txtcon_putc(struct vc_data *conp, int c, int y, int x);
-static int txtcon_putcs(struct vc_data *conp, const char *s, int count, int y,
-                        int x);
-static int txtcon_cursor(struct vc_data *conp, int mode);
-static int txtcon_scroll(struct vc_data *conp, int t, int b, int dir, int count);
-static int txtcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
-                        int height, int width);
+static void txtcon_deinit(struct vc_data *conp);
+static void txtcon_clear(struct vc_data *conp, int sy, int sx, int height,
+			 int width);
+static void txtcon_putc(struct vc_data *conp, int c, int y, int x);
+static void txtcon_putcs(struct vc_data *conp, const char *s, int count, int y,
+			 int x);
+static void txtcon_cursor(struct vc_data *conp, int mode);
+static void txtcon_scroll(struct vc_data *conp, int t, int b, int dir,
+			  int count);
+static void txtcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
+			 int height, int width);
 static int txtcon_switch(struct vc_data *conp);
 static int txtcon_blank(int blank);
 static int txtcon_get_font(struct vc_data *conp, int *w, int *h, char *data);
 static int txtcon_set_font(struct vc_data *conp, int w, int h, char *data);
 static int txtcon_set_palette(struct vc_data *conp, unsigned char *table);
 static int txtcon_scrolldelta(int lines);
+static int txtcon_set_mode(struct vc_data *conp, int mode);
 
 
-static int txtcon_startup(u_long *kmem_start, const char **display_desc)
+static unsigned long txtcon_startup(unsigned long kmem_start,
+				    const char **display_desc)
 {
-   return -ENODEV;
+    return kmem_start;
 }
 
 
 static void txtcon_init(struct vc_data *conp)
 {
+    /* ... */
 }
 
 
-static int txtcon_deinit(struct vc_data *conp)
+static void txtcon_deinit(struct vc_data *conp)
 {
-   return 0;
+    /* ... */
 }
 
 
@@ -64,90 +71,108 @@
 /* txtcon_XXX routines - interface used by the world */
 
 
-static int txtcon_clear(struct vc_data *conp, int sy, int sx, int height,
-                        int width)
+static void txtcon_clear(struct vc_data *conp, int sy, int sx, int height,
+			 int width)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
-static int txtcon_putc(struct vc_data *conp, int c, int y, int x)
+static void txtcon_putc(struct vc_data *conp, int c, int y, int x)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
-static int txtcon_putcs(struct vc_data *conp, const char *s, int count, int y,
-                        int x)
+static void txtcon_putcs(struct vc_data *conp, const char *s, int count, int y,
+			 int x)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
-static int txtcon_cursor(struct vc_data *conp, int mode)
+static void txtcon_cursor(struct vc_data *conp, int mode)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
-static int txtcon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
+static void txtcon_scroll(struct vc_data *conp, int t, int b, int dir,
+			  int count)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
-static int txtcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
-                        int height, int width)
+static void txtcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
+			 int height, int width)
 {
-   return -ENOSYS;
+    /* ... */
 }
 
 
 static int txtcon_switch(struct vc_data *conp)
 {
-   return -ENOSYS;
+    return -ENOSYS;
 }
 
 
 static int txtcon_blank(int blank)
 {
-   return -ENOSYS;
+    return -ENOSYS;
 }
 
 
 static int txtcon_get_font(struct vc_data *conp, int *w, int *h, char *data)
 {
-   return -ENOSYS;
+    return -ENOSYS;
 }
 
 
 static int txtcon_set_font(struct vc_data *conp, int w, int h, char *data)
 {
-   return -ENOSYS;
+    return -ENOSYS;
 }
 
 
 static int txtcon_set_palette(struct vc_data *conp, unsigned char *table)
 {
-   return -ENOSYS;
+    return -ENOSYS;
 }
 
 
 static int txtcon_scrolldelta(int lines)
 {
-   return -ENOSYS;
+    return -ENOSYS;
+}
+
+static int txtcon_set_mode(struct vc_data *conp, int mode)
+{
+    return -ENOSYS;
 }
 
 
 /* ====================================================================== */
 
-   /*
-    *    The console `switch' structure for the text mode based console
-    */
+    /*
+     *  The console `switch' structure for the text mode based console
+     */
 
 struct consw txt_con = {
-   txtcon_startup, txtcon_init, txtcon_deinit, txtcon_clear, txtcon_putc,
-   txtcon_putcs, txtcon_cursor, txtcon_scroll, txtcon_bmove, txtcon_switch,
-   txtcon_blank, txtcon_get_font, txtcon_set_font, txtcon_set_palette,
-   txtcon_scrolldelta
+    txtcon_startup,
+    txtcon_init,
+    txtcon_deinit,
+    txtcon_clear,
+    txtcon_putc,
+    txtcon_putcs,
+    txtcon_cursor,
+    txtcon_scroll,
+    txtcon_bmove,
+    txtcon_switch,
+    txtcon_blank,
+    txtcon_get_font,
+    txtcon_set_font,
+    txtcon_set_palette,
+    txtcon_scrolldelta,
+    txtcon_set_mode
 };

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov