From owner-svn-src-head@FreeBSD.ORG  Thu Mar  5 19:10:18 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01C4E1065676;
	Thu,  5 Mar 2009 19:10:18 +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 E40098FC0A;
	Thu,  5 Mar 2009 19:10:17 +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 n25JAHBY096976;
	Thu, 5 Mar 2009 19:10:17 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n25JAHUb096975;
	Thu, 5 Mar 2009 19:10:17 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903051910.n25JAHUb096975@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Mar 2009 19:10:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189421 - head/sys/isa
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2009 19:10:18 -0000

Author: jhb
Date: Thu Mar  5 19:10:17 2009
New Revision: 189421
URL: http://svn.freebsd.org/changeset/base/189421

Log:
  Allow syscons to work on amd64 and i386 without any hints:
  - Enable keyboard autodetection by default for ISA syscons attachments.
  - If there are no syscons hints at all, assume there is a single sc0 device
    anyway.  The console probe will still fail unless a VGA adapter is found.
  
  MFC after:	2 weeks

Modified:
  head/sys/isa/syscons_isa.c

Modified: head/sys/isa/syscons_isa.c
==============================================================================
--- head/sys/isa/syscons_isa.c	Thu Mar  5 18:43:54 2009	(r189420)
+++ head/sys/isa/syscons_isa.c	Thu Mar  5 19:10:17 2009	(r189421)
@@ -101,7 +101,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
@@ -238,8 +240,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