svn commit: r190091 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb isa

[John Baldwin]

Author: jhb
Date: Thu Mar 19 17:46:51 2009
New Revision: 190091
URL: http://svn.freebsd.org/changeset/base/190091

Log:
  MFC: Allow syscons to work on amd64 and i386 without any hints.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/isa/syscons_isa.c

Modified: stable/7/sys/isa/syscons_isa.c
==============================================================================
--- stable/7/sys/isa/syscons_isa.c	Thu Mar 19 17:42:11 2009	(r190090)
+++ stable/7/sys/isa/syscons_isa.c	Thu Mar 19 17:46:51 2009	(r190091)
@@ -103,7 +103,9 @@ scprobe(device_t dev)
 static int
 scattach(device_t dev)
 {
-	return sc_attach_unit(device_get_unit(dev), device_get_flags(dev));
+
+	return (sc_attach_unit(device_get_unit(dev), device_get_flags(dev) |
+	    SC_AUTODETECT_KBD));
 }
 
 static int
@@ -240,8 +242,10 @@ sc_get_cons_priority(int *unit, int *fla
 			*flags = f;
 		}
 	}
-	if (*unit < 0)
-		return CN_DEAD;
+	if (*unit < 0) {
+		*unit = 0;
+		*flags = 0;
+	}
 #if 0
 	return ((*flags & SC_KERNEL_CONSOLE) ? CN_INTERNAL : CN_NORMAL);
 #endif