Commit c3cf06f1 authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

Standardise header guards across codebase



All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.

The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.

The exceptions are files that are imported from other projects:

- CryptoCell driver
- dt-bindings folders
- zlib headers

Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent f5ae1b0e
......@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef SHA_H_
#define SHA_H_
#ifndef SHA_H
#define SHA_H
int sha_file(int md_alg, const char *filename, unsigned char *md);
#endif /* SHA_H_ */
#endif /* SHA_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef TBB_CERT_H_
#define TBB_CERT_H_
#ifndef TBB_CERT_H
#define TBB_CERT_H
#include "cert.h"
......@@ -26,4 +26,4 @@ enum {
FWU_CERT
};
#endif /* TBB_CERT_H_ */
#endif /* TBB_CERT_H */
......@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef TBB_EXT_H_
#define TBB_EXT_H_
#ifndef TBB_EXT_H
#define TBB_EXT_H
#include "ext.h"
......@@ -35,4 +35,4 @@ enum {
FWU_HASH_EXT
};
#endif /* TBB_EXT_H_ */
#endif /* TBB_EXT_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef TBB_KEY_H_
#define TBB_KEY_H_
#ifndef TBB_KEY_H
#define TBB_KEY_H
#include "key.h"
......@@ -22,4 +22,4 @@ enum {
NON_TRUSTED_FW_CONTENT_CERT_KEY
};
#endif /* TBB_KEY_H_ */
#endif /* TBB_KEY_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __FIPTOOL_H__
#define __FIPTOOL_H__
#ifndef FIPTOOL_H
#define FIPTOOL_H
#include <stddef.h>
#include <stdint.h>
......@@ -51,4 +51,4 @@ typedef struct cmd {
void (*usage)(void);
} cmd_t;
#endif /* __FIPTOOL_H__ */
#endif /* FIPTOOL_H */
/*
* Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
/*
* Build platform specific handling.
* This allows for builds on non-Posix platforms
* e.g. Visual Studio on Windows
*/
#ifndef __FIPTOOL_PLATFORM_H__
# define __FIPTOOL_PLATFORM_H__
#ifndef FIPTOOL_PLATFORM_H
#define FIPTOOL_PLATFORM_H
# ifndef _MSC_VER
#ifndef _MSC_VER
/* Not Visual Studio, so include Posix Headers. */
/* Not Visual Studio, so include Posix Headers. */
# include <getopt.h>
# include <openssl/sha.h>
# include <unistd.h>
# define BLD_PLAT_STAT stat
# else
#else
/* Visual Studio. */
/* Visual Studio. */
# include "win_posix.h"
# endif
#endif
#endif /* __FIPTOOL_PLATFORM_H__ */
#endif /* FIPTOOL_PLATFORM_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __TBBR_CONFIG_H__
#define __TBBR_CONFIG_H__
#ifndef TBBR_CONFIG_H
#define TBBR_CONFIG_H
#include <stdint.h>
......@@ -22,4 +22,4 @@ typedef struct toc_entry {
extern toc_entry_t toc_entries[];
#endif /* __TBBR_CONFIG_H__ */
#endif /* TBBR_CONFIG_H */
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __WINPOSIX_H__
# define __WINPOSIX_H__
#ifndef WIN_POSIX_H
#define WIN_POSIX_H
# define _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
# include <direct.h>
# include <io.h>
# include <stdint.h>
# include <stdlib.h>
# include <string.h>
# include <sys/stat.h>
# include "uuid.h"
#include <direct.h>
#include <io.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include "uuid.h"
/* Derive or provide Windows equivalents of Posix/GCC/Unix stuff. */
# ifndef PATH_MAX
#ifndef PATH_MAX
# ifdef MAX_PATH
# define PATH_MAX MAX_PATH
# else
......@@ -31,11 +30,11 @@
# define PATH_MAX 260
# endif
# endif
# endif
#endif
# ifndef _CRT_SECURE_NO_WARNINGS
#ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS 1
# endif
#endif
/*
* Platform specific names.
......@@ -46,13 +45,13 @@
*/
/* fileno cannot be an inline function, because _fileno is a macro. */
# define fileno(fileptr) _fileno(fileptr)
#define fileno(fileptr) _fileno(fileptr)
/* _fstat uses the _stat structure, not stat. */
# define BLD_PLAT_STAT _stat
#define BLD_PLAT_STAT _stat
/* Define flag values for _access. */
# define F_OK 0
#define F_OK 0
/* getopt implementation for Windows: Data. */
......@@ -184,4 +183,4 @@ int getopt_long_only(int argc,
const struct option *longopts,
int *indexptr);
#endif /* __WINPOSIX_H__ */
#endif /* WIN_POSIX_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment