From ef251eac07a8bc5f45210aeb64fb250d07b2cf51 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Tue, 2 Feb 2016 21:59:11 +0100 Subject: [PATCH] Revert "[datalink] NOT all firmwares use datalink.c" This reverts commit 8390478a73f4cfc695498d625fb4fcbf939b28ef. Ok, all firmwares should be able to use datalink.c, since the stuff they might not use is protected by ifdefs --- .../firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile | 1 - .../subsystems/fixedwing/telemetry_superbitrf.makefile | 1 - .../subsystems/fixedwing/telemetry_transparent.makefile | 1 - .../subsystems/fixedwing/telemetry_transparent_usb.makefile | 1 - conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile | 1 - .../firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile | 1 - .../subsystems/rotorcraft/telemetry_bluegiga.makefile | 1 - .../subsystems/rotorcraft/telemetry_superbitrf.makefile | 1 - .../subsystems/rotorcraft/telemetry_transparent.makefile | 1 - .../subsystems/rotorcraft/telemetry_transparent_udp.makefile | 3 +-- .../subsystems/rotorcraft/telemetry_transparent_usb.makefile | 1 - .../subsystems/rotorcraft/telemetry_xbee_api.makefile | 1 - conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile | 2 +- conf/firmwares/subsystems/shared/telemetry_ivy.makefile | 2 +- conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile | 2 +- .../firmwares/subsystems/shared/telemetry_transparent.makefile | 2 +- .../subsystems/shared/telemetry_transparent_udp.makefile | 2 +- .../subsystems/shared/telemetry_transparent_usb.makefile | 2 +- conf/firmwares/subsystems/shared/telemetry_w5100.makefile | 2 +- conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile | 2 +- sw/airborne/subsystems/datalink/datalink.c | 3 +-- 21 files changed, 10 insertions(+), 23 deletions(-) diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile index e7ee0e9564..69b8085211 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile @@ -5,7 +5,6 @@ ifeq ($(TARGET),ap) include $(CFG_SHARED)/telemetry_bluegiga.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c # avoid fbw_telemetry_mode error diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile index 253fbc2218..95e3daf4be 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile @@ -8,7 +8,6 @@ ifeq ($(TARGET),ap) include $(CFG_SHARED)/telemetry_superbitrf.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c # avoid fbw_telemetry_mode error diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile index 5bb6fdead2..23ebc09a0d 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile @@ -5,7 +5,6 @@ ifeq ($(TARGET),ap) include $(CFG_SHARED)/telemetry_transparent.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c # avoid fbw_telemetry_mode error diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile index c52ad82809..a87201f3c8 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile @@ -6,7 +6,6 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_transparent_usb.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c $(SRC_FIRMWARE)/fbw_downlink.c # avoid fbw_telemetry_mode error ap.srcs += $(SRC_FIRMWARE)/fbw_downlink.c diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile index 9594fad106..09a2f4f254 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile @@ -6,7 +6,6 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_w5100.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c # avoid fbw_telemetry_mode error diff --git a/conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile b/conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile index 3070ca90e4..07d801e161 100644 --- a/conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile +++ b/conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile @@ -7,7 +7,6 @@ ifeq ($(TARGET),ap) include $(CFG_SHARED)/telemetry_xbee_api.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c # avoid fbw_telemetry_mode error diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_bluegiga.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_bluegiga.makefile index 9e5b26488a..ba9aae5617 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_bluegiga.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_bluegiga.makefile @@ -6,5 +6,4 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_bluegiga.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile index 4634dfb132..27818783a8 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile @@ -7,6 +7,5 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_superbitrf.makefile endif -ap.srcs += subsystems/datalink/datalink.c # add rotorcraft specific files ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile index 2cf8f6c11f..c5e2418642 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile @@ -9,5 +9,4 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_transparent.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile index 026b94392b..9822c3341c 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile @@ -5,5 +5,4 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_transparent_udp.makefile endif -ap.srcs += subsystems/datalink/datalink.c -ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c +ap.srcs += subsystems/datalink/datalink.c $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile index 5bafc8f4bc..92ea7ca6b4 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile @@ -5,5 +5,4 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_transparent_usb.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile b/conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile index f6d2a772c7..801cb5a159 100644 --- a/conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile +++ b/conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile @@ -10,5 +10,4 @@ ifeq ($(TARGET), ap) include $(CFG_SHARED)/telemetry_xbee_api.makefile endif -ap.srcs += subsystems/datalink/datalink.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile b/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile index a5613864a4..3a101e64e7 100644 --- a/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile @@ -31,5 +31,5 @@ ifneq ($(MODEM_LED),none) ap.CFLAGS += -DMODEM_LED=$(MODEM_LED) endif -ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c +ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_ivy.makefile b/conf/firmwares/subsystems/shared/telemetry_ivy.makefile index aeb34dbfb0..4f2b7aa249 100644 --- a/conf/firmwares/subsystems/shared/telemetry_ivy.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_ivy.makefile @@ -1,3 +1,3 @@ $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp $(TARGET).srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c -$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile b/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile index ed8d664826..4c697039eb 100644 --- a/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile @@ -7,4 +7,4 @@ $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF $(TARGET).srcs += peripherals/cyrf6936.c -$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent.makefile index 77854f5e9e..804e6b9637 100644 --- a/conf/firmwares/subsystems/shared/telemetry_transparent.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_transparent.makefile @@ -13,5 +13,5 @@ $(TARGET).CFLAGS += -D$(PPRZ_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD) $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile index a803cfb0d4..ae95aed8fa 100644 --- a/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile @@ -19,5 +19,5 @@ TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ $(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS) -$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile index bd56a9a294..9cb35f198b 100644 --- a/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile @@ -4,7 +4,7 @@ $(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL $(TARGET).CFLAGS += -DPERIODIC_TELEMETRY -$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c ifeq ($(ARCH), lpc21) $(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c diff --git a/conf/firmwares/subsystems/shared/telemetry_w5100.makefile b/conf/firmwares/subsystems/shared/telemetry_w5100.makefile index 11f4b1ff58..090d1cc828 100644 --- a/conf/firmwares/subsystems/shared/telemetry_w5100.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_w5100.makefile @@ -10,7 +10,7 @@ W5100_MULTICAST_PORT ?= "1234" $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100 $(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT) -$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c ifeq ($(ARCH), lpc21) # only an issue of setting the DRDY pin in w5100.c, which is stm32 specific diff --git a/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile b/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile index 7f422aaca9..920585468f 100644 --- a/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile +++ b/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile @@ -14,4 +14,4 @@ $(TARGET).CFLAGS += -D$(XBEE_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$( $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE -$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c +$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c diff --git a/sw/airborne/subsystems/datalink/datalink.c b/sw/airborne/subsystems/datalink/datalink.c index dd8182c556..0646fcae2a 100644 --- a/sw/airborne/subsystems/datalink/datalink.c +++ b/sw/airborne/subsystems/datalink/datalink.c @@ -22,8 +22,7 @@ /** * @file subsystems/datalink/datalink.c * Handling of messages coming from ground and other A/Cs. - * This is common to the fixedwing and rotorcraft firmwares, - * other firmwares should provide their own dl_parse_msg(). + * */ #define DATALINK_C