[paparazzi-commits] [6254] fix ppm interrupt definitions for lpc21

[Felix Ruess]

Revision: 6254
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6254
Author:   flixr
Date:     2010-10-25 21:59:10 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
fix ppm interrupt definitions for lpc21

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
    paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.h

Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c       2010-10-25 
21:59:03 UTC (rev 6253)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c       2010-10-25 
21:59:10 UTC (rev 6254)
@@ -19,15 +19,12 @@
 #define PPM_IT 0x00
 #endif
 
-#if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
-#include <subsystems/radio_control/ppm.h>
-#else
+//FIXME remove this and fix timer mask
 #define RADIO_CONTROL_PPM_IT 0x00
-#endif
 
 #ifdef MB_SCALE
 #include "mb_scale.h"
-#else 
+#else
 #define MB_SCALE_IT 0x00
 #endif
 
@@ -58,6 +55,7 @@
 #define TRIGGER_IT 0x00
 #endif
 
+//FIXME: RADIO_CONTROL_PPM_IT not used anymore
 #define TIMER0_IT_MASK (ACTUATORS_IT         |\
                         PPM_IT               |\
                         RADIO_CONTROL_PPM_IT |\
@@ -85,7 +83,7 @@
 #ifdef SERVOS_PPM_MAT
       ServosPPMMat_ISR();
 #endif
-      T0IR = ACTUATORS_IT; 
+      T0IR = ACTUATORS_IT;
     }
 #endif /* ACTUATORS && (SERVOS_4017 || SERVOS_4015_MAT || SERVOS_PPM_MAT) */
 
@@ -103,12 +101,6 @@
 LED_TOGGLE(3);
     }
 #endif
-#if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
-    if (T0IR&RADIO_CONTROL_PPM_IT) {
-      RADIO_CONTROL_PPM_ISR();
-      T0IR = RADIO_CONTROL_PPM_IT;
-    }
-#endif
 #ifdef MB_SCALE
     if (T0IR&MB_SCALE_IT) {
       MB_SCALE_ICP_ISR();
@@ -124,31 +116,31 @@
 #ifdef USE_PWM_INPUT1
     if (T0IR&PWM_INPUT_IT1) {
       PWM_INPUT_ISR_1();
-      T0IR = PWM_INPUT_IT1; 
+      T0IR = PWM_INPUT_IT1;
     }
 #endif
 #ifdef USE_PWM_INPUT2
     if (T0IR&PWM_INPUT_IT2) {
       PWM_INPUT_ISR_2();
-      T0IR = PWM_INPUT_IT2; 
+      T0IR = PWM_INPUT_IT2;
     }
 #endif
 #ifdef USE_PWM_INPUT3
     if (T0IR&PWM_INPUT_IT3) {
       PWM_INPUT_ISR_3();
-      T0IR = PWM_INPUT_IT3; 
+      T0IR = PWM_INPUT_IT3;
     }
 #endif
 #ifdef USE_PWM_INPUT4
     if (T0IR&PWM_INPUT_IT4) {
       PWM_INPUT_ISR_4();
-      T0IR = PWM_INPUT_IT4; 
+      T0IR = PWM_INPUT_IT4;
     }
 #endif
 #ifdef USE_AMI601
     if (T0IR&AMI601_IT) {
       AMI601_ISR();
-      T0IR = AMI601_IT; 
+      T0IR = AMI601_IT;
     }
 #endif
   }

Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.h       2010-10-25 
21:59:03 UTC (rev 6253)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.h       2010-10-25 
21:59:10 UTC (rev 6254)
@@ -23,7 +23,7 @@
  */
 
 /*
- *\brief ARM7 timing functions 
+ *\brief ARM7 timing functions
  *
  */
 
@@ -100,7 +100,7 @@
   /* disable compare registers       */
   T0CCR = 0;
   /* disable external match register */
-  T0EMR = 0;                          
+  T0EMR = 0;
   /* enable timer 0                  */
   T0TCR = TCR_ENABLE;
 
@@ -110,11 +110,11 @@
   /* select TIMER0 as IRQ    */
   VICIntSelect &= ~VIC_BIT(VIC_TIMER0);
   /* enable TIMER0 interrupt */
-  VICIntEnable = VIC_BIT(VIC_TIMER0); 
+  VICIntEnable = VIC_BIT(VIC_TIMER0);
   /* on slot vic slot 1      */
   _VIC_CNTL(TIMER0_VIC_SLOT) = VIC_ENABLE | VIC_TIMER0;
   /* address of the ISR      */
-  _VIC_ADDR(TIMER0_VIC_SLOT) = (uint32_t)TIMER0_ISR; 
+  _VIC_ADDR(TIMER0_VIC_SLOT) = (uint32_t)TIMER0_ISR;
 
 }