Module Name: src
Committed By: jakllsch
Date: Thu Jul 12 23:07:06 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
bus_space_*_stream_N() functions are not universally available.
Provite alternate implementation for when they are unavailable.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 src/sys/dev/sdmmc/sdhc.c:1.20
--- src/sys/dev/sdmmc/sdhc.c:1.19 Thu Jul 12 17:27:42 2012
+++ src/sys/dev/sdmmc/sdhc.c Thu Jul 12 23:07:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.19 2012/07/12 17:27:42 jakllsch Exp $ */
+/* $NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 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.19 2012/07/12 17:27:42 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1016,8 +1016,13 @@ sdhc_exec_command(sdmmc_chipset_handle_t
int i;
for (i = 0; i < 4; i++) {
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
*p++ = bus_space_read_stream_4(hp->iot, hp->ioh,
SDHC_RESPONSE + i * 4);
+#else
+ *p++ = htole32(bus_space_read_4(hp->iot, hp->ioh,
+ SDHC_RESPONSE + i * 4));
+#endif
if (!ISSET(cmd->c_flags, SCF_RSP_136))
break;
}
