Update of /cvsroot/linuxconsole/ruby/linux/arch/mips64/sgi-ip22
In directory usw-pr-cvs1:/tmp/cvs-serv25708/linux/arch/mips64/sgi-ip22
Modified Files:
ip22-setup.c
Log Message:
Synced to 2.4.10
Index: ip22-setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips64/sgi-ip22/ip22-setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ip22-setup.c 2001/05/12 22:12:06 1.6
+++ ip22-setup.c 2001/10/06 16:11:12 1.7
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -67,7 +66,7 @@
* graphics console, it is set to "d" for the first serial
* line and "d2" for the second serial line.
*/
- ctype = ArcArcGetEnvironmentVariable("console");
+ ctype = ArcGetEnvironmentVariable("console");
if(*ctype == 'd') {
if(*(ctype+1)=='2')
console_setup ("ttyS1");
@@ -82,7 +81,30 @@
ip22_volume_set(simple_strtoul(ArcGetEnvironmentVariable("volume"),
NULL, 10));
+#ifdef CONFIG_VT
+#ifdef CONFIG_SGI_NEWPORT_CONSOLE
+ conswitchp = &newport_con;
+
+ screen_info = (struct screen_info) {
+ 0, 0, /* orig-x, orig-y */
+ 0, /* unused */
+ 0, /* orig_video_page */
+ 0, /* orig_video_mode */
+ 160, /* orig_video_cols */
+ 0, 0, 0, /* unused, ega_bx, unused */
+ 64, /* orig_video_lines */
+ 0, /* orig_video_isVGA */
+ 16 /* orig_video_points */
+ };
+#else
+ conswitchp = &dummy_con;
+#endif
+#endif
rtc_ops = &indy_rtc_ops;
+ kbd_ops = &sgi_kbd_ops;
+#ifdef CONFIG_PSMOUSE
+ aux_device_present = 0xaa;
+#endif
#ifdef CONFIG_VIDEO_VINO
init_vino();
#endif
|
