From owner-p4-projects@FreeBSD.ORG  Thu Jun  7 02:30:34 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 7676716A46B; Thu,  7 Jun 2007 02:30:34 +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 2B04A16A400
	for <perforce@freebsd.org>; Thu,  7 Jun 2007 02:30:34 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 03B4913C4BA
	for <perforce@freebsd.org>; Thu,  7 Jun 2007 02:30:34 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l572UXSn063112
	for <perforce@freebsd.org>; Thu, 7 Jun 2007 02:30:33 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l572UXaq063095
	for perforce@freebsd.org; Thu, 7 Jun 2007 02:30:33 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 7 Jun 2007 02:30:33 GMT
Message-Id: <200706070230.l572UXaq063095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121117 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: Thu, 07 Jun 2007 02:30:34 -0000

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

Change 121117 by peter@peter_daintree on 2007/06/07 02:29:20

	Unbreak the timedia boards after the great puc rewrite.
	Bad Marcel!  No cookie!
	pci BARs start at 0x10, not 0.

Affected files ...

.. //depot/projects/hammer/sys/dev/puc/pucdata.c#28 edit

Differences ...

==== //depot/projects/hammer/sys/dev/puc/pucdata.c#28 (text+ko) ====

@@ -1110,7 +1110,7 @@
 		*res = (port == 1 || port == 3) ? 8 : 0;
 		return (0);
 	case PUC_CFG_GET_RID:
-		*res = (port > 3) ? port - 2 : port >> 1;
+		*res = 0x10 + ((port > 3) ? port - 2 : port >> 1);
 		return (0);
 	case PUC_CFG_GET_TYPE:
 		*res = PUC_TYPE_SERIAL;