Merge pull request #15482 from kaspar030/remove_kernel_types

core: remove kernel_types.h

core/include/kernel_types.h

@@ -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 <oliver.hahm@inria.fr>
- * @author      René Kijewski <rene.kijewski@fu-berlin.de>
- * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
- */
-
-#ifndef KERNEL_TYPES_H
-#define KERNEL_TYPES_H
-
-#include <stdint.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#ifndef NATIVE_INCLUDES
-#   include <stddef.h>
-#   include <sys/types.h>
-
-/**
- * @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 */
-/** @} */

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

cpu/efm32/include/drivers/coretemp.h

@@ -33,7 +33,7 @@
 #ifndef DRIVERS_CORETEMP_H
 #define DRIVERS_CORETEMP_H
 
-#include "kernel_types.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

cpu/lpc23xx/periph/rtc.c

@@ -24,8 +24,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "kernel_types.h"
-
 /* cpu */
 #include "periph/rtc.h"
 #include "VIC.h"

cpu/native/include/native_internal.h

@@ -50,8 +50,6 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 
-#include "kernel_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

drivers/dfplayer/include/dfplayer_types.h

@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "kernel_types.h"
 #include "mutex.h"
 #include "periph/gpio.h"
 #include "periph/uart.h"

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"

drivers/include/ethos.h

@@ -23,7 +23,6 @@
 
 #include <stdbool.h>
 
-#include "kernel_types.h"
 #include "periph/uart.h"
 #include "net/netdev.h"
 #include "tsrb.h"

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)

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"

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 <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
+

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

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 <kaspar@schleiser.de>
 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 <kernel_types.h>
+ #include <xtimer.h>
+ #include <net/gnrc/pktbuf.h>
++#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 <kernel_types.h>
+ //#include <xtimer.h>
+ 
+ #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 <kernel_types.h>
 +#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 <kernel_types.h>
+ #include <xtimer.h>
++#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 <kernel_types.h>
++#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 <kernel_types.h>
+ #include <net/gnrc/pktbuf.h>
++#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 <kernel_types.h>
++#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 <kernel_types.h>
++#include "sched.h"
+ #include <xtimer.h>
+ 
+ #ifdef __cplusplus
 -- 
 2.29.2
 

sys/include/can/router.h

@@ -24,8 +24,6 @@
 extern "C" {
 #endif
 
-#include "kernel_types.h"
-
 #include "can/can.h"
 #include "can/pkt.h"
 

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

sys/include/net/gnrc/gomach/types.h

@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "kernel_types.h"
 #include "xtimer.h"
 #include "net/gnrc/gomach/hdr.h"
 

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

sys/include/net/gnrc/mac/types.h

@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "kernel_types.h"
 #include "net/gnrc/pkt.h"
 #include "net/gnrc/priority_pktqueue.h"
 #include "net/ieee802154.h"

sys/include/net/gnrc/ndp.h

@@ -22,7 +22,6 @@
 
 #include <stdint.h>
 
-#include "kernel_types.h"
 #include "net/gnrc/pkt.h"
 #include "net/gnrc/netif.h"
 #include "net/ipv6/addr.h"

sys/include/net/gnrc/neterr.h

@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include "kernel_types.h"
 #include "msg.h"
 #include "net/gnrc/pkt.h"
 #include "thread.h"

sys/include/net/gnrc/sixlowpan/nd.h

@@ -25,7 +25,6 @@
 
 #include <stdint.h>
 
-#include "kernel_types.h"
 #include "net/gnrc/pkt.h"
 #include "net/gnrc/sixlowpan/config.h"
 #include "net/ipv6/addr.h"

sys/include/net/gnrc/tcp/tcb.h

@@ -21,7 +21,6 @@
 #define NET_GNRC_TCP_TCB_H
 
 #include <stdint.h>
-#include "kernel_types.h"
 #include "ringbuffer.h"
 #include "mutex.h"
 #include "evtimer_msg.h"

sys/include/schedstatistics.h

@@ -30,7 +30,6 @@
 #define SCHEDSTATISTICS_H
 
 #include <stdint.h>
-#include "kernel_types.h"
 
 #ifdef __cplusplus
  extern "C" {

sys/net/gnrc/netif/gnrc_netif.c

@@ -16,6 +16,7 @@
  */
 
 #include <assert.h>
+#include <limits.h>
 #include <string.h>
 #include <kernel_defines.h>
 

sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c

@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <inttypes.h>
 
-#include "kernel_types.h"
 #include "net/gnrc/pktbuf.h"
 #include "net/gnrc/netapi.h"
 #include "net/gnrc/netif/hdr.h"

sys/net/gnrc/transport_layer/tcp/include/gnrc_tcp_common.h

@@ -21,7 +21,6 @@
 #define GNRC_TCP_COMMON_H
 
 #include <stdint.h>
-#include "kernel_types.h"
 #include "thread.h"
 #include "mutex.h"
 #include "evtimer.h"

sys/posix/include/sys/socket.h

@@ -42,7 +42,6 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "kernel_types.h"
 #include "net/af.h"
 #include "sys/bytes.h"
 

sys/shell/commands/sc_gnrc_icmpv6_echo.c

@@ -20,6 +20,7 @@
  */
 
 #ifdef MODULE_GNRC_ICMPV6
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>

sys/shell/commands/sc_gnrc_netif.c

@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 

sys/usb/usbus/cdc/acm/cdc_acm_stdio.c

@@ -22,6 +22,7 @@
 #define USB_H_USER_IS_RIOT_INTERNAL
 
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "log.h"
 #include "isrpipe.h"

tests/gnrc_ipv6_fwd_w_sub/main.c

@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "kernel_types.h"
 #include "msg.h"
 #include "net/ethernet/hdr.h"
 #include "net/ipv6/addr.h"

tests/nanocoap_cli/main.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include "msg.h"
 
-#include "kernel_types.h"
 #include "net/gnrc/netif.h"
 #include "net/ipv6/addr.h"
 #include "shell.h"

tests/pthread_flood/main.c

@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "kernel_types.h"
 #include "thread.h"
 #include "pthread.h"
 #include "mutex.h"