From owner-p4-projects@FreeBSD.ORG  Tue Jul 31 15:05:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F6EC16A46B; Tue, 31 Jul 2007 15:05:29 +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 0FE3616A41A
	for <perforce@FreeBSD.org>; Tue, 31 Jul 2007 15:05:29 +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 EA69D13C481
	for <perforce@FreeBSD.org>; Tue, 31 Jul 2007 15:05:28 +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 l6VF5SOb051488
	for <perforce@FreeBSD.org>; Tue, 31 Jul 2007 15:05:28 GMT
	(envelope-from loafier@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6VF5SYt051485
	for perforce@freebsd.org; Tue, 31 Jul 2007 15:05:28 GMT
	(envelope-from loafier@FreeBSD.org)
Date: Tue, 31 Jul 2007 15:05:28 GMT
Message-Id: <200707311505.l6VF5SYt051485@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 124426 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: Tue, 31 Jul 2007 15:05:29 -0000

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

Change 124426 by loafier@chrisdsoc on 2007/07/31 15:05:02

	Edit tags, handles, read/write

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/csa.c#2 edit

Differences ...

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

@@ -236,7 +236,6 @@
 static int
 csa_attach(device_t dev)
 {
-	u_int32_t stcmd;
 	sc_p scp;
 	csa_res *resp;
 	struct sndcard_func *func;
@@ -249,11 +248,8 @@
 	scp->dev = dev;
 
 	/* Wake up the device. */
-	stcmd = pci_read_config(dev, PCIR_COMMAND, 2);
-	if ((stcmd & PCIM_CMD_MEMEN) == 0 || (stcmd & PCIM_CMD_BUSMASTEREN) == 0) {
-		stcmd |= (PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN);
-		pci_write_config(dev, PCIR_COMMAND, stcmd, 2);
-	}
+	pci_enable_busmaster(dev);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 
 	/* Allocate the resources. */
 	resp = &scp->res;
@@ -1032,7 +1028,7 @@
 	u_int32_t ul;
 
 	if (offset < BA0_AC97_RESET)
-		return bus_space_read_4(rman_get_bustag(resp->io), rman_get_bushandle(resp->io), offset) & 0xffffffff;
+		return bus_read_4(resp->io, offset) & 0xffffffff;
 	else {
 		if (csa_readcodec(resp, offset, &ul))
 			ul = 0;
@@ -1044,7 +1040,7 @@
 csa_writeio(csa_res *resp, u_long offset, u_int32_t data)
 {
 	if (offset < BA0_AC97_RESET)
-		bus_space_write_4(rman_get_bustag(resp->io), rman_get_bushandle(resp->io), offset, data);
+		bus_write_4(resp->io, offset, data);
 	else
 		csa_writecodec(resp, offset, data);
 }
@@ -1052,13 +1048,13 @@
 u_int32_t
 csa_readmem(csa_res *resp, u_long offset)
 {
-	return bus_space_read_4(rman_get_bustag(resp->mem), rman_get_bushandle(resp->mem), offset);
+	return bus_read_4(resp->mem, offset);
 }
 
 void
 csa_writemem(csa_res *resp, u_long offset, u_int32_t data)
 {
-	bus_space_write_4(rman_get_bustag(resp->mem), rman_get_bushandle(resp->mem), offset, data);
+	bus_write_4(resp->mem, offset, data);
 }
 
 static device_method_t csa_methods[] = {