riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16023 from maribu/max_pdu_size

Browse Source 
sys/net/netopt: Drop deprecated NETOPT_MAX_PACKET_SIZE
This commit is contained in:
benpicco 2021-08-26 14:40:18 +02:00 committed by GitHub
commit 0b69747389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 446 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/stm32/include/vendor/Makefile vendored
View File

@ -24,6 +24,7 @@ PKG_LICENSE=Apache-2
# Store the cloned repositories under the stm32 directory to prevent downloads
# for each builds.
PKG_SOURCE_DIR = $(RIOTBASE)/cpu/stm32/include/vendor/cmsis/$(CPU_FAM)
PKG_PATCH_DIR = $(CURDIR)/patches/$(CPU_FAM)
include $(RIOTBASE)/pkg/pkg.mk

29
cpu/stm32/include/vendor/patches/f0/0001-stm32f0xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 86e104c707fed103d6fa92ba9a44f0502aa82933 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32f0xx: remove ErrorStatus
---
Include/stm32f0xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f0xx.h b/Include/stm32f0xx.h
index 621a5fa..61faaf9 100644
--- a/Include/stm32f0xx.h
+++ b/Include/stm32f0xx.h
@@ -169,12 +169,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/f1/0001-stm32f1xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 95ab50cfd3a3e5dcb10978f1957136e7dcfe78ca Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 15:33:09 +0200
Subject: [PATCH] stm32f1xx: remove ErrorStatus
---
Include/stm32f1xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f1xx.h b/Include/stm32f1xx.h
index 2f47c00..7f7b757 100644
--- a/Include/stm32f1xx.h
+++ b/Include/stm32f1xx.h
@@ -161,12 +161,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/f2/0001-stm32f2xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 524058e187edb2b8ce5bd150d29261cfa34a6201 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32f2xx: remove ErrorStatus
---
Include/stm32f2xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f2xx.h b/Include/stm32f2xx.h
index b56e1e1..0f86517 100644
--- a/Include/stm32f2xx.h
+++ b/Include/stm32f2xx.h
@@ -132,12 +132,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/f3/0001-stm32f3xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 23eff8ffe148e23931c6da226eb207185a55879b Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32f3xx: remove ErrorStatus
---
Include/stm32f3xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f3xx.h b/Include/stm32f3xx.h
index 447e6c4..52306f4 100644
--- a/Include/stm32f3xx.h
+++ b/Include/stm32f3xx.h
@@ -174,12 +174,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/f4/0001-stm32f4xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 4050cfd0d878fcfbd6e968eb53d82ba18b2393c0 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32f4xx: remove ErrorStatus
---
Include/stm32f4xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f4xx.h b/Include/stm32f4xx.h
index 911183b..342fe97 100644
--- a/Include/stm32f4xx.h
+++ b/Include/stm32f4xx.h
@@ -211,12 +211,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/f7/0001-stm32f7xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 47ae0d20e61b4cb8ac96d08f4bccc727d98b98ae Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32f7xx: remove ErrorStatus
---
Include/stm32f7xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32f7xx.h b/Include/stm32f7xx.h
index 84f9de4..2c02749 100644
--- a/Include/stm32f7xx.h
+++ b/Include/stm32f7xx.h
@@ -166,12 +166,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0U,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/g0/0001-stm32g0xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From f9a82cd82510f7bf825d94b8911a26ade13c5039 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32g0xx: remove ErrorStatus
---
Include/stm32g0xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32g0xx.h b/Include/stm32g0xx.h
index 8af3dc3..141e9e3 100644
--- a/Include/stm32g0xx.h
+++ b/Include/stm32g0xx.h
@@ -134,12 +134,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/g4/0001-stm32g4xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From b79de2d132b4c6ee769f9ed22998b5d081569760 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32g4xx: remove ErrorStatus
---
Include/stm32g4xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32g4xx.h b/Include/stm32g4xx.h
index 3ff61d8..0c4854e 100644
--- a/Include/stm32g4xx.h
+++ b/Include/stm32g4xx.h
@@ -141,12 +141,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/l0/0001-stm32l0xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 90e047a25c686ac7f05b5c7a0d7a03e66b9f9655 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32l0xx: remove ErrorStatus
---
Include/stm32l0xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32l0xx.h b/Include/stm32l0xx.h
index c37e141..1c7e531 100644
--- a/Include/stm32l0xx.h
+++ b/Include/stm32l0xx.h
@@ -183,12 +183,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/l1/0001-stm32l1xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 185f7bb7d4c8638da0e5aeda9ccaaf8f5108ebdd Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32l1xx: remove ErrorStatus
---
Include/stm32l1xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32l1xx.h b/Include/stm32l1xx.h
index 762015c..645e4bb 100644
--- a/Include/stm32l1xx.h
+++ b/Include/stm32l1xx.h
@@ -187,12 +187,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/l4/0001-stm32l4xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From f9e113b189935b9873dc0765213db80af581062b Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32l4xx: remove ErrorStatus
---
Include/stm32l4xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32l4xx.h b/Include/stm32l4xx.h
index 619e8c0..206c480 100644
--- a/Include/stm32l4xx.h
+++ b/Include/stm32l4xx.h
@@ -196,12 +196,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/l5/0001-stm32l5xx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From ef2c61f1ea41c8bf8e63d749e681b791b3f84537 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32l5xx: remove ErrorStatus
---
Include/stm32l5xx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32l5xx.h b/Include/stm32l5xx.h
index 6a1f21b..76a1470 100644
--- a/Include/stm32l5xx.h
+++ b/Include/stm32l5xx.h
@@ -122,12 +122,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/wb/0001-stm32wbxx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 2a012fb2a0af27f65ddc62853d5813e049639b00 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 16:19:00 +0200
Subject: [PATCH] stm32wbxx: remove ErrorStatus
---
Include/stm32wbxx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32wbxx.h b/Include/stm32wbxx.h
index 3af8492..e531dec 100644
--- a/Include/stm32wbxx.h
+++ b/Include/stm32wbxx.h
@@ -118,12 +118,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- SUCCESS = 0,
- ERROR = !SUCCESS
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

