From b0af64e71f7f6accd46bbbbe481d4753fd38cf21 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 14 May 2011 05:27:09 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2954
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM3-STM32F103ZG/mcuconf.h |  7 +++++++
 os/hal/platforms/STM32/sdc_lld.h   | 11 +----------
 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
@@ -103,6 +103,13 @@
 #define STM32_PWM_TIM4_IRQ_PRIORITY         7
 #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.
  */
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
@@ -103,6 +103,13 @@
 #define STM32_PWM_TIM4_IRQ_PRIORITY         7
 #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.
  */
-- 
cgit v1.2.3