From owner-p4-projects@FreeBSD.ORG  Sun Jun 13 10:19:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BDCBE16A4D1; Sun, 13 Jun 2004 10:19:24 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 92ED016A4CE
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:19:24 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8C92D43D49
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:19:24 +0000 (GMT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5DAH86x097558
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 10:17:08 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5DAH8WI097555
	for perforce@freebsd.org; Sun, 13 Jun 2004 10:17:08 GMT
	(envelope-from jmallett@freebsd.org)
Date: Sun, 13 Jun 2004 10:17:08 GMT
Message-Id: <200406131017.i5DAH8WI097555@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54807 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jun 2004 10:19:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=54807

Change 54807 by jmallett@jmallett_oingo on 2004/06/13 10:16:25

	Don't believe the lies of the IP24!
	
	Submitted by:	Anders Gavare md1gavan at mdstud.chalmers.se

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#6 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#5 $
+ * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#6 $
  */
 
 #include <sys/cdefs.h>
@@ -104,6 +104,9 @@
 	uint32_t sysid;
 
 	sysid = IMC_READ_4(imc_port, IMC_SYSID);
+	/* IP24 lies about having EISA.  Don't believe its sugary-sweet lies! */
+	if (mach_subtype == MACH_SGI_IP22_GUINESS)
+		sysid &= ~IMC_SYSID_HAVEISA;
 	device_printf(dev, "revision %d, EISA %s\n", sysid & IMC_SYSID_REVMASK,
 		      sysid & IMC_SYSID_HAVEISA ?  "present" : "not present");