From owner-p4-projects@FreeBSD.ORG  Sun May 13 21:19:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 23EF016A404; Sun, 13 May 2007 21:19:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D742B16A400
	for <perforce@freebsd.org>; Sun, 13 May 2007 21:19:22 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C831313C4B7
	for <perforce@freebsd.org>; Sun, 13 May 2007 21:19:22 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DLJMi7077391
	for <perforce@freebsd.org>; Sun, 13 May 2007 21:19:22 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DLJMB8077388
	for perforce@freebsd.org; Sun, 13 May 2007 21:19:22 GMT
	(envelope-from bms@incunabulum.net)
Date: Sun, 13 May 2007 21:19:22 GMT
Message-Id: <200705132119.l4DLJMB8077388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@incunabulum.net using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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 May 2007 21:19:23 -0000

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

Change 119796 by bms@bms_anglepoise on 2007/05/13 21:18:28

	catch up with recent changes

Affected files ...

.. //depot/projects/mips2/src/sys/dev/siba/siba.c#3 edit
.. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 edit

Differences ...

==== //depot/projects/mips2/src/sys/dev/siba/siba.c#3 (text+ko) ====

@@ -485,10 +485,10 @@
 	idlo = siba_read_4(sc, idx, SIBA_CORE_IDLO);
 	idhi = siba_read_4(sc, idx, SIBA_CORE_IDHI);
 
-	vendorid = (idhi & SSB_IDHIGH_VC) >> SSB_IDHIGH_VC_SHIFT;
+	vendorid = (idhi & SIBA_IDHIGH_VC) >> SIBA_IDHIGH_VC_SHIFT;
 	devid = ((idhi & 0x8ff0) >> 4);
-	rev = (idhi & SSB_IDHIGH_RCLO);
-	rev |= (idhi & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT;
+	rev = (idhi & SIBA_IDHIGH_RCLO);
+	rev |= (idhi & SIBA_IDHIGH_RCHI) >> SIBA_IDHIGH_RCHI_SHIFT;
 
 	sdi->sdi_vid = vendorid;
 	sdi->sdi_devid = devid;

==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 (text+ko) ====

@@ -6,10 +6,9 @@
 # which just need to be tweaked for attachment to an SSB system bus.
 
 dev/siba/siba.c					optional siba
-dev/siba/siba_cc.c				optional siba
 dev/siba/siba_pcib.c				optional siba pci
+mips/mips32/sentry5/siba_cc.c			optional siba
 
 #mips/mips32/sentry5/s5_machdep.c		standard
-
 # notyet
 #mips/mips32/sentry5/siba_mips.c			optional siba