Module Name: src
Committed By: nonaka
Date: Sun Feb 13 07:25:56 UTC 2011
Modified Files:
src/sys/dev/sdmmc: sdmmc_mem.c sdmmcreg.h
Log Message:
use MMC_CSD_CSDVER_EXT_CSD.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sdmmcreg.h
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.16 src/sys/dev/sdmmc/sdmmc_mem.c:1.17
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.16 Sun Feb 13 06:43:52 2011
+++ src/sys/dev/sdmmc/sdmmc_mem.c Sun Feb 13 07:25:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.16 2011/02/13 06:43:52 nonaka Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka 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.16 2011/02/13 06:43:52 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -685,7 +685,7 @@
aprint_error_dev(sc->sc_dev, "can't read EXT_CSD\n");
return error;
}
- if ((sf->csd.csdver == 3) &&
+ if ((sf->csd.csdver == MMC_CSD_CSDVER_EXT_CSD) &&
(ext_csd[EXT_CSD_STRUCTURE] > EXT_CSD_STRUCTURE_VER_1_2)) {
aprint_error_dev(sc->sc_dev,
"unrecognised future version (%d)\n",
Index: src/sys/dev/sdmmc/sdmmcreg.h
diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.6 src/sys/dev/sdmmc/sdmmcreg.h:1.7
--- src/sys/dev/sdmmc/sdmmcreg.h:1.6 Sun Feb 13 06:43:52 2011
+++ src/sys/dev/sdmmc/sdmmcreg.h Sun Feb 13 07:25:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcreg.h,v 1.6 2011/02/13 06:43:52 nonaka Exp $ */
+/* $NetBSD: sdmmcreg.h,v 1.7 2011/02/13 07:25:56 nonaka Exp $ */
/* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -165,6 +165,7 @@
#define MMC_CSD_CSDVER_1_0 0
#define MMC_CSD_CSDVER_1_1 1
#define MMC_CSD_CSDVER_1_2 2 /* MMC 4.1 - 4.2 - 4.3 */
+#define MMC_CSD_CSDVER_EXT_CSD 3 /* Version is coded in CSD_STRUCTURE in EXT_CSD */
#define MMC_CSD_MMCVER(resp) MMC_RSP_BITS((resp), 122, 4)
#define MMC_CSD_MMCVER_1_0 0 /* MMC 1.0 - 1.2 */
#define MMC_CSD_MMCVER_1_4 1 /* MMC 1.4 */