29
cpu/stm32/include/vendor/patches/wl/0001-stm32wlxx-remove-ErrorStatus.patch vendored Normal file
View File

@ -0,0 +1,29 @@
From 44bfee08fa5b31474704e2b451e3b866f4bcc671 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Wed, 25 Aug 2021 18:40:48 +0200
Subject: [PATCH] stm32wlxx: remove ErrorStatus
---
Include/stm32wlxx.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Include/stm32wlxx.h b/Include/stm32wlxx.h
index 01e41ba..c241fd1 100644
--- a/Include/stm32wlxx.h
+++ b/Include/stm32wlxx.h
@@ -128,12 +128,6 @@ typedef enum
} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-typedef enum
-{
- ERROR = 0,
- SUCCESS = !ERROR
-} ErrorStatus;
-
/**
* @}
*/
--
2.30.2

2
pkg/ccn-lite/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=ccn-lite
PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
PKG_VERSION=ee0bff932b5ee3f1c7835e787b2d47d2b26e18c7
PKG_VERSION=da0d9de8d82349dff845acc62d37242dd09b3d3d
PKG_LICENSE=ISC
include $(RIOTBASE)/pkg/pkg.mk

27
pkg/ccn-lite/patches/0001-ccnl-riot-fix-build-on-stm32-cpus.patch
View File

@ -1,27 +0,0 @@
From 7b4f637281287d0f145fea5f4376189015d86f20 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Thu, 4 Jun 2020 22:28:03 +0200
Subject: [PATCH 1/1] ccnl-riot: fix build on stm32 cpus
---
src/ccnl-riot/include/ccnl-riot-logging.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/ccnl-riot/include/ccnl-riot-logging.h b/src/ccnl-riot/include/ccnl-riot-logging.h
index 373f121a..96a4bb19 100644
--- a/src/ccnl-riot/include/ccnl-riot-logging.h
+++ b/src/ccnl-riot/include/ccnl-riot-logging.h
@@ -24,6 +24,10 @@
#define LOG_LEVEL LOG_DEBUG
#endif
+#if defined(CPU_STM32)
+#include "cpu.h"
+#endif
+
#include "log.h"
/**
--
2.25.1

33
pkg/ccn-lite/patches/0001-ccnl_core-add-MAX_GNRC_NETIFS-macro.patch
View File

@ -1,33 +0,0 @@
From 50b6cbc4acc9715626b55e838c3b317f6a891286 Mon Sep 17 00:00:00 2001
From: Jose Alamos <jose.alamos@haw-hamburg.de>
Date: Wed, 25 Mar 2020 11:07:29 +0100
Subject: [PATCH] ccnl_core: add MAX_GNRC_NETIFS macro
---
src/ccnl-core/include/ccnl-defs.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/ccnl-core/include/ccnl-defs.h b/src/ccnl-core/include/ccnl-defs.h
index 879bbcfb..93d5af4b 100644
--- a/src/ccnl-core/include/ccnl-defs.h
+++ b/src/ccnl-core/include/ccnl-defs.h
@@ -36,10 +36,15 @@
/* assuming that all broadcast addresses consist of a sequence of equal octets */
#define CCNL_BROADCAST_OCTET 0xFF
+/* By default use only one GNRC interface */
+#ifndef MAX_GNRC_NETIFS
+#define MAX_GNRC_NETIFS (1)
+#endif
+
#if defined(CCNL_ARDUINO) || defined(CCNL_RIOT)
# if defined(CCNL_RIOT)
# include "net/gnrc/netif.h"
-# define CCNL_MAX_INTERFACES GNRC_NETIF_NUMOF
+# define CCNL_MAX_INTERFACES MAX_GNRC_NETIFS
# else
# define CCNL_MAX_INTERFACES 1
# endif
--
2.25.0

