From owner-svn-src-all@FreeBSD.ORG  Thu Mar 19 17:46:52 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27C45106574B;
	Thu, 19 Mar 2009 17:46:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 14B2A8FC0C;
	Thu, 19 Mar 2009 17:46:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JHkpoU071019;
	Thu, 19 Mar 2009 17:46:51 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JHkpoM071018;
	Thu, 19 Mar 2009 17:46:51 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903191746.n2JHkpoM071018@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 19 Mar 2009 17:46:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190091 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb isa
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Mar 2009 17:46:53 -0000

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