From c5eb7230fd02adba057a0a409dcbdd2f3153f6e4 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Mon, 10 Nov 2014 10:33:13 +0100 Subject: [PATCH] [telemetry] rename device.h link_device.h to match structure name --- sw/airborne/mcu_periph/{device.h => link_device.h} | 8 ++++---- sw/airborne/mcu_periph/uart.h | 2 +- sw/airborne/mcu_periph/udp.h | 2 +- sw/airborne/mcu_periph/usb_serial.h | 2 +- sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h | 2 +- sw/airborne/subsystems/datalink/ivy_transport.h | 2 +- sw/airborne/subsystems/datalink/superbitrf.h | 2 +- sw/airborne/subsystems/datalink/telemetry_common.h | 2 +- sw/airborne/subsystems/datalink/transport.h | 2 +- sw/airborne/subsystems/datalink/w5100.h | 2 +- sw/tools/generators/gen_messages.ml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename sw/airborne/mcu_periph/{device.h => link_device.h} (93%) diff --git a/sw/airborne/mcu_periph/device.h b/sw/airborne/mcu_periph/link_device.h similarity index 93% rename from sw/airborne/mcu_periph/device.h rename to sw/airborne/mcu_periph/link_device.h index a8623039a9c..04d21864791 100644 --- a/sw/airborne/mcu_periph/device.h +++ b/sw/airborne/mcu_periph/link_device.h @@ -19,12 +19,12 @@ * */ -/** \file mcu_periph/device.h +/** \file mcu_periph/link_device.h * generic device header */ -#ifndef DEVICE_H -#define DEVICE_H +#ifndef LINK_DEVICE_H +#define LINK_DEVICE_H #include @@ -46,5 +46,5 @@ struct link_device { void *periph; ///< pointer to parent implementation }; -#endif // DEVICES_H +#endif // LINK_DEVICE_H diff --git a/sw/airborne/mcu_periph/uart.h b/sw/airborne/mcu_periph/uart.h index 6a78d208267..3c970f1c5b7 100644 --- a/sw/airborne/mcu_periph/uart.h +++ b/sw/airborne/mcu_periph/uart.h @@ -29,7 +29,7 @@ #define MCU_PERIPH_UART_H #include "mcu_periph/uart_arch.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #include "std.h" #define UART_RX_BUFFER_SIZE 128 diff --git a/sw/airborne/mcu_periph/udp.h b/sw/airborne/mcu_periph/udp.h index 429054be2c7..5495ab621a4 100644 --- a/sw/airborne/mcu_periph/udp.h +++ b/sw/airborne/mcu_periph/udp.h @@ -30,7 +30,7 @@ #include "std.h" #include "mcu_periph/udp_arch.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #define UDP_RX_BUFFER_SIZE 256 #define UDP_TX_BUFFER_SIZE 256 diff --git a/sw/airborne/mcu_periph/usb_serial.h b/sw/airborne/mcu_periph/usb_serial.h index ac7f9f3e33e..cc37f3df2d1 100644 --- a/sw/airborne/mcu_periph/usb_serial.h +++ b/sw/airborne/mcu_periph/usb_serial.h @@ -30,7 +30,7 @@ #include #include "std.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" //#include "usb_serial_hw.h" struct usb_serial_periph { diff --git a/sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h b/sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h index a324589ab57..03526c39fdc 100644 --- a/sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h +++ b/sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h @@ -29,7 +29,7 @@ #define CHIBIOS_SDLOG_H #include "ff.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" /* what to be done : diff --git a/sw/airborne/subsystems/datalink/ivy_transport.h b/sw/airborne/subsystems/datalink/ivy_transport.h index 2bb5adeec63..dae014a7edb 100644 --- a/sw/airborne/subsystems/datalink/ivy_transport.h +++ b/sw/airborne/subsystems/datalink/ivy_transport.h @@ -31,7 +31,7 @@ #define IVY_TRANSPORT_H #include "subsystems/datalink/transport.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" // IVY transport struct ivy_transport { diff --git a/sw/airborne/subsystems/datalink/superbitrf.h b/sw/airborne/subsystems/datalink/superbitrf.h index 66c69f4b224..1bba6ffd7cd 100644 --- a/sw/airborne/subsystems/datalink/superbitrf.h +++ b/sw/airborne/subsystems/datalink/superbitrf.h @@ -29,7 +29,7 @@ #include "mcu_periph/gpio.h" #include "peripherals/cyrf6936.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #include "subsystems/datalink/datalink.h" #include "subsystems/datalink/pprz_transport.h" diff --git a/sw/airborne/subsystems/datalink/telemetry_common.h b/sw/airborne/subsystems/datalink/telemetry_common.h index 5ff73a8cbf0..ab107ddbc09 100644 --- a/sw/airborne/subsystems/datalink/telemetry_common.h +++ b/sw/airborne/subsystems/datalink/telemetry_common.h @@ -31,7 +31,7 @@ #include #include "std.h" -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #include "subsystems/datalink/transport.h" /** Telemetry callback definition diff --git a/sw/airborne/subsystems/datalink/transport.h b/sw/airborne/subsystems/datalink/transport.h index f44fba39a75..d3dc1a4da09 100644 --- a/sw/airborne/subsystems/datalink/transport.h +++ b/sw/airborne/subsystems/datalink/transport.h @@ -27,7 +27,7 @@ #define TRANSPORT_H #include -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #include "std.h" #ifndef TRANSPORT_PAYLOAD_LEN diff --git a/sw/airborne/subsystems/datalink/w5100.h b/sw/airborne/subsystems/datalink/w5100.h index ac8d9f5ecfd..4ee53fcee6f 100644 --- a/sw/airborne/subsystems/datalink/w5100.h +++ b/sw/airborne/subsystems/datalink/w5100.h @@ -28,7 +28,7 @@ #ifndef W5100_H #define W5100_H -#include "mcu_periph/device.h" +#include "mcu_periph/link_device.h" #include "generated/airframe.h" #define W5100_RX_BUFFER_SIZE 80 diff --git a/sw/tools/generators/gen_messages.ml b/sw/tools/generators/gen_messages.ml index 58d33acfb67..f3438fe6828 100644 --- a/sw/tools/generators/gen_messages.ml +++ b/sw/tools/generators/gen_messages.ml @@ -366,7 +366,7 @@ let () = Printf.fprintf h "#ifndef _VAR_MESSAGES_%s_H_\n" class_name; Printf.fprintf h "#define _VAR_MESSAGES_%s_H_\n" class_name; Printf.fprintf h "#include \"subsystems/datalink/transport.h\"\n"; - Printf.fprintf h "#include \"mcu_periph/device.h\"\n"; + Printf.fprintf h "#include \"mcu_periph/link_device.h\"\n"; (** Macros for airborne downlink (sending) *) if class_name = "telemetry" then begin (** FIXME *)