diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-05-14 05:27:09 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-05-14 05:27:09 +0000 |
| commit | b0af64e71f7f6accd46bbbbe481d4753fd38cf21 (patch) | |
| tree | e09637df2fbc04b82708bc3f17fa3495d42772ec | |
| parent | 8af2607871d3a2f5bc92ce9fb095a23d7adab27b (diff) | |
| download | ChibiOS-b0af64e71f7f6accd46bbbbe481d4753fd38cf21.tar.gz ChibiOS-b0af64e71f7f6accd46bbbbe481d4753fd38cf21.tar.bz2 ChibiOS-b0af64e71f7f6accd46bbbbe481d4753fd38cf21.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2954 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103ZG/mcuconf.h | 7 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/sdc_lld.h | 11 | ||||
| -rw-r--r-- | testhal/STM32/SDIO/mcuconf.h | 7 |
3 files changed, 15 insertions, 10 deletions
diff --git a/demos/ARMCM3-STM32F103ZG/mcuconf.h b/demos/ARMCM3-STM32F103ZG/mcuconf.h index 87186fdaf..99c5f9391 100644 --- a/demos/ARMCM3-STM32F103ZG/mcuconf.h +++ b/demos/ARMCM3-STM32F103ZG/mcuconf.h @@ -104,6 +104,13 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7
/*
+ * SDC driver system settings.
+ */
+#define STM32_SDC_DATATIMEOUT 0x000FFFFF
+#define STM32_SDC_SDIO_DMA_PRIORITY 3
+#define STM32_SDC_SDIO_IRQ_PRIORITY 9
+
+/*
* SERIAL driver system settings.
*/
#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/os/hal/platforms/STM32/sdc_lld.h b/os/hal/platforms/STM32/sdc_lld.h index 96639eb39..4263e5d6d 100644 --- a/os/hal/platforms/STM32/sdc_lld.h +++ b/os/hal/platforms/STM32/sdc_lld.h @@ -51,7 +51,7 @@ * @brief SDIO DMA priority (0..3|lowest..highest).
*/
#if !defined(STM32_SDC_SDIO_DMA_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_SDC_SDIO_DMA_PRIORITY 2
+#define STM32_SDC_SDIO_DMA_PRIORITY 3
#endif
/**
@@ -61,15 +61,6 @@ #define STM32_SDC_SDIO_IRQ_PRIORITY 9
#endif
-/**
- * @brief SDIO DMA error hook.
- * @note The default action for DMA errors is a system halt because DMA
- * error can only happen because programming errors.
- */
-#if !defined(STM32_SDC_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
-#define STM32_SDC_DMA_ERROR_HOOK(sdcp) chSysHalt()
-#endif
-
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
diff --git a/testhal/STM32/SDIO/mcuconf.h b/testhal/STM32/SDIO/mcuconf.h index 87186fdaf..99c5f9391 100644 --- a/testhal/STM32/SDIO/mcuconf.h +++ b/testhal/STM32/SDIO/mcuconf.h @@ -104,6 +104,13 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7
/*
+ * SDC driver system settings.
+ */
+#define STM32_SDC_DATATIMEOUT 0x000FFFFF
+#define STM32_SDC_SDIO_DMA_PRIORITY 3
+#define STM32_SDC_SDIO_IRQ_PRIORITY 9
+
+/*
* SERIAL driver system settings.
*/
#define STM32_SERIAL_USE_USART1 TRUE
|