Module Name: src Committed By: jmcneill Date: Sun Aug 2 11:26:21 UTC 2015
Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: bus_dma_segment_t ds_addr is bus_addr_t not paddr_t To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/sdmmc/sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/sdmmc/sdhc.c diff -u src/sys/dev/sdmmc/sdhc.c:1.68 src/sys/dev/sdmmc/sdhc.c:1.69 --- src/sys/dev/sdmmc/sdhc.c:1.68 Sun Aug 2 07:14:10 2015 +++ src/sys/dev/sdmmc/sdhc.c Sun Aug 2 11:26:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.68 2015/08/02 07:14:10 mlelstv Exp $ */ +/* $NetBSD: sdhc.c,v 1.69 2015/08/02 11:26:21 jmcneill Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.68 2015/08/02 07:14:10 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.69 2015/08/02 11:26:21 jmcneill Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -1367,7 +1367,7 @@ sdhc_start_command(struct sdhc_host *hp, /* Set DMA start address. */ if (ISSET(hp->flags, SHF_USE_ADMA2_MASK) && cmd->c_datalen > 0) { for (int seg = 0; seg < cmd->c_dmamap->dm_nsegs; seg++) { - paddr_t paddr = + bus_addr_t paddr = cmd->c_dmamap->dm_segs[seg].ds_addr; uint16_t len = cmd->c_dmamap->dm_segs[seg].ds_len == 65536 ?