Module Name: src
Committed By: jmcneill
Date: Sun Aug 2 11:28:01 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 (another case of it)
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 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.69 src/sys/dev/sdmmc/sdhc.c:1.70
--- src/sys/dev/sdmmc/sdhc.c:1.69 Sun Aug 2 11:26:21 2015
+++ src/sys/dev/sdmmc/sdhc.c Sun Aug 2 11:28:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.69 2015/08/02 11:26:21 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.70 2015/08/02 11:28:01 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.69 2015/08/02 11:26:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.70 2015/08/02 11:28:01 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1405,7 +1405,7 @@ sdhc_start_command(struct sdhc_host *hp,
HCLR1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT);
HSET1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT_ADMA2);
- const paddr_t desc_addr = hp->adma_map->dm_segs[0].ds_addr;
+ const bus_addr_t desc_addr = hp->adma_map->dm_segs[0].ds_addr;
HWRITE4(hp, SDHC_ADMA_SYSTEM_ADDR, desc_addr & 0xffffffff);
if (ISSET(hp->flags, SHF_USE_ADMA2_64)) {
