From bcffffa581a360140836009152a0410181addad3 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Mon, 8 Dec 2014 18:34:40 +0100 Subject: [PATCH] [transport] pass the periph and not the parent structure... --- conf/firmwares/subsystems/shared/udp.makefile | 2 +- sw/airborne/subsystems/datalink/pprz_transport.c | 2 +- sw/airborne/subsystems/datalink/pprzlog_transport.c | 2 +- sw/airborne/subsystems/datalink/xbee.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/firmwares/subsystems/shared/udp.makefile b/conf/firmwares/subsystems/shared/udp.makefile index c93e2f7432..43b287e0c4 100644 --- a/conf/firmwares/subsystems/shared/udp.makefile +++ b/conf/firmwares/subsystems/shared/udp.makefile @@ -6,7 +6,7 @@ UDP_INCLUDED = 1 #generic spi master driver UDP_CFLAGS = -DUSE_UDP -UDP_SRCS = mcu_periph/udp.c $(SRC_ARCH)/mcu_periph/udp_arch.c fms/fms_network.c +UDP_SRCS = mcu_periph/udp.c $(SRC_ARCH)/mcu_periph/udp_arch.c $(TARGET).CFLAGS += $(UDP_CFLAGS) $(TARGET).srcs += $(UDP_SRCS) diff --git a/sw/airborne/subsystems/datalink/pprz_transport.c b/sw/airborne/subsystems/datalink/pprz_transport.c index ba4808f388..02ed012868 100644 --- a/sw/airborne/subsystems/datalink/pprz_transport.c +++ b/sw/airborne/subsystems/datalink/pprz_transport.c @@ -104,7 +104,7 @@ static void count_bytes(struct pprz_transport *trans __attribute__((unused)), st static int check_available_space(struct pprz_transport *trans __attribute__((unused)), struct link_device *dev, uint8_t bytes) { - return dev->check_free_space(dev, bytes); + return dev->check_free_space(dev->periph, bytes); } void pprz_transport_init(void) diff --git a/sw/airborne/subsystems/datalink/pprzlog_transport.c b/sw/airborne/subsystems/datalink/pprzlog_transport.c index 47952e920d..820eb17742 100644 --- a/sw/airborne/subsystems/datalink/pprzlog_transport.c +++ b/sw/airborne/subsystems/datalink/pprzlog_transport.c @@ -99,7 +99,7 @@ static void count_bytes(struct pprzlog_transport *trans __attribute__((unused)), static int check_available_space(struct pprzlog_transport *trans __attribute__((unused)), struct link_device *dev, uint8_t bytes) { - return dev->check_free_space(dev, bytes); + return dev->check_free_space(dev->periph, bytes); } void pprzlog_transport_init(void) diff --git a/sw/airborne/subsystems/datalink/xbee.c b/sw/airborne/subsystems/datalink/xbee.c index 75c8abe48b..f8be5f65b5 100644 --- a/sw/airborne/subsystems/datalink/xbee.c +++ b/sw/airborne/subsystems/datalink/xbee.c @@ -110,7 +110,7 @@ static void count_bytes(struct xbee_transport *trans __attribute__((unused)), st static int check_available_space(struct xbee_transport *trans __attribute__((unused)), struct link_device *dev, uint8_t bytes) { - return dev->check_free_space(dev, bytes); + return dev->check_free_space(dev->periph, bytes); } static uint8_t xbee_text_reply_is_ok(void)