Skip to content

Commit 9ab2a56

Browse files
committed
cleanup: include/: move misc/printk.h to sys/printk.h
move misc/printk.h to sys/printk.h and create a shim for backward-compatibility. No functional changes to the headers. A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES. Related to zephyrproject-rtos#16539 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent 0c9e280 commit 9ab2a56

File tree

258 files changed

+355
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+355
-340
lines changed

arch/arc/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <offsets_short.h>
1717
#include <toolchain.h>
1818
#include <arch/cpu.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020
#include <logging/log_ctrl.h>
2121

2222
/**

arch/arc/core/fault.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <kernel.h>
1919
#include <kernel_structs.h>
20-
#include <misc/printk.h>
20+
#include <sys/printk.h>
2121
#include <exc_handle.h>
2222
#include <logging/log_ctrl.h>
2323

arch/arc/core/irq_manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <linker/sections.h>
2525
#include <sw_isr_table.h>
2626
#include <irq.h>
27-
#include <misc/printk.h>
27+
#include <sys/printk.h>
2828

2929
/*
3030
* @brief Enable an interrupt line

arch/arc/core/sys_fatal_error_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <toolchain.h>
1616
#include <linker/sections.h>
1717
#include <kernel_structs.h>
18-
#include <misc/printk.h>
18+
#include <sys/printk.h>
1919

2020
/**
2121
*

arch/arm/core/cortex_m/exc_manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <arch/cpu.h>
1313
#include <inttypes.h>
1414

15-
#include <misc/printk.h>
15+
#include <sys/printk.h>
1616
void sys_exc_esf_dump(NANO_ESF *esf)
1717
{
1818
printk("r0/a1: 0x%08x ", esf->basic.a1);

arch/arm/core/cortex_m/nmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <kernel.h>
1717
#include <arch/cpu.h>
18-
#include <misc/printk.h>
18+
#include <sys/printk.h>
1919
#include <misc/reboot.h>
2020
#include <toolchain.h>
2121
#include <linker/sections.h>

arch/arm/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <kernel.h>
1919
#include <kernel_structs.h>
20-
#include <misc/printk.h>
20+
#include <sys/printk.h>
2121
#include <logging/log_ctrl.h>
2222

2323
/**

arch/arm/core/fault.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <logging/log_ctrl.h>
2222

2323
#ifdef CONFIG_PRINTK
24-
#include <misc/printk.h>
24+
#include <sys/printk.h>
2525
#define PR_EXC(...) printk(__VA_ARGS__)
2626
#define STORE_xFAR(reg_var, reg) u32_t reg_var = (u32_t)reg
2727
#else

arch/arm/core/sys_fatal_error_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <toolchain.h>
1717
#include <linker/sections.h>
1818
#include <kernel_structs.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020

2121
/**
2222
*

arch/nios2/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <kernel.h>
88
#include <arch/cpu.h>
99
#include <kernel_structs.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111
#include <inttypes.h>
1212
#include <logging/log_ctrl.h>
1313

arch/nios2/core/irq_manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <kernel_structs.h>
1616
#include <arch/cpu.h>
1717
#include <irq.h>
18-
#include <misc/printk.h>
18+
#include <sys/printk.h>
1919
#include <sw_isr_table.h>
2020
#include <ksched.h>
2121
#include <kswap.h>

arch/posix/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <kernel.h>
99
#include <arch/cpu.h>
1010
#include <kernel_structs.h>
11-
#include <misc/printk.h>
11+
#include <sys/printk.h>
1212
#include <inttypes.h>
1313
#include <logging/log_ctrl.h>
1414
#include "posix_soc_if.h"

arch/riscv32/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <kernel.h>
88
#include <kernel_structs.h>
99
#include <inttypes.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111
#include <logging/log_ctrl.h>
1212

1313
const NANO_ESF _default_esf = {

arch/riscv32/core/irq_manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <toolchain.h>
88
#include <kernel_structs.h>
9-
#include <misc/printk.h>
9+
#include <sys/printk.h>
1010

1111
void z_irq_spurious(void *unused)
1212
{

arch/riscv32/core/irq_offload.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <irq.h>
88
#include <irq_offload.h>
9-
#include <misc/printk.h>
9+
#include <sys/printk.h>
1010

1111
volatile irq_offload_routine_t _offload_routine;
1212
static volatile void *offload_param;

arch/x86/core/ia32/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <kernel.h>
1818
#include <kernel_structs.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020
#include <arch/x86/irq_controller.h>
2121
#include <arch/x86/segmentation.h>
2222
#include <exception.h>

arch/x86/core/ia32/irq_manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <arch/cpu.h>
1919
#include <kernel_structs.h>
2020
#include <sys/__assert.h>
21-
#include <misc/printk.h>
21+
#include <sys/printk.h>
2222
#include <irq.h>
2323
#include <debug/tracing.h>
2424
#include <kswap.h>

arch/x86/core/ia32/sys_fatal_error_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <toolchain.h>
1717
#include <linker/sections.h>
1818
#include <kernel_structs.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020
#include <logging/log_ctrl.h>
2121

2222
/**

arch/x86/core/ia32/thread.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <kernel_structs.h>
2222
#include <wait_q.h>
2323
#include <mmustructs.h>
24-
#include <misc/printk.h>
24+
#include <sys/printk.h>
2525

2626
/* forward declaration */
2727

