[src/netbsd-2-0]: src/sys/arch/sgimips/dev Pull up revision 1.23 (requested b...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95e3347604bb
branches:  netbsd-2-0
changeset: 562138:95e3347604bb
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jul 23 06:56:48 2004 +0000

description:
Pull up revision 1.23 (requested by rumble in ticket #682):
At least my IP12 works better without the port-flipping glue,
so un-glueify IP12 for the time being.

diffstat:

 sys/arch/sgimips/dev/zs.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 1764e916b0d9 -r 95e3347604bb sys/arch/sgimips/dev/zs.c
--- a/sys/arch/sgimips/dev/zs.c Fri Jul 23 06:56:12 2004 +0000
+++ b/sys/arch/sgimips/dev/zs.c Fri Jul 23 06:56:48 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.22 2004/01/18 13:00:05 sekiya Exp $   */
+/*     $NetBSD: zs.c,v 1.22.2.1 2004/07/23 06:56:48 tron Exp $ */
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2004/01/18 13:00:05 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.2.1 2004/07/23 06:56:48 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -701,8 +701,16 @@
 
        cons_port = consdev[7] - '0';
 
+#if 0
+       /*
+        * If your IP12 serial console goes missing after consinit(),
+        * try flipping this the other way 'round.  If there are some
+        * IP12 machines that actually require this, we'll be in for
+        * a lot of funnies once again...
+        */
        if (mach_type == MACH_SGI_IP12)
                cons_port = 1 - cons_port;
+#endif
 
        cn->cn_dev = makedev(cdevsw_lookup_major(&zstty_cdevsw), cons_port);
        cn->cn_pri = CN_REMOTE;