michaelh/zephyr
1
0
Fork 0
Code Releases Activity

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

Browse source 
These inlines currently only apply to IA32, so place accordingly.
Minor changes to direct and indirect users of the file for ordering.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-06-27 16:49:10 -07:00 • committed by Anas Nashif
commit c384c6685e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/arch/x86/ia32/arch.h
View file

@ -15,12 +15,12 @@
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_ #define ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_
#include <irq.h> #include <irq.h>
#include "sys_io.h"
#include <arch/x86/irq_controller.h> #include <arch/x86/irq_controller.h>
#include <kernel_arch_thread.h> #include <kernel_arch_thread.h>
#include <generated_dts_board.h> #include <generated_dts_board.h>
#include <mmustructs.h> #include <mmustructs.h>
#include <stdbool.h> #include <stdbool.h>
#include "../sys_io.h"
#include <arch/common/ffs.h> #include <arch/common/ffs.h>
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE

6
include/arch/x86/sys_io.h → include/arch/x86/ia32/sys_io.h
View file

@ -6,8 +6,8 @@
/* Implementation of sys_io.h's documented functions */ /* Implementation of sys_io.h's documented functions */
#ifndef ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_ #ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_ #define ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_
#if !defined(_ASMLANGUAGE) #if !defined(_ASMLANGUAGE)
@ -270,4 +270,4 @@ static ALWAYS_INLINE
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_ */

2
include/drivers/interrupt_controller/loapic.h
View file

@ -9,7 +9,7 @@
#ifndef ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_ #ifndef ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_
#define ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_ #define ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_
#include <arch/x86/sys_io.h> #include <arch/cpu.h>
#include <arch/x86/msr.h> #include <arch/x86/msr.h>
#ifdef __cplusplus #ifdef __cplusplus