From 2417345f73fa5818c54502fa2497a392c7a9cf70 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Sat, 14 Feb 2015 19:07:51 +0100 Subject: [PATCH] [airborne] remove unused interrupt_hw.h headers --- sw/airborne/arch/lpc21/interrupt_hw.h | 38 ------------------- sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c | 2 +- .../arch/lpc21/mcu_periph/pwm_input_arch.c | 2 +- .../arch/lpc21/mcu_periph/pwm_input_arch.h | 1 - sw/airborne/arch/lpc21/mcu_periph/spi_arch.c | 1 - .../arch/lpc21/mcu_periph/spi_slave_hs_arch.c | 1 - .../arch/lpc21/modules/adcs/max11040_hw.h | 1 - .../arch/lpc21/modules/display/lcd_dogm_hw.c | 2 +- .../arch/lpc21/peripherals/max1168_arch.c | 2 +- .../arch/lpc21/peripherals/ms2100_arch.c | 2 +- sw/airborne/arch/stm32/interrupt_hw.h | 38 ------------------- sw/airborne/firmwares/beth/main_beth.c | 1 - sw/airborne/firmwares/beth/main_coders.c | 1 - .../firmwares/motor_bench/main_turntable.c | 1 - sw/airborne/firmwares/motor_bench/mb_tacho.c | 1 - sw/airborne/firmwares/tutorial/main_demo6.c | 1 - sw/airborne/firmwares/wind_tunnel/main.c | 1 - sw/airborne/firmwares/wind_tunnel/main_mb.c | 1 - sw/airborne/fms/lpc_test_spi.c | 1 - sw/airborne/modules/max3100/max3100_hw.c | 2 +- sw/airborne/test/mcu_periph/test_gpio.c | 1 - .../test/mcu_periph/test_sys_time_timer.c | 1 - .../test/mcu_periph/test_sys_time_usleep.c | 1 - sw/airborne/test/subsystems/test_imu.c | 1 - .../test/subsystems/test_radio_control.c | 1 - sw/airborne/test/test_telemetry.c | 1 - 26 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 sw/airborne/arch/lpc21/interrupt_hw.h delete mode 100644 sw/airborne/arch/stm32/interrupt_hw.h diff --git a/sw/airborne/arch/lpc21/interrupt_hw.h b/sw/airborne/arch/lpc21/interrupt_hw.h deleted file mode 100644 index 532930a33d..0000000000 --- a/sw/airborne/arch/lpc21/interrupt_hw.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2005 Pascal Brisset, Antoine Drouin - * - * This file is part of paparazzi. - * - * paparazzi is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * paparazzi is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with paparazzi; see the file COPYING. If not, write to - * the Free Software Foundation, 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -/** - * @file arch/lpc21/interrupt_hw.h - * @ingroup lpc21_arch - * - * ARM Low level interrupt handling. - */ - -#ifndef INTERRUPT_HW_H -#define INTERRUPT_HW_H - -#include "armVIC.h" - -#define int_enable() enableIRQ() -#define int_disable() disableIRQ() - -#endif /* INTERRUPT_HW_H */ diff --git a/sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c b/sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c index 0f7821ee6f..9940fc6e62 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c @@ -30,8 +30,8 @@ #include "mcu_periph/i2c.h" #include "std.h" -#include "interrupt_hw.h" #include BOARD_CONFIG +#include "armVIC.h" /////////////////// // I2C Automaton // diff --git a/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c b/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c index df81b8641c..b2ebd688f9 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c @@ -30,7 +30,7 @@ #include "mcu_periph/pwm_input_arch.h" #include "LPC21xx.h" -#include "interrupt_hw.h" +#include "armVIC.h" //UPDATE THESE TO BE MORE ACCESSIBLE AND BE WARY OF EXISTING USAGE //POSSIBLY MAKE MORE INPUTS ACCESSIBLE diff --git a/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h b/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h index 108cca5b6c..a631c45a3d 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h +++ b/sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h @@ -32,7 +32,6 @@ #include "std.h" #include "LPC21xx.h" -#include "interrupt_hw.h" enum pwm_input_channels { PWM_INPUT1, diff --git a/sw/airborne/arch/lpc21/mcu_periph/spi_arch.c b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.c index 3b0ba1bd5a..548e588a9a 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/spi_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.c @@ -34,7 +34,6 @@ #include "std.h" #include "LPC21xx.h" -#include "interrupt_hw.h" #include "armVIC.h" #include BOARD_CONFIG diff --git a/sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c b/sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c index b324c6c09a..1c202e2969 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c @@ -30,7 +30,6 @@ #include "mcu_periph/spi.h" #include BOARD_CONFIG -#include "interrupt_hw.h" #include "std.h" #include "mcu.h" #include "led.h" diff --git a/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h b/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h index d097f5c167..f9c81776b7 100644 --- a/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h +++ b/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h @@ -4,7 +4,6 @@ #include "LPC21xx.h" -#include "interrupt_hw.h" #include "ssp_hw.h" #include "generated/airframe.h" #include BOARD_CONFIG diff --git a/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.c b/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.c index 5c35a19067..ff93459383 100644 --- a/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.c +++ b/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.c @@ -21,7 +21,7 @@ */ #include "LPC21xx.h" -#include "interrupt_hw.h" +#include "armVIC.h" #include "lcd_dogm_hw.h" diff --git a/sw/airborne/arch/lpc21/peripherals/max1168_arch.c b/sw/airborne/arch/lpc21/peripherals/max1168_arch.c index d696f74017..d61eed4102 100644 --- a/sw/airborne/arch/lpc21/peripherals/max1168_arch.c +++ b/sw/airborne/arch/lpc21/peripherals/max1168_arch.c @@ -23,7 +23,7 @@ #include "peripherals/max1168.h" #include "LPC21xx.h" -#include "interrupt_hw.h" +#include "armVIC.h" #include BOARD_CONFIG static void EXTINT0_ISR(void) __attribute__((naked)); diff --git a/sw/airborne/arch/lpc21/peripherals/ms2100_arch.c b/sw/airborne/arch/lpc21/peripherals/ms2100_arch.c index 3bc1e76ef1..95b19d57b5 100644 --- a/sw/airborne/arch/lpc21/peripherals/ms2100_arch.c +++ b/sw/airborne/arch/lpc21/peripherals/ms2100_arch.c @@ -29,7 +29,7 @@ #include "peripherals/ms2100.h" #include "LPC21xx.h" -#include "interrupt_hw.h" +#include "armVIC.h" #include "mcu_periph/sys_time.h" #include BOARD_CONFIG diff --git a/sw/airborne/arch/stm32/interrupt_hw.h b/sw/airborne/arch/stm32/interrupt_hw.h deleted file mode 100644 index 3181877c32..0000000000 --- a/sw/airborne/arch/stm32/interrupt_hw.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2005 Pascal Brisset, Antoine Drouin - * - * This file is part of paparazzi. - * - * paparazzi is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * paparazzi is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with paparazzi; see the file COPYING. If not, write to - * the Free Software Foundation, 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -/** - * @file arch/stm32/interrupt_hw.h - * @ingroup stm32_arch - * - * STM32 Low level interrupt handling. - * Empty for now, just to match what we have on LPC - */ - -#ifndef INTERRUPT_HW_H -#define INTERRUPT_HW_H - -#define int_enable() {} -#define int_disable() {} - -#endif /* INTERRUPT_HW_H */ - diff --git a/sw/airborne/firmwares/beth/main_beth.c b/sw/airborne/firmwares/beth/main_beth.c index 1801bcb4bf..1ca959b485 100644 --- a/sw/airborne/firmwares/beth/main_beth.c +++ b/sw/airborne/firmwares/beth/main_beth.c @@ -1,7 +1,6 @@ #include "std.h" #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "interrupt_hw.h" #include "subsystems/datalink/downlink.h" diff --git a/sw/airborne/firmwares/beth/main_coders.c b/sw/airborne/firmwares/beth/main_coders.c index e79c59f1bc..7d534137bf 100644 --- a/sw/airborne/firmwares/beth/main_coders.c +++ b/sw/airborne/firmwares/beth/main_coders.c @@ -11,7 +11,6 @@ #include #include #include -#include "interrupt_hw.h" #include diff --git a/sw/airborne/firmwares/motor_bench/main_turntable.c b/sw/airborne/firmwares/motor_bench/main_turntable.c index d97354751f..28fe92aa33 100644 --- a/sw/airborne/firmwares/motor_bench/main_turntable.c +++ b/sw/airborne/firmwares/motor_bench/main_turntable.c @@ -2,7 +2,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "led.h" -#include "interrupt_hw.h" #include "mcu_periph/usb_serial.h" #include "mcu_periph/uart.h" #include "mcu_arch.h" diff --git a/sw/airborne/firmwares/motor_bench/mb_tacho.c b/sw/airborne/firmwares/motor_bench/mb_tacho.c index be5d231a1c..92191a9c4c 100644 --- a/sw/airborne/firmwares/motor_bench/mb_tacho.c +++ b/sw/airborne/firmwares/motor_bench/mb_tacho.c @@ -2,7 +2,6 @@ #include "LPC21xx.h" -#include "interrupt_hw.h" #include "mcu.h" volatile uint32_t mb_tacho_duration; diff --git a/sw/airborne/firmwares/tutorial/main_demo6.c b/sw/airborne/firmwares/tutorial/main_demo6.c index bd80e1ea6d..c1739caec9 100644 --- a/sw/airborne/firmwares/tutorial/main_demo6.c +++ b/sw/airborne/firmwares/tutorial/main_demo6.c @@ -2,7 +2,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "led.h" -#include "interrupt_hw.h" #include "mcu_periph/usb_serial.h" #include "messages.h" diff --git a/sw/airborne/firmwares/wind_tunnel/main.c b/sw/airborne/firmwares/wind_tunnel/main.c index 21ad7b2952..26a866c552 100644 --- a/sw/airborne/firmwares/wind_tunnel/main.c +++ b/sw/airborne/firmwares/wind_tunnel/main.c @@ -2,7 +2,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "led.h" -#include "interrupt_hw.h" #include "mcu_periph/uart.h" #include "messages.h" diff --git a/sw/airborne/firmwares/wind_tunnel/main_mb.c b/sw/airborne/firmwares/wind_tunnel/main_mb.c index cbc1269827..e7efcc4f53 100644 --- a/sw/airborne/firmwares/wind_tunnel/main_mb.c +++ b/sw/airborne/firmwares/wind_tunnel/main_mb.c @@ -2,7 +2,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "led.h" -#include "interrupt_hw.h" #include "mcu_periph/uart.h" #include "messages.h" diff --git a/sw/airborne/fms/lpc_test_spi.c b/sw/airborne/fms/lpc_test_spi.c index 39861cbe10..26a4216b15 100644 --- a/sw/airborne/fms/lpc_test_spi.c +++ b/sw/airborne/fms/lpc_test_spi.c @@ -24,7 +24,6 @@ #include "std.h" #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "interrupt_hw.h" #include "armVIC.h" #include "LPC21xx.h" diff --git a/sw/airborne/modules/max3100/max3100_hw.c b/sw/airborne/modules/max3100/max3100_hw.c index 3b66a40efe..d4becb7f27 100644 --- a/sw/airborne/modules/max3100/max3100_hw.c +++ b/sw/airborne/modules/max3100/max3100_hw.c @@ -21,7 +21,7 @@ */ #include "LPC21xx.h" -#include "interrupt_hw.h" +#include "armVIC.h" #include "max3100_hw.h" #include "subsystems/datalink/downlink.h" diff --git a/sw/airborne/test/mcu_periph/test_gpio.c b/sw/airborne/test/mcu_periph/test_gpio.c index 21d0f753ce..2a4df2903e 100644 --- a/sw/airborne/test/mcu_periph/test_gpio.c +++ b/sw/airborne/test/mcu_periph/test_gpio.c @@ -23,7 +23,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "mcu_periph/gpio.h" -#include "interrupt_hw.h" #ifndef TEST_GPIO1 #define TEST_GPIO1 GPIOB,GPIO17 diff --git a/sw/airborne/test/mcu_periph/test_sys_time_timer.c b/sw/airborne/test/mcu_periph/test_sys_time_timer.c index ac4de4f641..c8fa62d850 100644 --- a/sw/airborne/test/mcu_periph/test_sys_time_timer.c +++ b/sw/airborne/test/mcu_periph/test_sys_time_timer.c @@ -23,7 +23,6 @@ #include "mcu.h" #include "led.h" #include "mcu_periph/sys_time.h" -#include "interrupt_hw.h" static inline void main_periodic_02(void); static inline void main_periodic_03(void); diff --git a/sw/airborne/test/mcu_periph/test_sys_time_usleep.c b/sw/airborne/test/mcu_periph/test_sys_time_usleep.c index 89c728a1d5..17db2e7a71 100644 --- a/sw/airborne/test/mcu_periph/test_sys_time_usleep.c +++ b/sw/airborne/test/mcu_periph/test_sys_time_usleep.c @@ -23,7 +23,6 @@ #include "mcu.h" #include "led.h" #include "mcu_periph/sys_time.h" -#include "interrupt_hw.h" static inline void main_periodic_1(void); static inline void main_periodic_15(void); diff --git a/sw/airborne/test/subsystems/test_imu.c b/sw/airborne/test/subsystems/test_imu.c index dbc1f69695..78678d0cb1 100644 --- a/sw/airborne/test/subsystems/test_imu.c +++ b/sw/airborne/test/subsystems/test_imu.c @@ -35,7 +35,6 @@ #include "subsystems/imu.h" -#include "interrupt_hw.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/test/subsystems/test_radio_control.c b/sw/airborne/test/subsystems/test_radio_control.c index e6c4d77aa0..6de068f746 100644 --- a/sw/airborne/test/subsystems/test_radio_control.c +++ b/sw/airborne/test/subsystems/test_radio_control.c @@ -23,7 +23,6 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "interrupt_hw.h" #include "mcu_periph/uart.h" #include "subsystems/datalink/downlink.h" diff --git a/sw/airborne/test/test_telemetry.c b/sw/airborne/test/test_telemetry.c index da7d4f4e20..9033b07569 100644 --- a/sw/airborne/test/test_telemetry.c +++ b/sw/airborne/test/test_telemetry.c @@ -28,7 +28,6 @@ #include BOARD_CONFIG #include "mcu.h" #include "mcu_periph/uart.h" -#include "interrupt_hw.h" #include "mcu_periph/sys_time.h" #include "subsystems/datalink/downlink.h" #include "led.h"