From owner-p4-projects@FreeBSD.ORG  Fri Jul 27 05:43:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3119116A41B; Fri, 27 Jul 2007 05:43:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91F5F16A417
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:43:39 +0000 (UTC)
	(envelope-from loafier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 84F0813C46C
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:43:39 +0000 (UTC)
	(envelope-from loafier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6R5hdPT033229
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:43:39 GMT
	(envelope-from loafier@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6R5hd4T033226
	for perforce@freebsd.org; Fri, 27 Jul 2007 05:43:39 GMT
	(envelope-from loafier@FreeBSD.org)
Date: Fri, 27 Jul 2007 05:43:39 GMT
Message-Id: <200707270543.l6R5hd4T033226@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	loafier@FreeBSD.org using -f
From: Christopher Davis <loafier@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124155 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: Fri, 27 Jul 2007 05:43:40 -0000

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

Change 124155 by loafier@chrisdsoc on 2007/07/27 05:43:02

	Use return value from pci_enable_io() to help determine whether to 
	allocate memory or io ports.

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/src/share/examples/drivers/template.c#2 edit

Differences ...

==== //depot/projects/soc2007/loafier_busalloc/src/share/examples/drivers/template.c#2 (text+ko) ====

@@ -534,6 +534,7 @@
 static int
 XX_pci_attach(device_t dev)
 {
+	int mapped = 0;
 	struct sc_info *sc;
 	struct ac97_info *codec;
 	uint32_t data;
@@ -551,16 +552,20 @@
 	/* power up */
 	pci_set_powerstate(dev, PCI_POWERSTATE_D0);
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	pci_enable_io(dev, SYS_RES_IOPORT);
 
-	sc->spec = XX_res_spec_mem;
-	if (bus_alloc_resources(dev, sc->spec, sc->res) != 0) {
+	if (mapped == 0 && pci_enable_io(dev, SYS_RES_MEMORY) == 0) {
+		sc->spec = XX_res_spec_mem;
+		if (bus_alloc_resources(dev, sc->spec, sc->res) != 0)
+			mapped = 1;
+	}
+	if (mapped == 0 && pci_enable_io(dev, SYS_RES_IOPORT) == 0) { 
 		sc->spec = XX_res_spec_io;
-		if (bus_alloc_resources(dev, sc->spec, sc->res) != 0) {
-			device_printf(dev, "unable to allocate resources\n");
-			goto bad;
-		}
+		if (bus_alloc_resources(dev, sc->spec, sc->res) != 0) 
+			mapped = 1;
+	}
+	if (mapped == 0) {
+		device_printf(dev, "unable to allocate resources\n");
+		goto bad;
 	}
 
 	/*