Skip to content
Permalink
Browse files

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

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>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 27, 2019
1 parent ef4eb30 commit c384c6685ef6f971d829c5c84191252a99b1ae02
@@ -15,12 +15,12 @@
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_ARCH_H_

#include <irq.h>
#include "sys_io.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 <arch/common/ffs.h>

#ifndef _ASMLANGUAGE
@@ -6,8 +6,8 @@

/* Implementation of sys_io.h's documented functions */

#ifndef ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_


#if !defined(_ASMLANGUAGE)
@@ -270,4 +270,4 @@ static ALWAYS_INLINE

#endif /* _ASMLANGUAGE */

#endif /* ZEPHYR_INCLUDE_ARCH_X86_SYS_IO_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_SYS_IO_H_ */
@@ -9,7 +9,7 @@
#ifndef 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>

#ifdef __cplusplus

0 comments on commit c384c66

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