From c2e69b78c7e0299ec88db3a274b3dca8386e162b Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Tue, 4 Jan 2011 20:51:57 +0100
Subject: [PATCH] fix tunnel for booz

---
 conf/airframes/booz2_flixr.xml           | 3 ++-
 conf/autopilot/booz2_test_progs.makefile | 2 ++
 sw/airborne/booz/test/booz2_tunnel.c     | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/conf/airframes/booz2_flixr.xml b/conf/airframes/booz2_flixr.xml
index 723e050614..3f3b051975 100644
--- a/conf/airframes/booz2_flixr.xml
+++ b/conf/airframes/booz2_flixr.xml
@@ -27,10 +27,11 @@
     </subsystem>
   </firmware>
 
-  <firmware name="booz_test_progs">
+  <firmware name="booz2_test_progs">
     <target name="test_telemetry" board="booz_1.0"/>
     <target name="test_baro"      board="booz_1.0"/>
     <target name="test_spektrum"  board="booz_1.0"/>
+    <target name="tunnel"         board="booz_1.0"/>
   </firmware>
 
   <modules main_freq="512">
diff --git a/conf/autopilot/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile
index 8fd0b54858..ec7cc603ac 100644
--- a/conf/autopilot/booz2_test_progs.makefile
+++ b/conf/autopilot/booz2_test_progs.makefile
@@ -22,6 +22,8 @@
 #
 #
 
+include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
+
 #
 # test_led : blinks all leds
 #
diff --git a/sw/airborne/booz/test/booz2_tunnel.c b/sw/airborne/booz/test/booz2_tunnel.c
index 9229ae1aef..9f8a4689ea 100644
--- a/sw/airborne/booz/test/booz2_tunnel.c
+++ b/sw/airborne/booz/test/booz2_tunnel.c
@@ -24,10 +24,10 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
-#include "uart.h"
+#include "mcu_periph/uart.h"
 
 static inline void main_init( void );
 static inline void main_periodic_task( void );
@@ -44,12 +44,12 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart0_init();
   uart1_init();
-  int_enable();
+  mcu_int_enable();
 }
 
 static inline void main_periodic_task( void ) {