patch-2.4.0-test10 linux/drivers/char/console.c

• Lines: 151
• Date: Mon Oct 16 12:59:22 2000
• Orig file: v2.4.0-test9/linux/drivers/char/console.c
• Orig date: Wed Aug 9 14:18:26 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -108,7 +108,7 @@
 #include "console_macros.h"
 
 
-struct consw *conswitchp = NULL;
+const struct consw *conswitchp;
 
 /* A bitmap for codes <32. A bit of 1 indicates that the code
  * corresponding to that bit number invokes some special action
@@ -136,7 +136,7 @@
 struct vc vc_cons [MAX_NR_CONSOLES];
 
 #ifndef VT_SINGLE_DRIVER
-static struct consw *con_driver_map[MAX_NR_CONSOLES];
+static const struct consw *con_driver_map[MAX_NR_CONSOLES];
 #endif
 
 static int con_open(struct tty_struct *, struct file *);
@@ -152,14 +152,14 @@
 static void hide_cursor(int currcons);
 static void unblank_screen_t(unsigned long dummy);
 
-static int printable = 0;		/* Is console ready for printing? */
+static int printable;		/* Is console ready for printing? */
 
-int do_poke_blanked_console = 0;
-int console_blanked = 0;
+int do_poke_blanked_console;
+int console_blanked;
 
-static int vesa_blank_mode = 0; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
+static int vesa_blank_mode; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
 static int blankinterval = 10*60*HZ;
-static int vesa_off_interval = 0;
+static int vesa_off_interval;
 
 /*
  * fg_console is the current virtual console,
@@ -167,10 +167,10 @@
  * want_console is the console we want to switch to,
  * kmsg_redirect is the console for kernel messages,
  */
-int fg_console = 0;
-int last_console = 0;
+int fg_console;
+int last_console;
 int want_console = -1;
-int kmsg_redirect = 0;
+int kmsg_redirect;
 
 /*
  * For each existing display, we have a pointer to console currently visible
@@ -178,7 +178,7 @@
  * appropriately. Unless the low-level driver supplies its own display_fg
  * variable, we use this one for the "master display".
  */
-static struct vc_data *master_display_fg = NULL;
+static struct vc_data *master_display_fg;
 
 /*
  * Unfortunately, we need to delay tty echo when we're currently writing to the
@@ -192,13 +192,13 @@
 /*
  * For the same reason, we defer scrollback to the console tasklet.
  */
-static int scrollback_delta = 0;
+static int scrollback_delta;
 
 /*
  * Hook so that the power management routines can (un)blank
  * the console on our behalf.
  */
-int (*console_blank_hook)(int) = NULL;
+int (*console_blank_hook)(int);
 
 static struct timer_list console_timer;
 
@@ -216,7 +216,7 @@
 #endif
 
 static int pm_con_request(struct pm_dev *dev, pm_request_t rqst, void *data);
-static struct pm_dev *pm_con = NULL;
+static struct pm_dev *pm_con;
 
 static inline unsigned short *screenpos(int currcons, int offset, int viewed)
 {
@@ -415,9 +415,9 @@
 /* used by selection: complement pointer position */
 void complement_pos(int currcons, int offset)
 {
-	static unsigned short *p = NULL;
-	static unsigned short old = 0;
-	static unsigned short oldx = 0, oldy = 0;
+	static unsigned short *p;
+	static unsigned short old;
+	static unsigned short oldx, oldy;
 
 	if (p) {
 		scr_writew(old, p);
@@ -2056,7 +2056,7 @@
 {
 	int currcons = fg_console;
 	unsigned char c;
-	static unsigned long printing = 0;
+	static unsigned long printing;
 	const ushort *start;
 	ushort cnt = 0;
 	ushort myx;
@@ -2147,17 +2147,13 @@
 }
 
 struct console vt_console_driver = {
-	"tty",
-	vt_console_print,
-	NULL,
-	vt_console_device,
-	keyboard_wait_for_keypress,
-	unblank_screen,
-	NULL,
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"tty",
+	write:		vt_console_print,
+	device:		vt_console_device,
+	wait_key:	keyboard_wait_for_keypress,
+	unblank:	unblank_screen,
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };
 #endif
 
@@ -2484,7 +2480,7 @@
  *	and become default driver for newly opened ones.
  */
 
-void take_over_console(struct consw *csw, int first, int last, int deflt)
+void take_over_console(const struct consw *csw, int first, int last, int deflt)
 {
 	int i, j = -1;
 	const char *desc;
@@ -2532,7 +2528,7 @@
 		printk("to %s\n", desc);
 }
 
-void give_up_console(struct consw *csw)
+void give_up_console(const struct consw *csw)
 {
 	int i;