Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
9d068f66
Unverified
Commit
9d068f66
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1673 from antonio-nino-diaz-arm/an/headers
Standardise header guards across codebase
parents
f5ae1b0e
c3cf06f1
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
508
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
include/drivers/auth/auth_mod.h
+3
-3
include/drivers/auth/auth_mod.h
include/drivers/auth/crypto_mod.h
+3
-3
include/drivers/auth/crypto_mod.h
include/drivers/auth/img_parser_mod.h
+3
-3
include/drivers/auth/img_parser_mod.h
include/drivers/auth/mbedtls/mbedtls_common.h
+3
-3
include/drivers/auth/mbedtls/mbedtls_common.h
include/drivers/auth/mbedtls/mbedtls_config.h
+3
-3
include/drivers/auth/mbedtls/mbedtls_config.h
include/drivers/cadence/cdns_uart.h
+3
-3
include/drivers/cadence/cdns_uart.h
include/drivers/cfi/v2m_flash.h
+3
-4
include/drivers/cfi/v2m_flash.h
include/drivers/console.h
+3
-4
include/drivers/console.h
include/drivers/console_assertions.h
+3
-4
include/drivers/console_assertions.h
include/drivers/coreboot/cbmem_console.h
+3
-3
include/drivers/coreboot/cbmem_console.h
include/drivers/delay_timer.h
+3
-4
include/drivers/delay_timer.h
include/drivers/dw_ufs.h
+3
-3
include/drivers/dw_ufs.h
include/drivers/generic_delay_timer.h
+3
-3
include/drivers/generic_delay_timer.h
include/drivers/gpio.h
+3
-3
include/drivers/gpio.h
include/drivers/io/io_block.h
+3
-3
include/drivers/io/io_block.h
include/drivers/io/io_driver.h
+3
-3
include/drivers/io/io_driver.h
include/drivers/io/io_dummy.h
+3
-3
include/drivers/io/io_dummy.h
include/drivers/io/io_fip.h
+3
-3
include/drivers/io/io_fip.h
include/drivers/io/io_memmap.h
+3
-3
include/drivers/io/io_memmap.h
include/drivers/io/io_semihosting.h
+3
-3
include/drivers/io/io_semihosting.h
with
60 additions
and
64 deletions
+60
-64
include/drivers/auth/auth_mod.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
AUTH_MOD_H
__
#define
__
AUTH_MOD_H
__
#ifndef AUTH_MOD_H
#define AUTH_MOD_H
#if TRUSTED_BOARD_BOOT
...
...
@@ -49,4 +49,4 @@ extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
#endif
/* TRUSTED_BOARD_BOOT */
#endif
/*
__
AUTH_MOD_H
__
*/
#endif
/* AUTH_MOD_H */
This diff is collapsed.
Click to expand it.
include/drivers/auth/crypto_mod.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
CRYPTO_MOD_H
__
#define
__
CRYPTO_MOD_H
__
#ifndef CRYPTO_MOD_H
#define CRYPTO_MOD_H
/* Return values */
enum
crypto_ret_value
{
...
...
@@ -59,4 +59,4 @@ int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len,
extern
const
crypto_lib_desc_t
crypto_lib_desc
;
#endif
/*
__
CRYPTO_MOD_H
__
*/
#endif
/* CRYPTO_MOD_H */
This diff is collapsed.
Click to expand it.
include/drivers/auth/img_parser_mod.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IMG_PARSER_MOD_H
__
#define
__
IMG_PARSER_MOD_H
__
#ifndef IMG_PARSER_MOD_H
#define IMG_PARSER_MOD_H
#include <auth_common.h>
...
...
@@ -61,4 +61,4 @@ int img_parser_get_auth_param(img_type_t img_type,
.get_auth_param = _get_param \
}
#endif
/*
__
IMG_PARSER_MOD_H
__
*/
#endif
/* IMG_PARSER_MOD_H */
This diff is collapsed.
Click to expand it.
include/drivers/auth/mbedtls/mbedtls_common.h
View file @
9d068f66
...
...
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
MBEDTLS_COMMON_H
__
#define
__
MBEDTLS_COMMON_H
__
#ifndef MBEDTLS_COMMON_H
#define MBEDTLS_COMMON_H
void
mbedtls_init
(
void
);
#endif
/*
__
MBEDTLS_COMMON_H
__
*/
#endif
/* MBEDTLS_COMMON_H */
This diff is collapsed.
Click to expand it.
include/drivers/auth/mbedtls/mbedtls_config.h
View file @
9d068f66
...
...
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
MBEDTLS_CONFIG_H
__
#define
__
MBEDTLS_CONFIG_H
__
#ifndef MBEDTLS_CONFIG_H
#define MBEDTLS_CONFIG_H
/*
* Key algorithms currently supported on mbed TLS libraries
...
...
@@ -104,4 +104,4 @@
#define TF_MBEDTLS_HEAP_SIZE U(7168)
#endif
#endif
/*
__
MBEDTLS_CONFIG_H
__
*/
#endif
/* MBEDTLS_CONFIG_H */
This diff is collapsed.
Click to expand it.
include/drivers/cadence/cdns_uart.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__CADENCE
_UART_H
__
#define
__CADENCE
_UART_H
__
#ifndef
CDNS
_UART_H
#define
CDNS
_UART_H
#include <console.h>
...
...
@@ -47,4 +47,4 @@ int console_cdns_register(uint64_t baseaddr, uint32_t clock, uint32_t baud,
#endif
/*__ASSEMBLY__*/
#endif
#endif
/* CDNS_UART_H */
This diff is collapsed.
Click to expand it.
include/drivers/cfi/v2m_flash.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__NOR
FLASH_H
_
#define
__NOR
FLASH_H
_
#ifndef
V2M_
FLASH_H
#define
V2M_
FLASH_H
#include <stdint.h>
...
...
@@ -42,5 +42,4 @@ int nor_lock(uintptr_t base_addr);
int
nor_unlock
(
uintptr_t
base_addr
);
int
nor_erase
(
uintptr_t
base_addr
);
#endif
/* __NORFLASH_H_ */
#endif
/* V2M_FLASH_H*/
This diff is collapsed.
Click to expand it.
include/drivers/console.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
CONSOLE_H
__
#define
__
CONSOLE_H
__
#ifndef CONSOLE_H
#define CONSOLE_H
#include <utils_def.h>
...
...
@@ -80,5 +80,4 @@ void console_uninit(void);
#endif
/* __ASSEMBLY__ */
#endif
/* __CONSOLE_H__ */
#endif
/* CONSOLE_H */
This diff is collapsed.
Click to expand it.
include/drivers/console_assertions.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
CONSOLE_ASSERTIONS_H
__
#define
__
CONSOLE_ASSERTIONS_H
__
#ifndef CONSOLE_ASSERTIONS_H
#define CONSOLE_ASSERTIONS_H
#include <cassert.h>
...
...
@@ -26,5 +26,4 @@ CASSERT(CONSOLE_T_FLUSH == __builtin_offsetof(console_t, flush),
CASSERT
(
CONSOLE_T_DRVDATA
==
sizeof
(
console_t
),
assert_console_t_drvdata_offset_mismatch
);
#endif
/* __CONSOLE_ASSERTIONS_H__ */
#endif
/* CONSOLE_ASSERTIONS_H */
This diff is collapsed.
Click to expand it.
include/drivers/coreboot/cbmem_console.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
CBMEM_CONSOLE_H
__
#define
__
CBMEM_CONSOLE_H
__
#ifndef CBMEM_CONSOLE_H
#define CBMEM_CONSOLE_H
#include <console.h>
...
...
@@ -24,4 +24,4 @@ int console_cbmc_register(uintptr_t base, console_cbmc_t *console);
#endif
/* __ASSEMBLER__ */
#endif
/*
__
CBMEM_CONSOLE_H
__
*/
#endif
/* CBMEM_CONSOLE_H */
This diff is collapsed.
Click to expand it.
include/drivers/delay_timer.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
DELAY_TIMER_H
__
#define
__
DELAY_TIMER_H
__
#ifndef DELAY_TIMER_H
#define DELAY_TIMER_H
#include <stdint.h>
...
...
@@ -27,5 +27,4 @@ void mdelay(uint32_t msec);
void
udelay
(
uint32_t
usec
);
void
timer_init
(
const
timer_ops_t
*
ops_ptr
);
#endif
/* __DELAY_TIMER_H__ */
#endif
/* DELAY_TIMER_H */
This diff is collapsed.
Click to expand it.
include/drivers/dw_ufs.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
DW_UFS_H
__
#define
__
DW_UFS_H
__
#ifndef DW_UFS_H
#define DW_UFS_H
#include <stdint.h>
...
...
@@ -107,4 +107,4 @@ typedef struct dw_ufs_params {
int
dw_ufs_init
(
dw_ufs_params_t
*
params
);
#endif
/*
__
DW_UFS_H
__
*/
#endif
/* DW_UFS_H */
This diff is collapsed.
Click to expand it.
include/drivers/generic_delay_timer.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
GENERIC_DELAY_TIMER_H
__
#define
__
GENERIC_DELAY_TIMER_H
__
#ifndef GENERIC_DELAY_TIMER_H
#define GENERIC_DELAY_TIMER_H
#include <stdint.h>
...
...
@@ -13,4 +13,4 @@ void generic_delay_timer_init_args(uint32_t mult, uint32_t div);
void
generic_delay_timer_init
(
void
);
#endif
/*
__
GENERIC_DELAY_TIMER_H
__
*/
#endif
/* GENERIC_DELAY_TIMER_H */
This diff is collapsed.
Click to expand it.
include/drivers/gpio.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
GPIO_H
__
#define
__
GPIO_H
__
#ifndef GPIO_H
#define GPIO_H
#define GPIO_DIR_OUT 0
#define GPIO_DIR_IN 1
...
...
@@ -34,4 +34,4 @@ void gpio_set_pull(int gpio, int pull);
int
gpio_get_pull
(
int
gpio
);
void
gpio_init
(
const
gpio_ops_t
*
ops
);
#endif
/*
__
GPIO_H
__
*/
#endif
/* GPIO_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_block.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_BLOCK_H
__
#define
__
IO_BLOCK_H
__
#ifndef IO_BLOCK_H
#define IO_BLOCK_H
#include <io_storage.h>
...
...
@@ -25,4 +25,4 @@ struct io_dev_connector;
int
register_io_dev_block
(
const
struct
io_dev_connector
**
dev_con
);
#endif
/*
__
IO_BLOCK_H
__
*/
#endif
/* IO_BLOCK_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_driver.h
View file @
9d068f66
...
...
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_DRIVER_H
__
#define
__
IO_DRIVER_H
__
#ifndef IO_DRIVER_H
#define IO_DRIVER_H
#include <io_storage.h>
#include <stdint.h>
...
...
@@ -56,4 +56,4 @@ typedef struct io_dev_funcs {
/* Register an IO device */
int
io_register_device
(
const
io_dev_info_t
*
dev_info
);
#endif
/*
__
IO_DRIVER_H
__
*/
#endif
/* IO_DRIVER_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_dummy.h
View file @
9d068f66
...
...
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_DUMMY_H
__
#define
__
IO_DUMMY_H
__
#ifndef IO_DUMMY_H
#define IO_DUMMY_H
int
register_io_dev_dummy
(
const
struct
io_dev_connector
**
dev_con
);
#endif
/*
__
IO_DUMMY_H
__
*/
#endif
/* IO_DUMMY_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_fip.h
View file @
9d068f66
...
...
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_FIP_H
__
#define
__
IO_FIP_H
__
#ifndef IO_FIP_H
#define IO_FIP_H
struct
io_dev_connector
;
int
register_io_dev_fip
(
const
struct
io_dev_connector
**
dev_con
);
#endif
/*
__
IO_FIP_H
__
*/
#endif
/* IO_FIP_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_memmap.h
View file @
9d068f66
...
...
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_MEMMAP_H
__
#define
__
IO_MEMMAP_H
__
#ifndef IO_MEMMAP_H
#define IO_MEMMAP_H
struct
io_dev_connector
;
int
register_io_dev_memmap
(
const
struct
io_dev_connector
**
dev_con
);
#endif
/*
__
IO_MEMMAP_H
__
*/
#endif
/* IO_MEMMAP_H */
This diff is collapsed.
Click to expand it.
include/drivers/io/io_semihosting.h
View file @
9d068f66
...
...
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef
__
IO_S
H_H__
#define
__
IO_S
H_H__
#ifndef IO_S
EMIHOSTING_H
#define IO_S
EMIHOSTING_H
struct
io_dev_connector
;
int
register_io_dev_sh
(
const
struct
io_dev_connector
**
dev_con
);
#endif
/*
__
IO_S
H_H__
*/
#endif
/* IO_S
EMIHOSTING_H
*/
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
6
7
8
9
10
…
26
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help