[paparazzi-commits] [4724]

[antoine drouin]

Revision: 4724
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4724
Author:   poine
Date:     2010-03-24 10:08:45 +0000 (Wed, 24 Mar 2010)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/lisa/test_periodic.c
    paparazzi3/trunk/sw/airborne/lisa/test_uart.c
    paparazzi3/trunk/sw/airborne/lisa/vector_table.c

Modified: paparazzi3/trunk/sw/airborne/lisa/test_periodic.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_periodic.c   2010-03-24 10:07:17 UTC 
(rev 4723)
+++ paparazzi3/trunk/sw/airborne/lisa/test_periodic.c   2010-03-24 10:08:45 UTC 
(rev 4724)
@@ -26,7 +26,6 @@
 
 #include BOARD_CONFIG
 #include "init_hw.h"
-//#include "led.h"
 #include "sys_time.h"
 
 static inline void main_init( void );
@@ -45,7 +44,6 @@
 
 static inline void main_init( void ) {
   hw_init();
-  //  led_init(); // handled by PERIPHERALS_AUTO_INIT
   sys_time_init();
 }
 

Modified: paparazzi3/trunk/sw/airborne/lisa/test_uart.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_uart.c       2010-03-24 10:07:17 UTC 
(rev 4723)
+++ paparazzi3/trunk/sw/airborne/lisa/test_uart.c       2010-03-24 10:08:45 UTC 
(rev 4724)
@@ -51,8 +51,10 @@
 }
 
 static inline void main_periodic( void ) {
-  uart1_transmit('a');
-  uart1_transmit('\n');
+  uart2_transmit('a');
+  uart2_transmit('b');
+  uart2_transmit('c');
+  uart2_transmit('\n');
 }
 
 

Modified: paparazzi3/trunk/sw/airborne/lisa/vector_table.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/vector_table.c    2010-03-24 10:07:17 UTC 
(rev 4723)
+++ paparazzi3/trunk/sw/airborne/lisa/vector_table.c    2010-03-24 10:08:45 UTC 
(rev 4724)
@@ -51,8 +51,23 @@
 #define USART3_IRQ_HANDLER usart3_irq_handler
 #endif
 
+#ifdef USE_I2C1
+#include "i2c_hw.h"
+#define I2C1_EV_IRQ_HANDLER i2c1_ev_irq_handler
+#define I2C1_ER_IRQ_HANDLER i2c1_er_irq_handler
+#else
+#define I2C1_EV_IRQ_HANDLER null_handler
+#define I2C1_ER_IRQ_HANDLER null_handler
+#endif
 
+#ifdef USE_SPI1
+extern void spi1_irq_handler(void);
+#define SPI1_IRQ_HANDLER spi1_irq_handler
+#else
+#define SPI1_IRQ_HANDLER null_handler
+#endif
 
+
 /* addresses defined in the linker script */
 extern unsigned long _etext;  /* end addr of .text section     */
 extern unsigned long _sidata; /* init values for .data section */
@@ -113,11 +128,11 @@
     null_handler,             /* tim2_irq_handler */
     null_handler,             /* tim3_irq_handler */
     null_handler,             /* tim4_irq_handler */
-    null_handler,             /* i2c1_ev_irq_handler */
-    null_handler,             /* i2c1_er_irq_handler */
+    I2C1_EV_IRQ_HANDLER,      /* i2c1_ev_irq_handler */
+    I2C1_ER_IRQ_HANDLER,      /* i2c1_er_irq_handler */
     null_handler,             /* i2c2_ev_irq_handler */
     null_handler,             /* i2c2_er_irq_handler */
-    null_handler,             /* spi1_irq_handler */
+    SPI1_IRQ_HANDLER,         /* spi1_irq_handler */
     null_handler,             /* spi2_irq_handler */
     USART1_IRQ_HANDLER,       /* usart1_irq_handler */
     USART2_IRQ_HANDLER,       /* usart2_irq_handler */