Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40931 )
Change subject: acpi: Make header #ifdefs consistent ......................................................................
acpi: Make header #ifdefs consistent
Now that all ACPI header files are moved to src/include/acpi, this change updates the #ifdef to __ACPI_${FILENAME}__.
BUG=b:155428745
Change-Id: Id24ee35bac318278871a26f98be7092604de01c0 Signed-off-by: Furquan Shaikh furquan@google.com --- M src/include/acpi/acpi.h M src/include/acpi/acpi_device.h M src/include/acpi/acpi_ivrs.h M src/include/acpi/acpi_pld.h M src/include/acpi/acpigen.h M src/include/acpi/acpigen_dsm.h M src/include/acpi/acpigen_ps2_keybd.h 7 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/40931/1
diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 86b3932..6bcbb7f 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -5,8 +5,8 @@ * coreboot ACPI support - headers and defines. */
-#ifndef __ASM_ACPI_H -#define __ASM_ACPI_H +#ifndef __ACPI_ACPI_H__ +#define __ACPI_ACPI_H__
/* * The type and enable fields are common in ACPI, but the diff --git a/src/include/acpi/acpi_device.h b/src/include/acpi/acpi_device.h index ed64cd8..1f55423 100644 --- a/src/include/acpi/acpi_device.h +++ b/src/include/acpi/acpi_device.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */
-#ifndef __ACPI_DEVICE_H -#define __ACPI_DEVICE_H +#ifndef __ACPI_ACPI_DEVICE_H__ +#define __ACPI_ACPI_DEVICE_H__
#include <device/i2c.h> #include <stdint.h> diff --git a/src/include/acpi/acpi_ivrs.h b/src/include/acpi/acpi_ivrs.h index 83abfb6..1c0987c 100644 --- a/src/include/acpi/acpi_ivrs.h +++ b/src/include/acpi/acpi_ivrs.h @@ -9,8 +9,8 @@ * I/O Virtualization Reporting Structure (IVRS) */
-#ifndef __ARCH_ACPI_IVRS_H -#define __ARCH_ACPI_IVRS_H +#ifndef __ACPI_ACPI_IVRS_H__ +#define __ACPI_ACPI_IVRS_H__
/* I/O Virtualization Reporting Structure (IVRS) */ #define IVHD_BLOCK_TYPE_LEGACY__FIXED 0x10 diff --git a/src/include/acpi/acpi_pld.h b/src/include/acpi/acpi_pld.h index c518077..bbc1924 100644 --- a/src/include/acpi/acpi_pld.h +++ b/src/include/acpi/acpi_pld.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */
-#ifndef __ACPI_PLD_H -#define __ACPI_PLD_H +#ifndef __ACPI_ACPI_PLD_H__ +#define __ACPI_ACPI_PLD_H__
#include <acpi/acpi.h> #include <stdint.h> diff --git a/src/include/acpi/acpigen.h b/src/include/acpi/acpigen.h index 8d66e2b..9776d00 100644 --- a/src/include/acpi/acpigen.h +++ b/src/include/acpi/acpigen.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */
-#ifndef LIBACPI_H -#define LIBACPI_H +#ifndef __ACPI_ACPIGEN_H__ +#define __ACPI_ACPIGEN_H__
#include <stdint.h> #include <acpi/acpi.h> diff --git a/src/include/acpi/acpigen_dsm.h b/src/include/acpi/acpigen_dsm.h index c51c12b..28b8974 100644 --- a/src/include/acpi/acpigen_dsm.h +++ b/src/include/acpi/acpigen_dsm.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */
-#ifndef __ARCH_ACPIGEN_DSM_H__ -#define __ARCH_ACPIGEN_DSM_H__ +#ifndef __ACPI_ACPIGEN_DSM_H__ +#define __ACPI_ACPIGEN_DSM_H__
#include <stdint.h>
@@ -12,4 +12,4 @@
void acpigen_write_dsm_i2c_hid(struct dsm_i2c_hid_config *config);
-#endif /* __ARCH_ACPIGEN_DSM_H__ */ +#endif /* __ACPI_ACPIGEN_DSM_H__ */ diff --git a/src/include/acpi/acpigen_ps2_keybd.h b/src/include/acpi/acpigen_ps2_keybd.h index c0228bc..aeeacae 100644 --- a/src/include/acpi/acpigen_ps2_keybd.h +++ b/src/include/acpi/acpigen_ps2_keybd.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef __ACPIGEN_PS2_KEYBD_H__ -#define __ACPIGEN_PS2_KEYBD_H__ +#ifndef __ACPI_ACPIGEN_PS2_KEYBD_H__ +#define __ACPI_ACPIGEN_PS2_KEYBD_H__
#include <types.h>
@@ -38,4 +38,4 @@ bool can_send_function_keys, bool has_numeric_keypad, bool has_scrnlock_key);
-#endif /* __ACPIGEN_PS2_KEYBD_H__ */ +#endif /* __ACPI_ACPIGEN_PS2_KEYBD_H__ */