From owner-p4-projects@FreeBSD.ORG  Mon Jun 14 22:44:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B242316A4D1; Mon, 14 Jun 2004 22:44:01 +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 8ABD216A4CF
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:44:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C6B243D39
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:44:01 +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 i5EMhdpT042285
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:43:39 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5EMhdKj042282
	for perforce@freebsd.org; Mon, 14 Jun 2004 22:43:39 GMT
	(envelope-from jmallett@freebsd.org)
Date: Mon, 14 Jun 2004 22:43:39 GMT
Message-Id: <200406142243.i5EMhdKj042282@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 54961 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: Mon, 14 Jun 2004 22:44:02 -0000

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

Change 54961 by jmallett@jmallett_oingo on 2004/06/14 22:43:22

	Bring back IP22 vs. IP24 detection.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/ip22.c#9 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/ip22.c#9 (text+ko) ====

@@ -69,6 +69,20 @@
 ip22_init(void)
 {
 	u_int32_t address;
+	u_int32_t sysid;
+
+	sysid = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9858);
+ 
+	if (sysid & 1)
+		mach_subtype = MACH_SGI_IP22_FULLHOUSE;
+	else
+		mach_subtype = MACH_SGI_IP22_GUINESS;
+ 
+	mach_boardrev = (sysid >> 1) & 0x0f;
+ 
+	printf("IOC rev %d, machine %s, board rev %d\n", (sysid >> 5) & 0x07,
+			(sysid & 1) ? "Indigo2 (Fullhouse)" : "Indy (Guiness)",
+			(sysid >> 1) & 0x0f);
 
 	if (mach_type == MACH_SGI_IP22) {
 		printf("int: ");