kernel: remove last nanokernel ocrrurances from include/
Jira: ZEP-1323
Change-Id: I32e2dc33406a74c2e592bb2df215bd9170bf286d
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h
index e503690..eeab270 100644
--- a/include/arch/arc/arch.h
+++ b/include/arch/arc/arch.h
@@ -16,11 +16,11 @@
/**
* @file
- * @brief ARC specific nanokernel interface header
+ * @brief ARC specific kernel interface header
*
- * This header contains the ARC specific nanokernel interface. It is
- * included by the nanokernel interface architecture-abstraction header
- * (nanokernel/cpu.h)
+ * This header contains the ARC specific kernel interface. It is
+ * included by the kernel interface architecture-abstraction header
+ * include/arch/cpu.h)
*/
#ifndef _ARC_ARCH__H_
diff --git a/include/arch/arc/v2/error.h b/include/arch/arc/v2/error.h
index 7eb01e9..c89e6a3 100644
--- a/include/arch/arc/v2/error.h
+++ b/include/arch/arc/v2/error.h
@@ -18,7 +18,7 @@
* @file
* @brief ARCv2 public error handling
*
- * ARC-specific nanokernel error handling interface. Included by ARC/arch.h.
+ * ARC-specific kernel error handling interface. Included by arc/arch.h.
*/
#ifndef _ARCH_ARC_V2_ERROR_H_
diff --git a/include/arch/arc/v2/exc.h b/include/arch/arc/v2/exc.h
index 05ca9ff..6a287d7 100644
--- a/include/arch/arc/v2/exc.h
+++ b/include/arch/arc/v2/exc.h
@@ -18,7 +18,7 @@
* @file
* @brief ARCv2 public exception handling
*
- * ARC-specific nanokernel exception handling interface. Included by ARC/arch.h.
+ * ARC-specific kernel exception handling interface. Included by arc/arch.h.
*/
#ifndef _ARCH_ARC_V2_EXC_H_
diff --git a/include/arch/arc/v2/ffs.h b/include/arch/arc/v2/ffs.h
index d5d4dee..9249b54 100644
--- a/include/arch/arc/v2/ffs.h
+++ b/include/arch/arc/v2/ffs.h
@@ -16,9 +16,9 @@
/**
* @file
- * @brief ARCv2 public nanokernel find-first-set interface
+ * @brief ARCv2 public kernel find-first-set interface
*
- * ARC-specific nanokernel ffs interface. Included by ARC/arch.h.
+ * ARC-specific kernel ffs interface. Included by arc/arch.h.
*/
#ifndef _ARCH_ARC_V2_FFS_H_
diff --git a/include/arch/arc/v2/irq.h b/include/arch/arc/v2/irq.h
index 40a8796..3381447 100644
--- a/include/arch/arc/v2/irq.h
+++ b/include/arch/arc/v2/irq.h
@@ -18,7 +18,7 @@
* @file
* @brief ARCv2 public interrupt handling
*
- * ARCv2 nanokernel interrupt handling interface. Included by ARC/v2/arch.h.
+ * ARCv2 kernel interrupt handling interface. Included by arc/arch.h.
*/
#ifndef _ARCH_ARC_V2_IRQ__H_
diff --git a/include/arch/arc/v2/misc.h b/include/arch/arc/v2/misc.h
index cf23fe9..e59c096 100644
--- a/include/arch/arc/v2/misc.h
+++ b/include/arch/arc/v2/misc.h
@@ -16,9 +16,9 @@
/**
* @file
- * @brief ARCv2 public nanokernel miscellaneous
+ * @brief ARCv2 public kernel miscellaneous
*
- * ARC-specific nanokernel miscellaneous interface. Included by arc/arch.h.
+ * ARC-specific kernel miscellaneous interface. Included by arc/arch.h.
*/
#ifndef _ARCH_ARC_V2_MISC_H_
diff --git a/include/arch/arm/arch.h b/include/arch/arm/arch.h
index 68d258e..3cc3dc8 100644
--- a/include/arch/arm/arch.h
+++ b/include/arch/arm/arch.h
@@ -16,11 +16,11 @@
/**
* @file
- * @brief ARM specific nanokernel interface header
+ * @brief ARM specific kernel interface header
*
- * This header contains the ARM specific nanokernel interface. It is
- * included by the nanokernel interface architecture-abstraction header
- * (nanokernel/cpu.h)
+ * This header contains the ARM specific kernel interface. It is
+ * included by the kernel interface architecture-abstraction header
+ * (include/arc/cpu.h)
*/
#ifndef _ARM_ARCH__H_
diff --git a/include/arch/arm/cortex_m/error.h b/include/arch/arm/cortex_m/error.h
index 0547cd8..e01064e 100644
--- a/include/arch/arm/cortex_m/error.h
+++ b/include/arch/arm/cortex_m/error.h
@@ -18,7 +18,7 @@
* @file
* @brief Cortex-M public error handling
*
- * ARM-specific nanokernel error handling interface. Included by ARM/arch.h.
+ * ARM-specific kernel error handling interface. Included by arm/arch.h.
*/
#ifndef _ARCH_ARM_CORTEXM_ERROR_H_
diff --git a/include/arch/arm/cortex_m/exc.h b/include/arch/arm/cortex_m/exc.h
index 9ce280b..b7628ca 100644
--- a/include/arch/arm/cortex_m/exc.h
+++ b/include/arch/arm/cortex_m/exc.h
@@ -18,7 +18,7 @@
* @file
* @brief Cortex-M public exception handling
*
- * ARM-specific nanokernel exception handling interface. Included by ARM/arch.h.
+ * ARM-specific kernel exception handling interface. Included by arm/arch.h.
*/
#ifndef _ARCH_ARM_CORTEXM_EXC_H_
diff --git a/include/arch/arm/cortex_m/irq.h b/include/arch/arm/cortex_m/irq.h
index 13bd043..f0d41ef 100644
--- a/include/arch/arm/cortex_m/irq.h
+++ b/include/arch/arm/cortex_m/irq.h
@@ -18,7 +18,7 @@
* @file
* @brief Cortex-M public interrupt handling
*
- * ARM-specific nanokernel interrupt handling interface. Included by ARM/arch.h.
+ * ARM-specific kernel interrupt handling interface. Included by arm/arch.h.
*/
#ifndef _ARCH_ARM_CORTEXM_IRQ_H_
diff --git a/include/arch/arm/cortex_m/misc.h b/include/arch/arm/cortex_m/misc.h
index 5646d8b..80189d6 100644
--- a/include/arch/arm/cortex_m/misc.h
+++ b/include/arch/arm/cortex_m/misc.h
@@ -16,9 +16,9 @@
/**
* @file
- * @brief Cortex-M public nanokernel miscellaneous
+ * @brief Cortex-M public kernel miscellaneous
*
- * ARM-specific nanokernel miscellaneous interface. Included by ARM/arch.h.
+ * ARM-specific kernel miscellaneous interface. Included by arm/arch.h.
*/
#ifndef _ARCH_ARM_CORTEXM_MISC_H_
diff --git a/include/arch/arm/cortex_m/scb.h b/include/arch/arm/cortex_m/scb.h
index 76dbd11..5d49124 100644
--- a/include/arch/arm/cortex_m/scb.h
+++ b/include/arch/arm/cortex_m/scb.h
@@ -54,7 +54,7 @@
#else
-#include <nanokernel.h>
+#include <kernel.h>
#include <arch/cpu.h>
#include <misc/__assert.h>
#include <arch/arm/cortex_m/scs.h>
diff --git a/include/arch/arm/cortex_m/scs.h b/include/arch/arm/cortex_m/scs.h
index 4095999..0787131 100644
--- a/include/arch/arm/cortex_m/scs.h
+++ b/include/arch/arm/cortex_m/scs.h
@@ -67,7 +67,7 @@
#else /* _ASMLANGUAGE */
-#include <nanokernel.h>
+#include <kernel.h>
#include <arch/cpu.h>
#include <stdint.h>
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index cc33f2a..f3a897e 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -16,9 +16,9 @@
/**
* @file
- * @brief Nios II specific nanokernel interface header
- * This header contains the Nios II specific nanokernel interface. It is
- * included by the generic nanokernel interface header (nanokernel.h)
+ * @brief Nios II specific kernel interface header
+ * This header contains the Nios II specific kernel interface. It is
+ * included by the generic kernel interface header (include/arch/cpu.h)
*/
#ifndef _ARCH_IFACE_H
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index a47e0ff..1550778 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -16,9 +16,9 @@
/**
* @file
- * @brief IA-32 specific nanokernel interface header
- * This header contains the IA-32 specific nanokernel interface. It is included
- * by the generic nanokernel interface header (nanokernel.h)
+ * @brief IA-32 specific kernel interface header
+ * This header contains the IA-32 specific kernel interface. It is included
+ * by the generic kernel interface header (include/arch/cpu.h)
*/
#ifndef _ARCH_IFACE_H
diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld
index c8ab29e..bbbe135 100644
--- a/include/arch/x86/linker.ld
+++ b/include/arch/x86/linker.ld
@@ -43,7 +43,7 @@
* the Zephyr Kernel image. If a symbol is used but not defined the linker will
* emit an undefined symbol error.
*
- * Please do not change the order of the section as the nanokernel expects this
+ * Please do not change the order of the section as the kernel expects this
* order when programming the MMU.
*/
diff --git a/include/cache.h b/include/cache.h
index 5e5a341..bb5fb2e 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -17,7 +17,7 @@
#ifndef _cache__h_
#define _cache__h_
-#include <nanokernel.h>
+#include <kernel.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/debug/debug_info.h b/include/debug/debug_info.h
index 2fc78e1..ac05146 100644
--- a/include/debug/debug_info.h
+++ b/include/debug/debug_info.h
@@ -29,7 +29,7 @@
extern "C" {
#endif
-#include <nanokernel.h>
+#include <kernel.h>
#ifndef _ASMLANGUAGE
diff --git a/include/ipm.h b/include/ipm.h
index 8ff9cfd..ef69e57 100644
--- a/include/ipm.h
+++ b/include/ipm.h
@@ -30,7 +30,7 @@
* @{
*/
-#include <nanokernel.h>
+#include <kernel.h>
#include <device.h>
#ifdef __cplusplus
diff --git a/include/kernel.h b/include/kernel.h
index 35b4510..12c62c1 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -33,6 +33,7 @@
#include <misc/dlist.h>
#include <misc/slist.h>
#include <misc/util.h>
+#include <kernel_version.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/legacy.h b/include/legacy.h
index b4f4624..df29d74 100644
--- a/include/legacy.h
+++ b/include/legacy.h
@@ -28,6 +28,7 @@
#include <limits.h>
#include <misc/util.h>
#include <misc/__assert.h>
+#include <drivers/rand32.h>
/* nanokernel/microkernel execution context types */
#define NANO_CTX_ISR (K_ISR)
diff --git a/include/misc/event_logger.h b/include/misc/event_logger.h
index 3ec31fc..fa09f67 100644
--- a/include/misc/event_logger.h
+++ b/include/misc/event_logger.h
@@ -30,7 +30,7 @@
#ifndef _ASMLANGUAGE
-#include <nanokernel.h>
+#include <kernel.h>
#include <errno.h>
#include <misc/ring_buffer.h>
diff --git a/include/misc/ring_buffer.h b/include/misc/ring_buffer.h
index 95337ff..0bdd543 100644
--- a/include/misc/ring_buffer.h
+++ b/include/misc/ring_buffer.h
@@ -20,7 +20,7 @@
#ifndef __RING_BUFFER_H__
#define __RING_BUFFER_H__
-#include <nanokernel.h>
+#include <kernel.h>
#include <debug/object_tracing_common.h>
#include <misc/util.h>
#include <errno.h>
diff --git a/include/sys_io.h b/include/sys_io.h
index 910ff8a..803ef11 100644
--- a/include/sys_io.h
+++ b/include/sys_io.h
@@ -23,7 +23,7 @@
extern "C" {
#endif
-#include <nanokernel.h>
+#include <kernel.h>
#include <stdint.h>
#include <stddef.h>
