Skip to content

Commit

Permalink
Merge pull request #18887 from kfessel/p-clean-header-kerneldef
Browse files Browse the repository at this point in the history 
sys/include: remove kernel_defines.h where not needed
  • Loading branch information
@benpicco
benpicco authored Nov 29, 2022
2 parents 045bb7c + d301de4 commit 388f9a2
Show file tree
Hide file tree
Showing 55 changed files with 54 additions and 36 deletions.
1 change: 1 addition & 0 deletions drivers/sht1x/sht1x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "sht1x.h"
#include "sht1x_defines.h"
#include "bitarithm.h"
#include "container.h"

#define ENABLE_DEBUG 0
#include "debug.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/auto_init_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <stdint.h>
#include "xfa.h"
#include "macros/xtstr.h"
#include "kernel_defines.h"
#include "modules.h"
#if IS_USED(MODULE_PREPROCESSOR_SUCCESSOR)
#include "preprocessor_successor.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion sys/include/crypto/ciphers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define CRYPTO_CIPHERS_H

#include <stdint.h>
#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/dbgpin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef DBGPIN_H
#define DBGPIN_H

#include "kernel_defines.h"
#include "container.h"
#include "periph/gpio.h"

#ifdef __cplusplus
Expand Down
1 change: 0 additions & 1 deletion sys/include/embUnit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#define EMBUNIT_H

#include "embUnit/embUnit.h"
#include "kernel_defines.h"

#ifdef OUTPUT
# define OUTPUT_XML (1)
Expand Down
2 changes: 1 addition & 1 deletion sys/include/evtimer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#define EVTIMER_H

#include <stdint.h>
#include "kernel_defines.h"
#include "modules.h"

#if IS_USED(MODULE_EVTIMER_ON_ZTIMER)
#include "ztimer.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/credman.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <unistd.h>
#include <stdint.h>
#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/dns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef NET_DNS_H
#define NET_DNS_H

#include "kernel_defines.h"
#include "modules.h"
#include "net/sock/dns.h"
#include "net/sock/dodtls.h"
#include "net/gcoap/dns.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/dns/cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <stdint.h>

#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/ipv6/nib/abr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef NET_GNRC_IPV6_NIB_ABR_H
#define NET_GNRC_IPV6_NIB_ABR_H

#include <kernel_defines.h>
#include "modules.h"

/* prevent cascading include error to xtimer if it is not compiled in or not
* supported by board */
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/ipv6/nib/conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef NET_GNRC_IPV6_NIB_CONF_H
#define NET_GNRC_IPV6_NIB_CONF_H

#include <kernel_defines.h>
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/ipv6/nib/pl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define NET_GNRC_IPV6_NIB_PL_H

#include <stdint.h>
#include <kernel_defines.h>
#include "modules.h"

#if IS_USED(MODULE_EVTIMER)
#include "evtimer.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/lorawan/region.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef NET_GNRC_LORAWAN_REGION_H
#define NET_GNRC_LORAWAN_REGION_H

#include "kernel_defines.h"
#include "modules.h"
#include "net/gnrc/lorawan.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/mac/mac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @author Shuguo Zhuo <shuguo.zhuo@inria.fr>
*/

#include "kernel_defines.h"
#include "modules.h"

#ifndef NET_GNRC_MAC_MAC_H
#define NET_GNRC_MAC_MAC_H
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/netif/conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef NET_GNRC_NETIF_CONF_H
#define NET_GNRC_NETIF_CONF_H

#include <kernel_defines.h>
#include "modules.h"

#include "net/dhcpv6/client.h"
#include "net/ieee802154.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/netif/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef NET_GNRC_NETIF_INTERNAL_H
#define NET_GNRC_NETIF_INTERNAL_H

#include <kernel_defines.h>
#include "modules.h"

#include "net/gnrc/netif.h"
#include "net/l2util.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/netif/ipv6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef NET_GNRC_NETIF_IPV6_H
#define NET_GNRC_NETIF_IPV6_H

#include <kernel_defines.h>
#include "modules.h"

#include "evtimer_msg.h"
#include "net/ipv6/addr.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/nettype.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <inttypes.h>

#include "kernel_defines.h"
#include "modules.h"
#include "net/ethertype.h"
#include "net/protnum.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/rpl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@

#include <string.h>
#include <stdint.h>
#include "kernel_defines.h"
#include "modules.h"
#include "net/gnrc.h"
#include "net/gnrc/ipv6.h"
#include "net/ipv6/addr.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/sixlowpan/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef NET_GNRC_SIXLOWPAN_CONFIG_H
#define NET_GNRC_SIXLOWPAN_CONFIG_H

#include "kernel_defines.h"
#include "modules.h"
#include "timex.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/sixlowpan/ctx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "net/ipv6/addr.h"
#include "timex.h"
#include <kernel_defines.h>
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/sixlowpan/frag/sfr/congure.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <stdlib.h>