53
pkg/ccn-lite/patches/0001-riot-adapt-to-changed-kernel_types.h-sched.h.patch
View File

@ -1,53 +0,0 @@
From 33251cb1c9cb2a4ef910c5d20dbe12373e3a2264 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Wed, 25 Nov 2020 13:58:42 +0100
Subject: [PATCH] riot: adapt to changed kernel_types.h -> sched.h
---
src/ccnl-core/include/ccnl-if.h | 2 +-
src/ccnl-riot/include/ccn-lite-riot.h | 2 +-
src/ccnl-riot/src/ccn-lite-riot.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ccnl-core/include/ccnl-if.h b/src/ccnl-core/include/ccnl-if.h
index cf90dcf9c3..40d461a55e 100644
--- a/src/ccnl-core/include/ccnl-if.h
+++ b/src/ccnl-core/include/ccnl-if.h
@@ -24,7 +24,7 @@
#define CCNL_IF_H
#if defined(CCNL_RIOT)
-#include "kernel_types.h"
+#include "sched.h"
#endif
#include "ccnl-sched.h"
diff --git a/src/ccnl-riot/include/ccn-lite-riot.h b/src/ccnl-riot/include/ccn-lite-riot.h
index 99fa01af79..10682a801a 100644
--- a/src/ccnl-riot/include/ccn-lite-riot.h
+++ b/src/ccnl-riot/include/ccn-lite-riot.h
@@ -21,7 +21,7 @@
*/
#include <unistd.h>
-#include "kernel_types.h"
+#include "sched.h"
#include "arpa/inet.h"
#include "net/packet.h"
#include "net/ethernet/hdr.h"
diff --git a/src/ccnl-riot/src/ccn-lite-riot.c b/src/ccnl-riot/src/ccn-lite-riot.c
index 101273754b..e7b7f14944 100644
--- a/src/ccnl-riot/src/ccn-lite-riot.c
+++ b/src/ccnl-riot/src/ccn-lite-riot.c
@@ -29,7 +29,7 @@
#include <time.h>
/* RIOT specific includes */
-#include "kernel_types.h"
+#include "sched.h"
#include "random.h"
#include "timex.h"
#include "xtimer.h"
--
2.29.2

26
pkg/ndn-riot/patches/0004-replace-use-of-deprecated-netopt.patch Normal file
View File

