From owner-p4-projects@FreeBSD.ORG  Fri Jul 27 05:59:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CDADD16A419; Fri, 27 Jul 2007 05:59:37 +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 4C74016A417
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:59:37 +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 3F70313C458
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:59:37 +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 l6R5xb3a034209
	for <perforce@FreeBSD.org>; Fri, 27 Jul 2007 05:59:37 GMT
	(envelope-from loafier@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6R5xbt3034206
	for perforce@freebsd.org; Fri, 27 Jul 2007 05:59:37 GMT
	(envelope-from loafier@FreeBSD.org)
Date: Fri, 27 Jul 2007 05:59:37 GMT
Message-Id: <200707270559.l6R5xbt3034206@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 124159 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:59:38 -0000

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

Change 124159 by loafier@chrisdsoc on 2007/07/27 05:59:22

	Use pci_enable_io() to help determine whether to allocate memory or IO.

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/aureal.c#6 edit

Differences ...

==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/aureal.c#6 (text+ko) ====

@@ -562,6 +562,7 @@
 	struct au_info *sc;
 	struct ac97_info *codec;
 	char 		status[SND_STATUSLEN];
+	int mapped = 0;
 
 	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sc == NULL) {
@@ -571,17 +572,21 @@
 	sc->unit = device_get_unit(dev);
 
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
 
-	sc->spec = au_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 = au_res_spec_mem;
+		if (bus_alloc_resources(dev, sc->spec, sc->res) == 0) 
+			mapped++;
+	}
+	if (mapped == 0 && pci_enable_io(dev, SYS_RES_IOPORT) == 0) {
 		sc->spec = au_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++;
+	}		
+	if (mapped == 0) {
+		device_printf(dev, "unable to map register space\n");
+		goto bad;
+	}
 
 	au_wr4(sc, AU_REG_IRQEN, 0);
 	if (snd_setup_intr(dev, sc->res[RES_IRQ], 0, au_intr, sc, &sc->ih)) {