Module Name: src
Committed By: kiyohara
Date: Mon Sep 20 09:19:31 UTC 2010
Modified Files:
src/sys/dev/sdmmc: sdmmc_mem.c
Log Message:
Sync with POSTREAD before memcpy.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sdmmc/sdmmc_mem.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/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.5 src/sys/dev/sdmmc/sdmmc_mem.c:1.6
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.5 Sat May 1 21:14:39 2010
+++ src/sys/dev/sdmmc/sdmmc_mem.c Mon Sep 20 09:19:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.5 2010/05/01 21:14:39 reinoud Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.6 2010/09/20 09:19:31 kiyohara Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -46,7 +46,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.5 2010/05/01 21:14:39 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.6 2010/09/20 09:19:31 kiyohara Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -686,11 +686,11 @@
error = sdmmc_app_command(sc, sf, &cmd);
if (error == 0) {
- memcpy(scr, ptr, datalen);
if (ISSET(sc->sc_caps, SMC_CAPS_DMA)) {
bus_dmamap_sync(sc->sc_dmat, sc->sc_dmap, 0, datalen,
BUS_DMASYNC_POSTREAD);
}
+ memcpy(scr, ptr, datalen);
}
out:
@@ -788,11 +788,11 @@
error = sdmmc_mmc_command(sc, &cmd);
if (error == 0) {
- memcpy(data, ptr, datalen);
if (ISSET(sc->sc_caps, SMC_CAPS_DMA)) {
bus_dmamap_sync(sc->sc_dmat, sc->sc_dmap, 0, datalen,
BUS_DMASYNC_POSTREAD);
}
+ memcpy(data, ptr, datalen);
}
out:
