aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-05-22 18:52:25 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-05-22 18:52:25 +0000
commitbbea7269342e2418fd57a567d6d842b39e572f23 (patch)
tree6340cd129edaf38d617a7d247ee9e125fa42742d /os
parent8e0b313cc4dcc9c2572252a6e12c65a1694fae53 (diff)
downloadChibiOS-bbea7269342e2418fd57a567d6d842b39e572f23.tar.gz
ChibiOS-bbea7269342e2418fd57a567d6d842b39e572f23.tar.bz2
ChibiOS-bbea7269342e2418fd57a567d6d842b39e572f23.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4228 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/platforms/STM32/sdc_lld.h4
-rw-r--r--os/hal/platforms/STM32F2xx/hal_lld.h2
-rw-r--r--os/hal/platforms/STM32F4xx/hal_lld.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/os/hal/platforms/STM32/sdc_lld.h b/os/hal/platforms/STM32/sdc_lld.h
index 292688e40..a2cb6472d 100644
--- a/os/hal/platforms/STM32/sdc_lld.h
+++ b/os/hal/platforms/STM32/sdc_lld.h
@@ -145,6 +145,10 @@
* @brief SDIO data timeouts in SDIO clock cycles.
*/
#if (defined(STM32F4XX) || defined(STM32F2XX))
+#if !STM32_CLOCK48_REQUIRED
+#error "SDIO requires STM32_CLOCK48_REQUIRED to be enabled"
+#endif
+
#define STM32_SDC_WRITE_TIMEOUT \
(((STM32_PLL48CLK / (STM32_SDIO_DIV_HS + 2)) / 1000) * SDC_WRITE_TIMEOUT_MS)
#define STM32_SDC_READ_TIMEOUT \
diff --git a/os/hal/platforms/STM32F2xx/hal_lld.h b/os/hal/platforms/STM32F2xx/hal_lld.h
index 09a1be836..e704b7fa2 100644
--- a/os/hal/platforms/STM32F2xx/hal_lld.h
+++ b/os/hal/platforms/STM32F2xx/hal_lld.h
@@ -596,7 +596,7 @@
#endif
/**
- * @brief USB clock setting.
+ * @brief USB/SDIO clock setting.
*/
#if !defined(STM32_CLOCK48_REQUIRED) || defined(__DOXYGEN__)
#define STM32_CLOCK48_REQUIRED TRUE
diff --git a/os/hal/platforms/STM32F4xx/hal_lld.h b/os/hal/platforms/STM32F4xx/hal_lld.h
index d7485ade1..6cde89012 100644
--- a/os/hal/platforms/STM32F4xx/hal_lld.h
+++ b/os/hal/platforms/STM32F4xx/hal_lld.h
@@ -602,7 +602,7 @@
#endif
/**
- * @brief USB clock setting.
+ * @brief USB/SDIO clock setting.
*/
#if !defined(STM32_CLOCK48_REQUIRED) || defined(__DOXYGEN__)
#define STM32_CLOCK48_REQUIRED TRUE