Module Name: src
Committed By: jakllsch
Date: Tue Jan 8 19:36:39 UTC 2013
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
If the command protocol calls for a trailing busy signal,
wait (up to 10 seconds) for it to be released.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 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.41 src/sys/dev/sdmmc/sdhc.c:1.42
--- src/sys/dev/sdmmc/sdhc.c:1.41 Mon Jan 7 02:56:24 2013
+++ src/sys/dev/sdmmc/sdhc.c Tue Jan 8 19:36:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.41 2013/01/07 02:56:24 jakllsch Exp $ */
+/* $NetBSD: sdhc.c,v 1.42 2013/01/08 19:36:38 jakllsch 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.41 2013/01/07 02:56:24 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.42 2013/01/08 19:36:38 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1127,6 +1127,12 @@ sdhc_exec_command(sdmmc_chipset_handle_t
*/
if (cmd->c_error == 0 && cmd->c_data != NULL)
sdhc_transfer_data(hp, cmd);
+ else if (ISSET(cmd->c_flags, SCF_RSP_BSY)) {
+ if (!sdhc_wait_intr(hp, SDHC_TRANSFER_COMPLETE, hz * 10)) {
+ cmd->c_error = ETIMEDOUT;
+ goto out;
+ }
+ }
out:
if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)
