Some smaller adc stuff for mcal tests 5606s

diff --git a/arch/ppc/mpc55xx/drivers/Adc.c b/arch/ppc/mpc55xx/drivers/Adc.c
index 7954f6cfa575632f7213a964deef422fdbe006a2..df59a51ee7a23222a274c2f7b62049149bcd81f7 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc.c
+++ b/arch/ppc/mpc55xx/drivers/Adc.c
@@ -13,18 +13,6 @@
  * for more details.\r
  * -------------------------------- Arctic Core ------------------------------*/\r
 \r
-\r
-/* Are we gonna use Dma? */\r
-#if (  !defined(CFG_MPC5606S) || \\r
-      ( defined(CFG_MPC5606S) && !defined(DONT_USE_DMA_IN_ADC_MPC5606S) ) )\r
-       #define ADC_USES_DMA\r
-#endif\r
-\r
-#if ( defined(ADC_USES_DMA) && !defined(USE_DMA) )\r
-       #error Adc is configured to use Dma but the module is not enabled.\r
-#endif\r
-\r
-\r
 #include <assert.h>\r
 #include <stdlib.h>\r
 //#include "System.h"\r
@@ -32,15 +20,26 @@
 #include "Modules.h"\r
 #include "Mcu.h"\r
 #include "Adc.h"\r
-#if defined(ADC_USES_DMA)\r
-#include "Dma.h"\r
-#endif\r
 #include "Det.h"\r
 #include "Os.h"\r
 #include "isr.h"\r
 #include "irq.h"\r
 #include "arc.h"\r
 \r
+/* Uncomment and use DMA for 5606 only if you now what you are doing */\r
+#define DONT_USE_DMA_IN_ADC_MPC5606S\r
+\r
+/* Are we gonna use Dma? */\r
+#if (  !defined(CFG_MPC5606S) || \\r
+      ( defined(CFG_MPC5606S) && !defined(DONT_USE_DMA_IN_ADC_MPC5606S) ) )\r
+       #define ADC_USES_DMA\r
+       #include "Dma.h"\r
+#endif\r
+\r
+#if ( defined(ADC_USES_DMA) && !defined(USE_DMA) )\r
+       #error Adc is configured to use Dma but the module is not enabled.\r
+#endif\r
+\r
 #if !defined(CFG_MPC5606S)\r
 typedef union\r
 {\r
@@ -687,8 +686,6 @@ void Adc_GroupConversionComplete (Adc_GroupType group)
                  }\r
                #endif\r
 #if defined(CFG_MPC5606S)\r
-                 /* Abort conversion */\r
-                 ADC_0.MCR.B.ABORTCHAIN = 1;\r
                  /* Disable trigger normal conversions for ADC0 */\r
                  ADC_0.MCR.B.NSTART=0;\r
 #else\r
@@ -878,9 +875,6 @@ void Adc_StopGroupConversion (Adc_GroupType group)
 {\r
   if (E_OK == Adc_CheckStopGroupConversion (group))\r
   {\r
-       /* Abort conversion */\r
-       ADC_0.MCR.B.ABORTCHAIN = 1;\r
-\r
        /* Disable trigger normal conversions for ADC0 */\r
        ADC_0.MCR.B.NSTART = 0;\r
 \r