[Linuxconsole-commit]CVS: ruby/linux/drivers/video fbcon.c,1.58,1.59 mdacon.c,1.39,1.40 vgacon.c,1.58,1.59

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv23944/drivers/video

Modified Files:
	fbcon.c mdacon.c vgacon.c 
Log Message:
Don't need to pass in struct tty_driver to create_vt anymore. Plus I removed the need for tty specific stuff in the console display drivers.

Index: fbcon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcon.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- fbcon.c	2001/11/22 18:00:42	1.58
+++ fbcon.c	2001/12/08 00:58:07	1.59
@@ -722,14 +722,6 @@
  //   con_invert_region:	fbcon_invert_region,
 };
 
-/* FIXME!!!! Broke. Assume one framebuffer device. Just done to make it work
-   again. */
-static struct tty_struct *fbcon_table[MAX_NR_USER_CONSOLES];
-static struct termios *fbcon_termios[MAX_NR_USER_CONSOLES];
-static struct termios *fbcon_termios_locked[MAX_NR_USER_CONSOLES];
-static int fbcon_refcount;
-struct tty_driver fbcon_driver;
-
 int __init fb_console_init(void)
 {
    const char *display_desc = NULL;
@@ -742,15 +734,9 @@
    if (!vt) return -ENOMEM;
    memset(vt, 0, sizeof(struct vt_struct));
 
-   memset(&fbcon_driver, 0, sizeof(struct tty_driver)); 	
-   fbcon_driver.refcount = &fbcon_refcount;
-   fbcon_driver.table = fbcon_table;
-   fbcon_driver.termios = fbcon_termios;
-   fbcon_driver.termios_locked = fbcon_termios_locked;
-
    vt->kmalloced = 1;
    vt->vt_sw = &fb_con;
-   display_desc = create_vt(&fbcon_driver, vt, 0);
+   display_desc = create_vt(vt, 0);
  
    if (!display_desc) return -ENODEV; 
    printk("Console: %s %s %dx%d\n", vt->default_mode->vc_can_do_color ? "colour" : "mono",display_desc, vt->default_mode->vc_cols, vt->default_mode->vc_rows);

Index: mdacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/mdacon.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mdacon.c	2001/10/29 22:58:43	1.39
+++ mdacon.c	2001/12/08 00:58:07	1.40
@@ -67,12 +67,6 @@
 static enum { TYPE_MDA, TYPE_HERC, TYPE_HERCPLUS, TYPE_HERCCOLOR } mda_type;
 static char *mda_type_name;
 
-static struct tty_struct *mdacon_table[MAX_NR_USER_CONSOLES];
-static struct termios *mdacon_termios[MAX_NR_USER_CONSOLES];
-static struct termios *mdacon_termios_locked[MAX_NR_USER_CONSOLES];
-static int mdacon_refcount;
-struct tty_driver mdacon_driver;
-
 static struct vc_data mda_default;
 static struct vt_struct mda_vt;
 
@@ -591,12 +585,6 @@
 {
         const char *display_desc = NULL;
 
-        memset(&mdacon_driver, 0, sizeof(struct tty_driver));
-        mdacon_driver.refcount = &mdacon_refcount;
-        mdacon_driver.table = mdacon_table;
-        mdacon_driver.termios = mdacon_termios;
-        mdacon_driver.termios_locked = mdacon_termios_locked;
-
         memset(&mda_vt, 0, sizeof(struct vt_struct));
 #ifdef MODULE
         mda_vt.kmalloced = 1;
@@ -604,7 +592,7 @@
         mda_vt.kmalloced = 0;
 #endif
         mda_vt.vt_sw = &mda_con;
-        display_desc = create_vt(&mdacon_driver, &mda_vt, 1);
+        display_desc = create_vt(&mda_vt, 1);
         if (!display_desc) return -ENODEV;
         printk("Console: mono %s %dx%d\n", display_desc,
                 mda_vt.default_mode->vc_cols, mda_vt.default_mode->vc_rows);

Index: vgacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vgacon.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- vgacon.c	2001/12/07 00:56:47	1.58
+++ vgacon.c	2001/12/08 00:58:07	1.59
@@ -965,7 +965,7 @@
         vga_vt.kmalloced = 0;
 #endif
         vga_vt.vt_sw = &vga_con;
-        display_desc = create_vt(NULL, &vga_vt, 1);
+        display_desc = create_vt(&vga_vt, 1);
         if (!display_desc) return -ENODEV;
 	printk("Console: %s %s %dx%d\n",
                 vga_vt.default_mode->vc_can_do_color ? "colour" : "mono",