arch/xtensa/core/fatal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <kernel_structs.h>
99
#include <inttypes.h>
1010
#include <kernel_arch_data.h>
11-
#include <misc/printk.h>
11+
#include <sys/printk.h>
1212
#include <xtensa/specreg.h>
1313
#include <logging/log_ctrl.h>
1414

arch/xtensa/core/thread.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <string.h>
88
#endif /* CONFIG_INIT_STACKS */
99
#ifdef CONFIG_DEBUG
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111
#endif
1212
#include <kernel_structs.h>
1313
#include <wait_q.h>

arch/xtensa/core/xtensa-asm2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include <misc/printk.h>
6+
#include <sys/printk.h>
77
#include <string.h>
88
#include <xtensa-asm2.h>
99
#include <kernel.h>

boards/arm/efm32hg_slstk3400a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <init.h>
88
#include "board.h"
99
#include <drivers/gpio.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111

1212
static int efm32hg_slstk3400a_init(struct device *dev)
1313
{

boards/arm/efm32pg_stk3402a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <init.h>
88
#include "board.h"
99
#include <drivers/gpio.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111

1212
static int efm32pg_stk3402a_init(struct device *dev)
1313
{

boards/arm/efm32wg_stk3800/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <init.h>
88
#include "board.h"
99
#include <drivers/gpio.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111

1212
static int efm32wg_stk3800_init(struct device *dev)
1313
{

boards/arm/efr32_slwstk6061a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <init.h>
88
#include "board.h"
99
#include <drivers/gpio.h>
10-
#include <misc/printk.h>
10+
#include <sys/printk.h>
1111

1212
static int efr32_slwstk6061a_init(struct device *dev)
1313
{

boards/arm/nrf52_pca20020/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include <drivers/gpio.h>
9-
#include <misc/printk.h>
9+
#include <sys/printk.h>
1010

1111
#define VDD_PWR_CTRL_GPIO_PIN 30
1212
#define CCS_VDD_PWR_CTRL_GPIO_PIN 10

drivers/bluetooth/hci/h5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <misc/util.h>
1717
#include <sys/byteorder.h>
1818
#include <misc/stack.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020
#include <string.h>
2121

2222
#include <bluetooth/bluetooth.h>

drivers/bluetooth/hci/spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static K_THREAD_STACK_DEFINE(spi_rx_stack, 256);
7676
static struct k_thread spi_rx_thread_data;
7777

7878
#if defined(CONFIG_BT_DEBUG_HCI_DRIVER)
79-
#include <misc/printk.h>
79+
#include <sys/printk.h>
8080
static inline void spi_dump_message(const u8_t *pre, u8_t *buf,
8181
u8_t size)
8282
{

drivers/console/ipm_console_receiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <kernel.h>
1212
#include <sys/ring_buffer.h>
13-
#include <misc/printk.h>
13+
#include <sys/printk.h>
1414
#include <stdio.h>
1515
#include <drivers/ipm.h>
1616
#include <console/ipm_console.h>

drivers/console/ipm_console_sender.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <errno.h>
1010

1111
#include <kernel.h>
12-
#include <misc/printk.h>
12+
#include <sys/printk.h>
1313
#include <drivers/ipm.h>
1414
#include <console/ipm_console.h>
1515

drivers/console/ram_console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
#include <kernel.h>
11-
#include <misc/printk.h>
11+
#include <sys/printk.h>
1212
#include <device.h>
1313
#include <init.h>
1414

drivers/console/rtt_console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
#include <kernel.h>
13-
#include <misc/printk.h>
13+
#include <sys/printk.h>
1414
#include <device.h>
1515
#include <init.h>
1616
#include <SEGGER_RTT.h>

drivers/console/uart_console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <toolchain.h>
3030
#include <linker/sections.h>
3131
#include <sys/atomic.h>
32-
#include <misc/printk.h>
32+
#include <sys/printk.h>
3333
#ifdef CONFIG_UART_CONSOLE_MCUMGR
3434
#include "mgmt/serial.h"
3535
#endif

drivers/console/uart_pipe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL);
1919
#include <drivers/uart.h>
2020

2121
#include <console/uart_pipe.h>
22-
#include <misc/printk.h>
22+
#include <sys/printk.h>
2323

2424
static struct device *uart_pipe_dev;
2525

drivers/display/mb_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <drivers/gpio.h>
1717
#include <device.h>
1818
#include <string.h>
19-
#include <misc/printk.h>
19+
#include <sys/printk.h>
2020

2121
#include <display/mb_display.h>
2222

drivers/entropy/entropy_stm32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <misc/util.h>
1414
#include <errno.h>
1515
#include <soc.h>
16-
#include <misc/printk.h>
16+
#include <sys/printk.h>
1717
#include <drivers/clock_control.h>
1818
#include <clock_control/stm32_clock_control.h>
1919

drivers/ethernet/eth_stm32_hal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
2020
#include <net/ethernet.h>
2121
#include <ethernet/eth_stats.h>
2222
#include <soc.h>
23-
#include <misc/printk.h>
23+
#include <sys/printk.h>
2424
#include <drivers/clock_control.h>
2525
#include <clock_control/stm32_clock_control.h>
2626

drivers/gpio/gpio_shell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <misc/printk.h>
7+
#include <sys/printk.h>
88
#include <shell/shell.h>
99
#include <init.h>
1010
#include <string.h>

drivers/hwinfo/hwinfo_shell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <misc/printk.h>
7+
#include <sys/printk.h>
88
#include <shell/shell.h>
99
#include <drivers/hwinfo.h>
1010
#include <zephyr/types.h>

drivers/ipm/ipm_quark_se.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <init.h>
1414
#include <drivers/ipm.h>
1515
#include <arch/cpu.h>
16-
#include <misc/printk.h>
16+
#include <sys/printk.h>
1717
#include <sys/__assert.h>
1818
#include <errno.h>
1919
#include "ipm_quark_se.h"

drivers/modem/modem_shell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <device.h>
1919
#include <shell/shell.h>
2020

21-
#include <misc/printk.h>
21+
#include <sys/printk.h>
2222

2323
#include "modem_receiver.h"
2424

drivers/pci/pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
#include <kernel.h>
7575
#include <arch/cpu.h>
76-
#include <misc/printk.h>
76+
#include <sys/printk.h>
7777
#include <toolchain.h>
7878
#include <linker/sections.h>
7979

drivers/sensor/adxl372/adxl372.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <drivers/sensor.h>
1010
#include <init.h>
1111
#include <drivers/gpio.h>
12-
#include <misc/printk.h>
12+
#include <sys/printk.h>
1313
#include <sys/__assert.h>
1414
#include <stdlib.h>
1515
#include <drivers/spi.h>

0 commit comments

Comments
 (0)