diff --git a/core/include/kernel_types.h b/core/include/kernel_types.h deleted file mode 100644 index 42bb52591c..0000000000 --- a/core/include/kernel_types.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2014 Oliver Hahm - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup core_util - * @{ - * - * @file - * @brief Types used by the kernel - * - * @author Oliver Hahm - * @author René Kijewski - * @author Ludwig Knüpfer - */ - -#ifndef KERNEL_TYPES_H -#define KERNEL_TYPES_H - -#include -#include -#include - -#ifndef NATIVE_INCLUDES -# include -# include - -/** - * @brief Maximum value for ssize_t - */ -# ifndef SSIZE_MAX -# ifdef _POSIX_SSIZE_MAX -# define SSIZE_MAX _POSIX_SSIZE_MAX -# else -# define SSIZE_MAX ((ssize_t)(SIZE_MAX / 2)) -# endif -# endif - -# ifdef MODULE_MSP430_COMMON -typedef signed ssize_t; -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* KERNEL_TYPES_H */ -/** @} */ diff --git a/core/include/thread_flags.h b/core/include/thread_flags.h index dd31692688..7ee41e19d6 100644 --- a/core/include/thread_flags.h +++ b/core/include/thread_flags.h @@ -54,7 +54,6 @@ #ifndef THREAD_FLAGS_H #define THREAD_FLAGS_H -#include "kernel_types.h" #include "sched.h" /* for thread_t typedef */ #ifdef __cplusplus diff --git a/cpu/efm32/include/drivers/coretemp.h b/cpu/efm32/include/drivers/coretemp.h index cdf69ce519..3b28461ea9 100644 --- a/cpu/efm32/include/drivers/coretemp.h +++ b/cpu/efm32/include/drivers/coretemp.h @@ -33,7 +33,7 @@ #ifndef DRIVERS_CORETEMP_H #define DRIVERS_CORETEMP_H -#include "kernel_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/cpu/lpc23xx/periph/rtc.c b/cpu/lpc23xx/periph/rtc.c index 7955f1aa9f..2680d1806a 100644 --- a/cpu/lpc23xx/periph/rtc.c +++ b/cpu/lpc23xx/periph/rtc.c @@ -24,8 +24,6 @@ #include #include -#include "kernel_types.h" - /* cpu */ #include "periph/rtc.h" #include "VIC.h" diff --git a/cpu/native/include/native_internal.h b/cpu/native/include/native_internal.h index 75b1a0a15e..d61689eb26 100644 --- a/cpu/native/include/native_internal.h +++ b/cpu/native/include/native_internal.h @@ -50,8 +50,6 @@ #include #include -#include "kernel_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/dfplayer/include/dfplayer_types.h b/drivers/dfplayer/include/dfplayer_types.h index a880bb7162..fd6ceb41cf 100644 --- a/drivers/dfplayer/include/dfplayer_types.h +++ b/drivers/dfplayer/include/dfplayer_types.h @@ -22,7 +22,6 @@ #include #include -#include "kernel_types.h" #include "mutex.h" #include "periph/gpio.h" #include "periph/uart.h" diff --git a/drivers/include/encx24j600.h b/drivers/include/encx24j600.h index 1951a514d5..396c207eb2 100644 --- a/drivers/include/encx24j600.h +++ b/drivers/include/encx24j600.h @@ -22,7 +22,6 @@ #define ENCX24J600_H #include "mutex.h" -#include "kernel_types.h" #include "periph/spi.h" #include "periph/gpio.h" #include "net/netdev.h" diff --git a/drivers/include/ethos.h b/drivers/include/ethos.h index efc3489c9a..9b39b5b4ab 100644 --- a/drivers/include/ethos.h +++ b/drivers/include/ethos.h @@ -23,7 +23,6 @@ #include -#include "kernel_types.h" #include "periph/uart.h" #include "net/netdev.h" #include "tsrb.h" diff --git a/examples/gcoap/main.c b/examples/gcoap/main.c index 3757922d0e..930964ca78 100644 --- a/examples/gcoap/main.c +++ b/examples/gcoap/main.c @@ -22,7 +22,6 @@ #include "msg.h" #include "net/gcoap.h" -#include "kernel_types.h" #include "shell.h" #define MAIN_QUEUE_SIZE (4) diff --git a/fuzzing/gcoap/main.c b/fuzzing/gcoap/main.c index 6aebc0872c..becfab2c52 100644 --- a/fuzzing/gcoap/main.c +++ b/fuzzing/gcoap/main.c @@ -11,7 +11,6 @@ #include "thread.h" #include "fuzzing.h" -#include "kernel_types.h" #include "net/gcoap.h" #include "net/gnrc/udp.h" diff --git a/pkg/ccn-lite/patches/0001-riot-adapt-to-changed-kernel_types.h-sched.h.patch b/pkg/ccn-lite/patches/0001-riot-adapt-to-changed-kernel_types.h-sched.h.patch new file mode 100644 index 0000000000..1cb3d414c1 --- /dev/null +++ b/pkg/ccn-lite/patches/0001-riot-adapt-to-changed-kernel_types.h-sched.h.patch @@ -0,0 +1,53 @@ +From 33251cb1c9cb2a4ef910c5d20dbe12373e3a2264 Mon Sep 17 00:00:00 2001 +From: Kaspar Schleiser +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 +-#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 + + /* RIOT specific includes */ +-#include "kernel_types.h" ++#include "sched.h" + #include "random.h" + #include "timex.h" + #include "xtimer.h" +-- +2.29.2 + diff --git a/pkg/lwip/Makefile.include b/pkg/lwip/Makefile.include index bc6e3cea75..caf6629cb9 100644 --- a/pkg/lwip/Makefile.include +++ b/pkg/lwip/Makefile.include @@ -17,6 +17,12 @@ PSEUDOMODULES += lwip_udp PSEUDOMODULES += lwip_udplite PSEUDOMODULES += lwip_sock_async +# lwip's include/lwip/arch.h decides based on existence of SSIZE_MAX whether it +# should define ssize_t. That doesn't work with the mips toolchain. +ifneq (, $(filter mips32r2_common,$(USEMODULE))) + CFLAGS += -DSSIZE_MAX=INT_MAX +endif + ifneq (,$(filter lwip_contrib,$(USEMODULE))) DIRS += $(RIOTBASE)/pkg/lwip/contrib endif diff --git a/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch b/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch index 76231a7648..1754bb5af4 100644 --- a/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch +++ b/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch @@ -1,13 +1,47 @@ -From 51d973f2a0a04a716af8260c62fb5045356a30a5 Mon Sep 17 00:00:00 2001 +From 17b6e4d2da20af995e914c8650ee825d052c5bc6 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Mon, 23 Nov 2020 12:44:54 +0100 Subject: [PATCH] adapt to moved kernel_pid_t location --- - face-table.h | 2 +- - ndn.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + app.h | 2 +- + cs.h | 1 - + face-table.h | 2 +- + fib.h | 2 +- + forwarding-strategy.h | 2 +- + l2.h | 2 +- + ndn.h | 2 +- + netif.h | 2 +- + pit.h | 2 +- + 9 files changed, 8 insertions(+), 9 deletions(-) +diff --git a/app.h b/app.h +index 6428921acf..c357692a38 100644 +--- a/app.h ++++ b/app.h +@@ -23,9 +23,9 @@ + #include "encoding/name.h" + #include "forwarding-strategy.h" + +-#include + #include + #include ++#include "sched.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/cs.h b/cs.h +index 36bf38d82a..01edf2bbc1 100644 +--- a/cs.h ++++ b/cs.h +@@ -22,7 +22,6 @@ + + #include "encoding/shared-block.h" + +-#include + //#include + + #ifdef __cplusplus diff --git a/face-table.h b/face-table.h index 28b44a5c02..fb0c39b083 100644 --- a/face-table.h @@ -19,6 +53,47 @@ index 28b44a5c02..fb0c39b083 100644 -#include +#include "sched.h" + #ifdef __cplusplus + extern "C" { +diff --git a/fib.h b/fib.h +index 8d5f01ab79..5e190d283a 100644 +--- a/fib.h ++++ b/fib.h +@@ -23,8 +23,8 @@ + #include "encoding/shared-block.h" + #include "face-table.h" + +-#include + #include ++#include "sched.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/forwarding-strategy.h b/forwarding-strategy.h +index 43ad66c276..15fdc5b8c7 100644 +--- a/forwarding-strategy.h ++++ b/forwarding-strategy.h +@@ -22,7 +22,7 @@ + + #include "encoding/shared-block.h" + +-#include ++#include "sched.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/l2.h b/l2.h +index 2dc1dad986..6322276f10 100644 +--- a/l2.h ++++ b/l2.h +@@ -22,8 +22,8 @@ + + #include "encoding/shared-block.h" + +-#include + #include ++#include "sched.h" + #ifdef __cplusplus extern "C" { diff --git a/ndn.h b/ndn.h @@ -34,6 +109,32 @@ index d8d148c7f7..47d2032301 100644 #ifdef __cplusplus extern "C" { +diff --git a/netif.h b/netif.h +index 2175858fbd..4cf3c9bd54 100644 +--- a/netif.h ++++ b/netif.h +@@ -20,7 +20,7 @@ + #ifndef NDN_NETIF_H_ + #define NDN_NETIF_H_ + +-#include ++#include "sched.h" + + #include "encoding/block.h" + +diff --git a/pit.h b/pit.h +index dbe433eeda..3384a4c887 100644 +--- a/pit.h ++++ b/pit.h +@@ -23,7 +23,7 @@ + #include "encoding/shared-block.h" + #include "face-table.h" + +-#include ++#include "sched.h" + #include + + #ifdef __cplusplus -- 2.29.2 diff --git a/sys/include/can/router.h b/sys/include/can/router.h index 4120c00ca4..a842fa0338 100644 --- a/sys/include/can/router.h +++ b/sys/include/can/router.h @@ -24,8 +24,6 @@ extern "C" { #endif -#include "kernel_types.h" - #include "can/can.h" #include "can/pkt.h" diff --git a/sys/include/net/gnrc/gomach/gomach.h b/sys/include/net/gnrc/gomach/gomach.h index 062e3b7254..730569cd96 100644 --- a/sys/include/net/gnrc/gomach/gomach.h +++ b/sys/include/net/gnrc/gomach/gomach.h @@ -41,7 +41,6 @@ #define NET_GNRC_GOMACH_GOMACH_H #include "periph/rtt.h" -#include "kernel_types.h" #include "net/gnrc/netif.h" #ifdef __cplusplus diff --git a/sys/include/net/gnrc/gomach/types.h b/sys/include/net/gnrc/gomach/types.h index 4f20bd45f7..018f1c0ece 100644 --- a/sys/include/net/gnrc/gomach/types.h +++ b/sys/include/net/gnrc/gomach/types.h @@ -22,7 +22,6 @@ #include #include -#include "kernel_types.h" #include "xtimer.h" #include "net/gnrc/gomach/hdr.h" diff --git a/sys/include/net/gnrc/lwmac/lwmac.h b/sys/include/net/gnrc/lwmac/lwmac.h index eaf1af5803..7e4b121cd0 100644 --- a/sys/include/net/gnrc/lwmac/lwmac.h +++ b/sys/include/net/gnrc/lwmac/lwmac.h @@ -73,7 +73,6 @@ #ifndef NET_GNRC_LWMAC_LWMAC_H #define NET_GNRC_LWMAC_LWMAC_H -#include "kernel_types.h" #include "net/gnrc/netif.h" #ifdef __cplusplus diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h index 32f3b98a8b..983e0f13b4 100644 --- a/sys/include/net/gnrc/mac/types.h +++ b/sys/include/net/gnrc/mac/types.h @@ -24,7 +24,6 @@ #include #include -#include "kernel_types.h" #include "net/gnrc/pkt.h" #include "net/gnrc/priority_pktqueue.h" #include "net/ieee802154.h" diff --git a/sys/include/net/gnrc/ndp.h b/sys/include/net/gnrc/ndp.h index 5ae27e4d51..2eb8057600 100644 --- a/sys/include/net/gnrc/ndp.h +++ b/sys/include/net/gnrc/ndp.h @@ -22,7 +22,6 @@ #include -#include "kernel_types.h" #include "net/gnrc/pkt.h" #include "net/gnrc/netif.h" #include "net/ipv6/addr.h" diff --git a/sys/include/net/gnrc/neterr.h b/sys/include/net/gnrc/neterr.h index df7ab437c9..22cada1936 100644 --- a/sys/include/net/gnrc/neterr.h +++ b/sys/include/net/gnrc/neterr.h @@ -23,7 +23,6 @@ #include #include -#include "kernel_types.h" #include "msg.h" #include "net/gnrc/pkt.h" #include "thread.h" diff --git a/sys/include/net/gnrc/sixlowpan/nd.h b/sys/include/net/gnrc/sixlowpan/nd.h index ef98c2d869..15abd2634c 100644 --- a/sys/include/net/gnrc/sixlowpan/nd.h +++ b/sys/include/net/gnrc/sixlowpan/nd.h @@ -25,7 +25,6 @@ #include -#include "kernel_types.h" #include "net/gnrc/pkt.h" #include "net/gnrc/sixlowpan/config.h" #include "net/ipv6/addr.h" diff --git a/sys/include/net/gnrc/tcp/tcb.h b/sys/include/net/gnrc/tcp/tcb.h index 71e2356630..0f8408d796 100644 --- a/sys/include/net/gnrc/tcp/tcb.h +++ b/sys/include/net/gnrc/tcp/tcb.h @@ -21,7 +21,6 @@ #define NET_GNRC_TCP_TCB_H #include -#include "kernel_types.h" #include "ringbuffer.h" #include "mutex.h" #include "evtimer_msg.h" diff --git a/sys/include/schedstatistics.h b/sys/include/schedstatistics.h index 1437487a5b..4e6352bf35 100644 --- a/sys/include/schedstatistics.h +++ b/sys/include/schedstatistics.h @@ -30,7 +30,6 @@ #define SCHEDSTATISTICS_H #include -#include "kernel_types.h" #ifdef __cplusplus extern "C" { diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c index f615f06eea..f9fe3e4154 100644 --- a/sys/net/gnrc/netif/gnrc_netif.c +++ b/sys/net/gnrc/netif/gnrc_netif.c @@ -16,6 +16,7 @@ */ #include +#include #include #include diff --git a/sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c b/sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c index b6c663ec60..e7388234ac 100644 --- a/sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c +++ b/sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c @@ -19,7 +19,6 @@ #include #include -#include "kernel_types.h" #include "net/gnrc/pktbuf.h" #include "net/gnrc/netapi.h" #include "net/gnrc/netif/hdr.h" diff --git a/sys/net/gnrc/transport_layer/tcp/include/gnrc_tcp_common.h b/sys/net/gnrc/transport_layer/tcp/include/gnrc_tcp_common.h index fa694e234a..6067dadadb 100644 --- a/sys/net/gnrc/transport_layer/tcp/include/gnrc_tcp_common.h +++ b/sys/net/gnrc/transport_layer/tcp/include/gnrc_tcp_common.h @@ -21,7 +21,6 @@ #define GNRC_TCP_COMMON_H #include -#include "kernel_types.h" #include "thread.h" #include "mutex.h" #include "evtimer.h" diff --git a/sys/posix/include/sys/socket.h b/sys/posix/include/sys/socket.h index dc202a6a2e..a95b591305 100644 --- a/sys/posix/include/sys/socket.h +++ b/sys/posix/include/sys/socket.h @@ -42,7 +42,6 @@ #include #include -#include "kernel_types.h" #include "net/af.h" #include "sys/bytes.h" diff --git a/sys/shell/commands/sc_gnrc_icmpv6_echo.c b/sys/shell/commands/sc_gnrc_icmpv6_echo.c index 654f2483eb..f6bf9ab87b 100644 --- a/sys/shell/commands/sc_gnrc_icmpv6_echo.c +++ b/sys/shell/commands/sc_gnrc_icmpv6_echo.c @@ -20,6 +20,7 @@ */ #ifdef MODULE_GNRC_ICMPV6 +#include #include #include #include diff --git a/sys/shell/commands/sc_gnrc_netif.c b/sys/shell/commands/sc_gnrc_netif.c index 46369fffe7..a3ea6d346b 100644 --- a/sys/shell/commands/sc_gnrc_netif.c +++ b/sys/shell/commands/sc_gnrc_netif.c @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c index c3e1075b58..568eddf703 100644 --- a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c +++ b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c @@ -22,6 +22,7 @@ #define USB_H_USER_IS_RIOT_INTERNAL #include +#include #include "log.h" #include "isrpipe.h" diff --git a/tests/gnrc_ipv6_fwd_w_sub/main.c b/tests/gnrc_ipv6_fwd_w_sub/main.c index 22878ddbf0..d10ae2e723 100644 --- a/tests/gnrc_ipv6_fwd_w_sub/main.c +++ b/tests/gnrc_ipv6_fwd_w_sub/main.c @@ -22,7 +22,6 @@ #include #include -#include "kernel_types.h" #include "msg.h" #include "net/ethernet/hdr.h" #include "net/ipv6/addr.h" diff --git a/tests/nanocoap_cli/main.c b/tests/nanocoap_cli/main.c index 7cf7d39e70..af8e3e9d48 100644 --- a/tests/nanocoap_cli/main.c +++ b/tests/nanocoap_cli/main.c @@ -21,7 +21,6 @@ #include #include "msg.h" -#include "kernel_types.h" #include "net/gnrc/netif.h" #include "net/ipv6/addr.h" #include "shell.h" diff --git a/tests/pthread_flood/main.c b/tests/pthread_flood/main.c index 1f13848b52..f3308a2f7c 100644 --- a/tests/pthread_flood/main.c +++ b/tests/pthread_flood/main.c @@ -22,7 +22,6 @@ #include -#include "kernel_types.h" #include "thread.h" #include "pthread.h" #include "mutex.h"