From owner-p4-projects@FreeBSD.ORG  Mon May 14 21:31:07 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 4F9A516A408; Mon, 14 May 2007 21:31:07 +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 E160116A405
	for <perforce@freebsd.org>; Mon, 14 May 2007 21:31:06 +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 D251713C458
	for <perforce@freebsd.org>; Mon, 14 May 2007 21:31:06 +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 l4ELV6Tf030077
	for <perforce@freebsd.org>; Mon, 14 May 2007 21:31:06 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ELV6LC030039
	for perforce@freebsd.org; Mon, 14 May 2007 21:31:06 GMT
	(envelope-from bms@incunabulum.net)
Date: Mon, 14 May 2007 21:31:06 GMT
Message-Id: <200705142131.l4ELV6LC030039@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 119854 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: Mon, 14 May 2007 21:31:07 -0000

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

Change 119854 by bms@bms_anglepoise on 2007/05/14 21:30:28

	build ehci and uhci drivers in (to exercise pci attachment).
	Try byte-swapping endianness of 32 bit reads from PCI
	configuration space.

Affected files ...

.. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#4 edit
.. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 edit

Differences ...

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

@@ -372,9 +372,7 @@
 	printf("reading 4 bytes from %08x\n", cfgaddr);
 	val = *(volatile uint32_t *)MIPS_PHYS_TO_KSEG1(cfgaddr); /* XXX MIPS */
 
-	// this is just...odd. it doesn't look right.
-
-	//val = bswap32(val);	/* XXX ? */
+	val = bswap32(val);	/* XXX seems to be needed for now */
 
 	/* swizzle and return what was asked for */
 	val &= 0xffffffff >> ((4 - bytes) * 8);

==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 (text+ko) ====

@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#7 $
+# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 $
 #
 # The Broadcom Sentry5 series of processors and boards is very commonly
 # used in COTS hardware including the Netgear WGT634U.
@@ -75,6 +75,18 @@
 device		bfe			# XXX will build both pci and siba
 device		miibus			# attachments
 
+# pci devices
+# notyet:
+#device		ath			# in pci slot
+#device		ath_hal			# in pci slot
+
+device		usb			# USB Bus (required)
+device		uhci			# UHCI PCI->USB interface
+device		ehci			# EHCI PCI->USB interface (USB 2.0)
+
+# need to teach the code to ignore the bridge....
+
+
 # XXX notyet; need to be auto probed children of siba_cc.
 #device		uart
 #device		uart_ns8250