Module Name: src
Committed By: matt
Date: Sat Jul 28 23:02:57 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
Only SDHC 1.0 controllers can do that fucky MULTI_SEG stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 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.27 src/sys/dev/sdmmc/sdhc.c:1.28
--- src/sys/dev/sdmmc/sdhc.c:1.27 Sat Jul 28 20:08:51 2012
+++ src/sys/dev/sdmmc/sdhc.c Sat Jul 28 23:02:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.27 2012/07/28 20:08:51 jakllsch Exp $ */
+/* $NetBSD: sdhc.c,v 1.28 2012/07/28 23:02:57 matt 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.27 2012/07/28 20:08:51 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.28 2012/07/28 23:02:57 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -301,10 +301,9 @@ sdhc_host_found(struct sdhc_softc *sc, b
}
/* Use DMA if the host system and the controller support it. */
- if ((hp->specver == SDHC_SPEC_VERS_100) &&
- (ISSET(sc->sc_flags, SDHC_FLAG_FORCE_DMA) ||
+ if (ISSET(sc->sc_flags, SDHC_FLAG_FORCE_DMA) ||
(ISSET(sc->sc_flags, SDHC_FLAG_USE_DMA &&
- ISSET(caps, SDHC_DMA_SUPPORT))))) {
+ ISSET(caps, SDHC_DMA_SUPPORT)))) {
SET(hp->flags, SHF_USE_DMA);
aprint_normal_dev(sc->sc_dev, "using DMA transfer\n");
}
@@ -405,7 +404,10 @@ sdhc_host_found(struct sdhc_softc *sc, b
if (ISSET(caps, SDHC_HIGH_SPEED_SUPP))
saa.saa_caps |= SMC_CAPS_SD_HIGHSPEED;
if (ISSET(hp->flags, SHF_USE_DMA)) {
- saa.saa_caps |= SMC_CAPS_DMA | SMC_CAPS_MULTI_SEG_DMA;
+ saa.saa_caps |= SMC_CAPS_DMA;
+ if (hp->specver == SDHC_SPEC_VERS_100) {
+ saa.saa_caps |= SMC_CAPS_MULTI_SEG_DMA;
+ }
}
hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint);