@ -0,0 +1,26 @@
From ea398bfa1e15313860cf170c280932361c256449 Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Thu, 25 Feb 2021 11:17:54 +0100
Subject: [PATCH] replace use of deprecated netopt
Use NETOPT_MAX_PDU_SIZE instead of NETOPT_MAX_PACKET_SIZE
---
netif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/netif.c b/netif.c
index 5e24c6d..ed1e973 100644
--- a/netif.c
+++ b/netif.c
@@ -55,7 +55,7 @@ void ndn_netif_auto_add(void)
gnrc_nettype_t proto;
// get device mtu
- if (gnrc_netapi_get(iface, NETOPT_MAX_PACKET_SIZE, 0,
+ if (gnrc_netapi_get(iface, NETOPT_MAX_PDU_SIZE, 0,
&_netif_table[i].mtu,
sizeof(uint16_t)) < 0) {
DEBUG("ndn: cannot get device mtu (pid=%"
--
2.30.1

31
pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch
View File

@ -1,31 +0,0 @@
From 75774342cbd175287ccd3190c76db0b07314b3cf Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Sun, 7 Jun 2020 10:27:56 +0200
Subject: [PATCH 1/1] MQTTClient-C: skip SUCCESS enum on STM32 cpus
---
MQTTClient-C/src/MQTTClient.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MQTTClient-C/src/MQTTClient.h b/MQTTClient-C/src/MQTTClient.h
index b612341..4f1dfba 100755
--- a/MQTTClient-C/src/MQTTClient.h
+++ b/MQTTClient-C/src/MQTTClient.h
@@ -54,7 +54,14 @@
enum QoS { QOS0, QOS1, QOS2, SUBFAIL=0x80 };
/* all failure return codes must be negative */
+#if !defined(CPU_LINE_STM32F030x4) && !defined(CPU_LINE_STM32MP157Cxx) && \
+ defined(CPU_STM32)
+/* the SUCCESS enum is defined for all stm32.
+ Since it contains the same value, we just skip its definition here for them. */
+enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1};
+#else
enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1, SUCCESS = 0 };
+#endif
/* The Platform specific header must define the Network and Timer structures and functions
* which operate on them.
--
2.25.1

3
pkg/pkg.mk
View File

@ -25,6 +25,7 @@ ifeq (,$(PKG_LICENSE))
endif
PKG_DIR ?= $(CURDIR)
PKG_PATCH_DIR ?= $(PKG_DIR)/patches
PKG_BUILD_OUT_OF_SOURCE ?= 1
ifeq (1,$(PKG_BUILD_OUT_OF_SOURCE))
@ -60,7 +61,7 @@ GITAMFLAGS ?= $(GIT_QUIET) --no-gpg-sign --ignore-whitespace --whitespace=nowarn
.PHONY: all prepare clean distclean FORCE
PKG_PATCHES = $(sort $(wildcard $(PKG_DIR)/patches/*.patch))
PKG_PATCHES = $(sort $(wildcard $(PKG_PATCH_DIR)/*.patch))
PKG_STATE_FILE = .pkg-state.git
PKG_STATE = $(PKG_SOURCE_DIR)/$(PKG_STATE_FILE)

14
sys/include/net/netopt.h
View File

@ -29,14 +29,6 @@
extern "C" {
#endif
/**
* @brief A deprecated alias for @ref NETOPT_MAX_PDU_SIZE
*
* @deprecated Please use @ref NETOPT_MAX_PDU_SIZE instead of
* `NETOPT_MAX_PACKET_SIZE`
*/
#define NETOPT_MAX_PACKET_SIZE NETOPT_MAX_PDU_SIZE
/**
* @brief Global list of configuration options available throughout the
* network stack, e.g. by netdev and netapi
@ -411,7 +403,8 @@ typedef enum {
NETOPT_CCA_MODE,
/**
* @brief (@ref netstats_t*) get statistics about sent and received packets and data of the device or protocol
* @brief (@ref netstats_t*) get statistics about sent and received packets and data of the
* device or protocol
*
* Expects a pointer to a @ref netstats_t struct that will be pointed to
* the corresponding @ref netstats_t of the module.
@ -431,7 +424,8 @@ typedef enum {
NETOPT_ENCRYPTION_KEY,
/**
* @brief (@ref netopt_rf_testmode_t) Test mode for the radio, e.g. for CE or FCC certification
* @brief (@ref netopt_rf_testmode_t) Test mode for the radio, e.g. for CE or FCC
* certification
*
* Get/set the test mode as type @ref netopt_rf_testmode_t or as uint8_t if
* the radio supports other vendor specific test modes.

6
tests/gnrc_sixlowpan_frag_minfwd/mockup_netif.c
View File

@ -59,7 +59,7 @@ static int _get_netdev_proto(netdev_t *netdev, void *value, size_t max_len)
return sizeof(gnrc_nettype_t);
}
int _get_max_packet_size(netdev_t *dev, void *value, size_t max_len)
int _get_max_pdu_size(netdev_t *dev, void *value, size_t max_len)
{
(void)dev;
assert(max_len == sizeof(uint16_t));
@ -104,8 +104,8 @@ void _tests_init(void)
_get_device_type);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_PROTO,
_get_netdev_proto);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
_get_max_packet_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
_get_max_pdu_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_SRC_LEN,
_get_src_len);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_ADDRESS_LONG,

6
tests/gnrc_sixlowpan_frag_sfr/mockup_netif.c
View File

@ -59,7 +59,7 @@ static int _get_netdev_proto(netdev_t *netdev, void *value, size_t max_len)
return sizeof(gnrc_nettype_t);
}
int _get_max_packet_size(netdev_t *dev, void *value, size_t max_len)
int _get_max_pdu_size(netdev_t *dev, void *value, size_t max_len)
{
(void)dev;
assert(max_len == sizeof(uint16_t));
@ -104,8 +104,8 @@ void _tests_init(void)
_get_device_type);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_PROTO,
_get_netdev_proto);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
_get_max_packet_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
_get_max_pdu_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_SRC_LEN,
_get_src_len);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_ADDRESS_LONG,