#include "congure.h"
#include "kernel_defines.h"
#include "modules.h"
#include "net/gnrc/sixlowpan/frag/sfr.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/sixlowpan/frag/sfr_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "clist.h"
#include "congure.h"
#include "evtimer_msg.h"
#include "kernel_defines.h"
#include "modules.h"
#include "msg.h"
#include "xtimer.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/gnrc/sixlowpan/frag/vrb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <stdbool.h>
#include <stdint.h>

#include "kernel_defines.h"
#include "modules.h"
#include "net/gnrc/netif.h"
#include "net/gnrc/sixlowpan/config.h"
#ifdef MODULE_GNRC_SIXLOWPAN_FRAG
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/ieee802154.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "byteorder.h"
#include "net/eui64.h"
#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
1 change: 0 additions & 1 deletion sys/include/net/ieee802154_security.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#define NET_IEEE802154_SECURITY_H

#include <stdint.h>
#include "kernel_defines.h"
#include "ieee802154.h"
#include "crypto/ciphers.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/lora.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <stdint.h>
#include <stdlib.h>

#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/net/loramac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <stdint.h>
#include <stdlib.h>

#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/phydat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#include <stddef.h>
#include <stdint.h>
#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/senml.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <stdbool.h>
#include <stdint.h>

#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/shell.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <stdint.h>
#include "periph/pm.h"

#include "kernel_defines.h"
#include "modules.h"
#include "xfa.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/include/stdio_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <unistd.h>

#include "kernel_defines.h"
#include "modules.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion sys/include/string_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <strings.h>
#include <sys/types.h>

#include "kernel_defines.h"
#include "modules.h"

#ifndef STRING_UTILS_H
#define STRING_UTILS_H
Expand Down
2 changes: 0 additions & 2 deletions sys/include/tm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include <sys/time.h>
#include <stdint.h>

#include "kernel_defines.h"

#ifdef __cplusplus
extern "C" {
#endif
Expand Down
2 changes: 1 addition & 1 deletion sys/include/usb/usbus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "clist.h"
#include "event.h"
#include "sched.h"
#include "kernel_defines.h"
#include "modules.h"
#include "msg.h"
#include "thread.h"

Expand Down
1 change: 1 addition & 0 deletions sys/shell/cmds/gnrc_netif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "net/loramac.h"
#include "net/netif.h"
#include "shell.h"
#include "container.h"

#ifdef MODULE_NETSTATS
#include "net/netstats.h"
Expand Down
1 change: 1 addition & 0 deletions sys/shell/cmds/openwsn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "net/ipv6/addr.h"
#include "net/l2util.h"
#include "net/netif.h"
#include "container.h"

#include "openwsn.h"
#include "opendefs.h"
Expand Down
1 change: 1 addition & 0 deletions sys/shell/cmds/sht1x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <string.h>

#include "shell.h"
#include "container.h"
#include "sht1x.h"
#include "sht1x_params.h"

Expand Down
2 changes: 1 addition & 1 deletion tests/can_trx/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <stdio.h>
#include <stdlib.h>

#include "kernel_defines.h"
#include "can/can_trx.h"

#include "shell.h"

#ifdef MODULE_TJA1042
Expand Down
1 change: 1 addition & 0 deletions tests/driver_dynamixel/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "stdio_uart.h"
#include "board.h"
#include "periph/gpio.h"
#include "container.h"

#include <stdio.h>
#include <string.h>
Expand Down
1 change: 1 addition & 0 deletions tests/driver_feetech/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "feetech.h"
#include "shell.h"
#include "stdio_uart.h"
#include "container.h"

#include <stdio.h>
#include <string.h>
Expand Down
1 change: 1 addition & 0 deletions tests/driver_sdcard_spi/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "sdcard_spi_internal.h"
#include "sdcard_spi_params.h"
#include "fmt.h"
#include "container.h"
#include <inttypes.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 2 additions & 0 deletions tests/driver_sht1x/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
*/

#include <stdio.h>
#include <stddef.h>

#include "shell.h"
#include "sht1x_params.h"
#include "container.h"

#define SHT1X_NUM ARRAY_SIZE(sht1x_params)
extern sht1x_dev_t sht1x_devs[SHT1X_NUM];
Expand Down
1 change: 1 addition & 0 deletions tests/gnrc_dhcpv6_client_6lbr/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* @author Martine Lenders <m.lenders@fu-berlin.de>
*/

#include <stddef.h>
#include "shell.h"

int main(void)
Expand Down
1 change: 1 addition & 0 deletions tests/gnrc_dhcpv6_client_stateless/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* @author Martine Lenders <m.lenders@fu-berlin.de>
*/

#include <stddef.h>
#include "shell.h"

int main(void)
Expand Down
Loading

0 comments on commit 388f9a2

Please sign in to comment.