Skip to content
Permalink
Browse files

arch/x86: move include/arch/x86/arch.h to ia32/arch.h

Making room for the Intel64 subarch in this tree. This header is
32-bit specific and so it's relocated, and references rewritten
to find it in its new location.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 27, 2019
1 parent c4175e9 commit dff016b53cdf86ba5391707a0936354ab776b718
@@ -229,7 +229,7 @@
/include/arch/riscv32/ @nategraff-sifive @kgugala @pgielda
/include/arch/x86/ @andrewboie @wentongwu
/include/arch/common/ @andrewboie @andyross @nashif
/include/arch/x86/arch.h @andrewboie
/include/arch/x86/ia32/arch.h @andrewboie
/include/arch/x86/multiboot.h @gnuless
/include/arch/xtensa/ @andrewboie
/include/sys/atomic.h @andrewboie @andyross
@@ -16,7 +16,7 @@

#include <kernel_structs.h>
#include <arch/x86/ia32/asm.h>
#include <arch/x86/arch.h> /* For MK_ISR_NAME */
#include <arch/x86/ia32/arch.h> /* For MK_ISR_NAME */
#include <offsets_short.h>


@@ -443,9 +443,9 @@ z_dynamic_irq_stub_common:

/* Create all the dynamic IRQ stubs
*
* NOTE: Please update DYN_STUB_SIZE in include/arch/x86/arch.h if you change
* how large the generated stubs are, otherwise _get_dynamic_stub() will
* be unable to correctly determine the offset
* NOTE: Please update DYN_STUB_SIZE in include/arch/x86/ia32/arch.h if you
* change how large the generated stubs are, otherwise _get_dynamic_stub()
* will be unable to correctly determine the offset
*/

/*
@@ -6,7 +6,6 @@

#include <kernel.h>
#include <drivers/pcie/pcie.h>
#include <arch/x86/arch.h>

#ifdef CONFIG_PCIE_MSI
#include <drivers/pcie/msi.h>
@@ -12,7 +12,7 @@
* other definitions for the Intel Architecture 32 bit (IA-32) processor
* architecture.
* The header include/kernel.h contains the public kernel interface
* definitions, with include/arch/x86/arch.h supplying the
* definitions, with include/arch/x86/ia32/arch.h supplying the
* IA-32 specific portions of the public kernel interface.
*
* This file is also included by assembly language files which must #define
@@ -9,8 +9,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
#define ZEPHYR_INCLUDE_ARCH_CPU_H_

#if defined(CONFIG_X86)
#include <arch/x86/arch.h>
#if defined(CONFIG_X86) && !defined(CONFIG_X86_LONGMODE)
#include <arch/x86/ia32/arch.h>
#elif defined(CONFIG_X86_64)
#include <arch/x86_64/arch.h>
#elif defined(CONFIG_ARM)
@@ -11,17 +11,17 @@
* by the generic kernel interface header (include/arch/cpu.h)
*/

#ifndef ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_

#include <irq.h>
#include <arch/x86/irq_controller.h>
#include <kernel_arch_thread.h>
#include <generated_dts_board.h>
#include <mmustructs.h>
#include <stdbool.h>
#include "sys_io.h"
#include "ffs.h"
#include "../sys_io.h"
#include "../ffs.h"

#ifndef _ASMLANGUAGE
#include <arch/x86/asm_inline.h>
@@ -668,4 +668,4 @@ void z_x86_reset_pages(void *start, size_t size);
}
#endif

#endif /* ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_ */
@@ -7,9 +7,8 @@
#include <zephyr.h>
#include <sys/printk.h>
#include <mmustructs.h>
#include <arch/x86/arch.h>
#include <arch/x86/ia32/arch.h>
#include <linker/linker-defs.h>
#include <arch/x86/arch.h>
#include <ztest.h>
#include <kernel_internal.h>

0 comments on commit dff016b

Please sign in to comment.
You can’t perform that action at this time.