From 4a211ec241d9213c3822e40e653f2c5b0cbaad72 Mon Sep 17 00:00:00 2001
From: Flavio Ceolin <flavio.ceolin@intel.com>
Date: Sun, 16 Sep 2018 17:06:26 -0700
Subject: [PATCH] include: Add missing headers guard

Add missing headers guard

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
---
 arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h | 5 +++++
 arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h | 5 +++++
 arch/xtensa/include/xtensa-asm2.h                | 6 +++---
 include/drivers/console/uart_pipe.h              | 5 +++++
 include/drivers/ieee802154/cc2520.h              | 5 +++++
 include/drivers/wifi/winc1500.h                  | 5 +++++
 include/usb/bos.h                                | 5 +++++
 7 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h b/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
index 79ee9ddca10..de9a6083d79 100644
--- a/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
+#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
+
 /* Global MPU configuration at system initialization. */
 static void _mpu_init(void)
 {
@@ -227,3 +230,5 @@ static inline int _mpu_buffer_validate(void *addr, size_t size, int write)
 #endif /* CONFIG_USERSPACE */
 
 #endif /* USERSPACE || MPU_STACK_GUARD || APPLICATION_MEMORY */
+
+#endif	/* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ */
diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h b/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
index 5a4d8e3f80c..d353ca12dbc 100644
--- a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
+#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
+
 #include <cmse.h>
 
 /* Global MPU configuration at system initialization. */
@@ -137,3 +140,5 @@ static inline int _mpu_buffer_validate(void *addr, size_t size, int write)
 	return -EPERM;
 }
 #endif /* USERSPACE || MPU_STACK_GUARD || APPLICATION_MEMORY */
+
+#endif	/* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ */
diff --git a/arch/xtensa/include/xtensa-asm2.h b/arch/xtensa/include/xtensa-asm2.h
index 69d62f2d2c3..a51f9f85243 100644
--- a/arch/xtensa/include/xtensa-asm2.h
+++ b/arch/xtensa/include/xtensa-asm2.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _XTENSA_ASM2_H
-#define _XTENSA_ASM2_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_H_
 
 #include "xtensa-asm2-context.h"
 
@@ -20,4 +20,4 @@ void *xtensa_init_stack(int *stack_top,
 			void (*entry)(void *, void *, void *),
 			void *arg1, void *arg2, void *arg3);
 
-#endif /* _XTENSA_ASM2_H */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_H_ */
diff --git a/include/drivers/console/uart_pipe.h b/include/drivers/console/uart_pipe.h
index ca13c6f9d4a..5059c4ce695 100644
--- a/include/drivers/console/uart_pipe.h
+++ b/include/drivers/console/uart_pipe.h
@@ -11,6 +11,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_PIPE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_PIPE_H_
+
 #include <stdlib.h>
 
 #ifdef __cplusplus
@@ -55,3 +58,5 @@ int uart_pipe_send(const u8_t *data, int len);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_PIPE_H_ */
diff --git a/include/drivers/ieee802154/cc2520.h b/include/drivers/ieee802154/cc2520.h
index 1312db24585..59135135240 100644
--- a/include/drivers/ieee802154/cc2520.h
+++ b/include/drivers/ieee802154/cc2520.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC2520_H_
+#define ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC2520_H_
+
 #include <device.h>
 
 enum cc2520_gpio_index {
@@ -23,3 +26,5 @@ struct cc2520_gpio_configuration {
 };
 
 struct cc2520_gpio_configuration *cc2520_configure_gpios(void);
+
+#endif	/* ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC2520_H_ */
diff --git a/include/drivers/wifi/winc1500.h b/include/drivers/wifi/winc1500.h
index 0f7c7e0f081..d0f816388f4 100644
--- a/include/drivers/wifi/winc1500.h
+++ b/include/drivers/wifi/winc1500.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_INCLUDE_DRIVERS_WIFI_WINC1500_H_
+#define ZEPHYR_INCLUDE_DRIVERS_WIFI_WINC1500_H_
+
 #include <device.h>
 
 enum winc1500_gpio_index {
@@ -20,3 +23,5 @@ struct winc1500_gpio_configuration {
 };
 
 struct winc1500_gpio_configuration *winc1500_configure_gpios(void);
+
+#endif	/* ZEPHYR_INCLUDE_DRIVERS_WIFI_WINC1500_H_ */
diff --git a/include/usb/bos.h b/include/usb/bos.h
index bd296177a11..254ed55a89f 100644
--- a/include/usb/bos.h
+++ b/include/usb/bos.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_INCLUDE_USB_BOS_H_
+#define ZEPHYR_INCLUDE_USB_BOS_H_
+
 #if defined(CONFIG_USB_DEVICE_BOS)
 #define USB_DEVICE_BOS_DESC_DEFINE_HDR \
 	static __in_section(usb, bos_desc_area, 0) __used
@@ -55,3 +58,5 @@ int usb_handle_bos(struct usb_setup_packet *setup, s32_t *len, u8_t **data);
 #else
 #define usb_handle_bos(x, y, z)		-ENOTSUP
 #endif
+
+#endif	/* ZEPHYR_INCLUDE_USB_BOS_H_ */