From 83ad55bc1bd2daa8229223f80b3ba6d60c2be3ca Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 20 Nov 2020 13:56:48 +0100 Subject: [PATCH] all: adapt to moved sched defines --- core/include/rmutex.h | 2 +- drivers/include/pir.h | 2 +- pkg/lwip/include/arch/sys_arch.h | 2 +- pkg/uwb-core/include/dpl/dpl_tasks.h | 2 +- sys/include/can/device.h | 2 +- sys/include/can/raw.h | 2 +- sys/include/net/fib.h | 2 +- sys/include/net/fib/table.h | 2 +- sys/include/net/gnrc/ipv6.h | 2 +- sys/include/net/gnrc/netif.h | 2 +- sys/include/net/gnrc/netreg.h | 2 +- sys/include/net/gnrc/pkt.h | 2 +- sys/include/net/gnrc/pktdump.h | 2 +- sys/include/net/gnrc/sixlowpan.h | 2 +- sys/include/net/gnrc/sixlowpan/frag/fb.h | 2 +- sys/include/usb/usbus.h | 2 +- sys/include/xtimer.h | 2 +- sys/include/ztimer.h | 2 +- sys/include/ztimer/xtimer_compat.h | 2 +- sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 2 +- sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h | 2 +- sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c | 2 +- sys/ps/ps.c | 2 +- sys/shell/commands/sc_gnrc_icmpv6_echo.c | 2 +- sys/vfs/vfs.c | 2 +- tests/bench_sizeof_coretypes/main.c | 2 +- tests/thread_flood/main.c | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/include/rmutex.h b/core/include/rmutex.h index 67f664f5499b0..3fc6585782ef0 100644 --- a/core/include/rmutex.h +++ b/core/include/rmutex.h @@ -31,7 +31,7 @@ #endif #include "mutex.h" -#include "kernel_types.h" +#include "sched.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/include/pir.h b/drivers/include/pir.h index 7e2343112f75b..b46989c1af7f0 100644 --- a/drivers/include/pir.h +++ b/drivers/include/pir.h @@ -22,7 +22,7 @@ #ifndef PIR_H #define PIR_H -#include "kernel_types.h" +#include "sched.h" #include "periph/gpio.h" #include "stdbool.h" diff --git a/pkg/lwip/include/arch/sys_arch.h b/pkg/lwip/include/arch/sys_arch.h index 7ac430a30b495..d90b8e7b1a3bc 100644 --- a/pkg/lwip/include/arch/sys_arch.h +++ b/pkg/lwip/include/arch/sys_arch.h @@ -25,7 +25,7 @@ #include #include "cib.h" -#include "kernel_types.h" +#include "sched.h" #include "mbox.h" #include "mutex.h" #include "random.h" diff --git a/pkg/uwb-core/include/dpl/dpl_tasks.h b/pkg/uwb-core/include/dpl/dpl_tasks.h index 29591396b2ff0..62b2139aaf4f5 100644 --- a/pkg/uwb-core/include/dpl/dpl_tasks.h +++ b/pkg/uwb-core/include/dpl/dpl_tasks.h @@ -22,7 +22,7 @@ #include "dpl_types.h" -#include "kernel_types.h" +#include "sched.h" #include "thread.h" #ifdef __cplusplus diff --git a/sys/include/can/device.h b/sys/include/can/device.h index 7a484ae03f32d..f0dbaa041e5d0 100644 --- a/sys/include/can/device.h +++ b/sys/include/can/device.h @@ -25,7 +25,7 @@ extern "C" { #endif #include "can/candev.h" -#include "kernel_types.h" +#include "sched.h" #ifdef MODULE_CAN_PM #include "xtimer.h" diff --git a/sys/include/can/raw.h b/sys/include/can/raw.h index 27aa881338779..49a704048831e 100644 --- a/sys/include/can/raw.h +++ b/sys/include/can/raw.h @@ -28,7 +28,7 @@ extern "C" { #endif -#include "kernel_types.h" +#include "sched.h" #include "can/can.h" #include "can/common.h" #include "can/device.h" diff --git a/sys/include/net/fib.h b/sys/include/net/fib.h index ef33af7fbc70c..6e73cb39eba98 100644 --- a/sys/include/net/fib.h +++ b/sys/include/net/fib.h @@ -28,7 +28,7 @@ #include #include "net/fib/table.h" -#include "kernel_types.h" +#include "sched.h" #ifdef __cplusplus extern "C" { diff --git a/sys/include/net/fib/table.h b/sys/include/net/fib/table.h index d6e7e7704b513..9cbe50dbe031d 100644 --- a/sys/include/net/fib/table.h +++ b/sys/include/net/fib/table.h @@ -21,7 +21,7 @@ #include -#include "kernel_types.h" +#include "sched.h" #include "universal_address.h" #include "mutex.h" diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h index e230824a03a18..65dc661b701f6 100644 --- a/sys/include/net/gnrc/ipv6.h +++ b/sys/include/net/gnrc/ipv6.h @@ -99,7 +99,7 @@ #ifndef NET_GNRC_IPV6_H #define NET_GNRC_IPV6_H -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc.h" #include "thread.h" diff --git a/sys/include/net/gnrc/netif.h b/sys/include/net/gnrc/netif.h index 62aa4e7c2d0a7..aa79a6597db1e 100644 --- a/sys/include/net/gnrc/netif.h +++ b/sys/include/net/gnrc/netif.h @@ -33,7 +33,7 @@ #include #include -#include "kernel_types.h" +#include "sched.h" #include "msg.h" #ifdef MODULE_GNRC_NETIF_BUS #include "msg_bus.h" diff --git a/sys/include/net/gnrc/netreg.h b/sys/include/net/gnrc/netreg.h index a31782483e82c..321c0a7ef4c1a 100644 --- a/sys/include/net/gnrc/netreg.h +++ b/sys/include/net/gnrc/netreg.h @@ -23,7 +23,7 @@ #include -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc/nettype.h" #include "net/gnrc/pkt.h" diff --git a/sys/include/net/gnrc/pkt.h b/sys/include/net/gnrc/pkt.h index c704d90931526..6f8b371d8a0a6 100644 --- a/sys/include/net/gnrc/pkt.h +++ b/sys/include/net/gnrc/pkt.h @@ -25,7 +25,7 @@ #include #include -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc/nettype.h" #include "list.h" diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h index 4448dbee068cf..bac76cd0e4095 100644 --- a/sys/include/net/gnrc/pktdump.h +++ b/sys/include/net/gnrc/pktdump.h @@ -22,7 +22,7 @@ #ifndef NET_GNRC_PKTDUMP_H #define NET_GNRC_PKTDUMP_H -#include "kernel_types.h" +#include "sched.h" #ifdef __cplusplus extern "C" { diff --git a/sys/include/net/gnrc/sixlowpan.h b/sys/include/net/gnrc/sixlowpan.h index e7c0c813574c1..caca204c16e45 100644 --- a/sys/include/net/gnrc/sixlowpan.h +++ b/sys/include/net/gnrc/sixlowpan.h @@ -137,7 +137,7 @@ #include -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc/sixlowpan/config.h" #include "net/gnrc/sixlowpan/frag.h" diff --git a/sys/include/net/gnrc/sixlowpan/frag/fb.h b/sys/include/net/gnrc/sixlowpan/frag/fb.h index 4bcef54626d95..1181c497a619b 100644 --- a/sys/include/net/gnrc/sixlowpan/frag/fb.h +++ b/sys/include/net/gnrc/sixlowpan/frag/fb.h @@ -88,7 +88,7 @@ gnrc_sixlowpan_frag_fb_t *gnrc_sixlowpan_frag_fb_get_by_tag(uint16_t tag); uint16_t gnrc_sixlowpan_frag_fb_next_tag(void); #if defined(TEST_SUITES) && !defined(DOXYGEN) -#include "kernel_types.h" +#include "sched.h" /* can't include `net/sixlowpan.h` as this would create a cyclical include */ extern kernel_pid_t gnrc_sixlowpan_get_pid(void); diff --git a/sys/include/usb/usbus.h b/sys/include/usb/usbus.h index 8be56c1a10f6f..1e5a8c727f4d2 100644 --- a/sys/include/usb/usbus.h +++ b/sys/include/usb/usbus.h @@ -28,7 +28,7 @@ #include "clist.h" #include "event.h" -#include "kernel_types.h" +#include "sched.h" #include "kernel_defines.h" #include "msg.h" #include "thread.h" diff --git a/sys/include/xtimer.h b/sys/include/xtimer.h index fd732abe057f0..1e09cb129cbab 100644 --- a/sys/include/xtimer.h +++ b/sys/include/xtimer.h @@ -36,7 +36,7 @@ #include "msg.h" #endif /* MODULE_CORE_MSG */ #include "mutex.h" -#include "kernel_types.h" +#include "sched.h" #include "rmutex.h" #ifdef MODULE_ZTIMER_XTIMER_COMPAT diff --git a/sys/include/ztimer.h b/sys/include/ztimer.h index b5182088edc4b..df27ede996a40 100644 --- a/sys/include/ztimer.h +++ b/sys/include/ztimer.h @@ -234,7 +234,7 @@ #include -#include "kernel_types.h" +#include "sched.h" #include "msg.h" #ifdef __cplusplus diff --git a/sys/include/ztimer/xtimer_compat.h b/sys/include/ztimer/xtimer_compat.h index 92ff694d57497..f80a28650001b 100644 --- a/sys/include/ztimer/xtimer_compat.h +++ b/sys/include/ztimer/xtimer_compat.h @@ -28,7 +28,7 @@ #include "msg.h" #endif /* MODULE_CORE_MSG */ #include "mutex.h" -#include "kernel_types.h" +#include "sched.h" #include "ztimer.h" diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c index c6ba081b0c471..2de00e89ae1be 100644 --- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c +++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c @@ -19,7 +19,7 @@ #include "byteorder.h" #include "cpu_conf.h" -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc.h" #include "net/gnrc/icmpv6.h" #include "net/gnrc/sixlowpan/ctx.h" diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h index 0abc44f52fc0d..cc3e62a863230 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h +++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h @@ -27,7 +27,7 @@ #include "bitfield.h" #include "evtimer_msg.h" -#include "kernel_types.h" +#include "sched.h" #include "mutex.h" #include "net/eui64.h" #include "net/ipv6/addr.h" diff --git a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c index adb0c69b5ef5c..3863c01619dac 100644 --- a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c +++ b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c @@ -14,7 +14,7 @@ #include -#include "kernel_types.h" +#include "sched.h" #include "net/gnrc.h" #include "thread.h" #include "utlist.h" diff --git a/sys/ps/ps.c b/sys/ps/ps.c index 0f175fdfbf3f3..808945346a8a1 100644 --- a/sys/ps/ps.c +++ b/sys/ps/ps.c @@ -21,7 +21,7 @@ #include "thread.h" #include "sched.h" #include "thread.h" -#include "kernel_types.h" +#include "sched.h" #ifdef MODULE_SCHEDSTATISTICS #include "schedstatistics.h" diff --git a/sys/shell/commands/sc_gnrc_icmpv6_echo.c b/sys/shell/commands/sc_gnrc_icmpv6_echo.c index 2f241a1986b1b..654f2483eb16f 100644 --- a/sys/shell/commands/sc_gnrc_icmpv6_echo.c +++ b/sys/shell/commands/sc_gnrc_icmpv6_echo.c @@ -26,7 +26,7 @@ #include "bitfield.h" #include "byteorder.h" -#include "kernel_types.h" +#include "sched.h" #ifdef MODULE_LUID #include "luid.h" #endif diff --git a/sys/vfs/vfs.c b/sys/vfs/vfs.c index b0dd00b62d793..a312e98474ce7 100644 --- a/sys/vfs/vfs.c +++ b/sys/vfs/vfs.c @@ -26,7 +26,7 @@ #include "vfs.h" #include "mutex.h" #include "thread.h" -#include "kernel_types.h" +#include "sched.h" #include "clist.h" #define ENABLE_DEBUG 0 diff --git a/tests/bench_sizeof_coretypes/main.c b/tests/bench_sizeof_coretypes/main.c index 76ac94fbcb0c1..b8cce4f19325b 100644 --- a/tests/bench_sizeof_coretypes/main.c +++ b/tests/bench_sizeof_coretypes/main.c @@ -25,7 +25,7 @@ #include "cib.h" #include "clist.h" #include "panic.h" -#include "kernel_types.h" +#include "sched.h" #include "list.h" #include "mbox.h" #include "msg.h" diff --git a/tests/thread_flood/main.c b/tests/thread_flood/main.c index 4ee83d2c29f4d..0ba61374abe43 100644 --- a/tests/thread_flood/main.c +++ b/tests/thread_flood/main.c @@ -25,7 +25,7 @@ #include #include "thread.h" -#include "kernel_types.h" +#include "sched.h" /* One stack for all threads. DON'T TRY THIS AT HOME!! */ static char dummy_stack[THREAD_STACKSIZE_IDLE];