Date: Tue, 31 Jul 2007 15:05:28 GMT From: Christopher Davis <loafier@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 124426 for review Message-ID: <200707311505.l6VF5SYt051485@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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[] = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707311505.l6VF5SYt051485>