Module Name: src
Committed By: matt
Date: Fri Aug 31 01:45:22 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhcreg.h
Log Message:
Support deciphering SDHCv3 clock rates.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sdmmc/sdhcreg.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/sdhcreg.h
diff -u src/sys/dev/sdmmc/sdhcreg.h:1.8 src/sys/dev/sdmmc/sdhcreg.h:1.9
--- src/sys/dev/sdmmc/sdhcreg.h:1.8 Fri Jul 20 02:04:13 2012
+++ src/sys/dev/sdmmc/sdhcreg.h Fri Aug 31 01:45:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcreg.h,v 1.8 2012/07/20 02:04:13 matt Exp $ */
+/* $NetBSD: sdhcreg.h,v 1.9 2012/08/31 01:45:21 matt Exp $ */
/* $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $ */
/*
@@ -151,6 +151,7 @@
#define SDHC_MAX_BLK_LEN_MASK 0x3
#define SDHC_BASE_FREQ_SHIFT 8
#define SDHC_BASE_FREQ_MASK 0x3f
+#define SDHC_BASE_V3_FREQ_MASK 0xff
#define SDHC_TIMEOUT_FREQ_UNIT (1<<7) /* 0=KHz, 1=MHz */
#define SDHC_TIMEOUT_FREQ_SHIFT 0
#define SDHC_TIMEOUT_FREQ_MASK 0x1f
@@ -180,6 +181,8 @@
#define SDHC_SPEC_VERS_300 0x02
/* SDHC_CAPABILITIES decoding */
+#define SDHC_BASE_V3_FREQ_KHZ(cap) \
+ ((((cap) >> SDHC_BASE_FREQ_SHIFT) & SDHC_BASE_V3_FREQ_MASK) * 1000)
#define SDHC_BASE_FREQ_KHZ(cap) \
((((cap) >> SDHC_BASE_FREQ_SHIFT) & SDHC_BASE_FREQ_MASK) * 1000)
#define SDHC_TIMEOUT_FREQ(cap) \
