diff options
author | Marc Schink <openocd-dev@marcschink.de> | 2015-09-21 21:07:46 +0200 |
---|---|---|
committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-05-24 22:30:55 +0100 |
commit | d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0 (patch) | |
tree | 78f8488d823e6abc4774529de947572e955a525e /src/flash/nand | |
parent | d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69 (diff) | |
download | riscv-openocd-d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0.zip riscv-openocd-d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0.tar.gz riscv-openocd-d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0.tar.bz2 |
Make #include guard naming consistent
Change-Id: Ie13e8af0bb74ed290f811dcad64ad06c9d8cb4fa
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/2956
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/flash/nand')
-rw-r--r-- | src/flash/nand/arm_io.h | 6 | ||||
-rw-r--r-- | src/flash/nand/core.h | 6 | ||||
-rw-r--r-- | src/flash/nand/driver.h | 6 | ||||
-rw-r--r-- | src/flash/nand/fileio.h | 6 | ||||
-rw-r--r-- | src/flash/nand/imp.h | 6 | ||||
-rw-r--r-- | src/flash/nand/lpc3180.h | 6 | ||||
-rw-r--r-- | src/flash/nand/lpc32xx.h | 6 | ||||
-rw-r--r-- | src/flash/nand/mx3.h | 5 | ||||
-rw-r--r-- | src/flash/nand/mxc.h | 6 | ||||
-rw-r--r-- | src/flash/nand/nuc910.h | 7 | ||||
-rw-r--r-- | src/flash/nand/s3c24xx.h | 6 | ||||
-rw-r--r-- | src/flash/nand/s3c24xx_regs.h | 7 |
12 files changed, 40 insertions, 33 deletions
diff --git a/src/flash/nand/arm_io.h b/src/flash/nand/arm_io.h index 30099cf..8bb3114 100644 --- a/src/flash/nand/arm_io.h +++ b/src/flash/nand/arm_io.h @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __ARM_NANDIO_H -#define __ARM_NANDIO_H +#ifndef OPENOCD_FLASH_NAND_ARM_IO_H +#define OPENOCD_FLASH_NAND_ARM_IO_H /** * Available operational states the arm_nand_data struct can be in. @@ -52,4 +52,4 @@ struct arm_nand_data { int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size); int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size); -#endif /* __ARM_NANDIO_H */ +#endif /* OPENOCD_FLASH_NAND_ARM_IO_H */ diff --git a/src/flash/nand/core.h b/src/flash/nand/core.h index 3990fa3..5bf9fb3 100644 --- a/src/flash/nand/core.h +++ b/src/flash/nand/core.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NAND_CORE_H -#define FLASH_NAND_CORE_H +#ifndef OPENOCD_FLASH_NAND_CORE_H +#define OPENOCD_FLASH_NAND_CORE_H #include <flash/common.h> @@ -229,4 +229,4 @@ COMMAND_HELPER(nand_command_get_device, unsigned name_index, #define ERROR_NAND_ERROR_CORRECTION_FAILED (-1105) #define ERROR_NAND_NO_BUFFER (-1106) -#endif /* FLASH_NAND_CORE_H */ +#endif /* OPENOCD_FLASH_NAND_CORE_H */ diff --git a/src/flash/nand/driver.h b/src/flash/nand/driver.h index fda77db..2182a77 100644 --- a/src/flash/nand/driver.h +++ b/src/flash/nand/driver.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NAND_DRIVER_H -#define FLASH_NAND_DRIVER_H +#ifndef OPENOCD_FLASH_NAND_DRIVER_H +#define OPENOCD_FLASH_NAND_DRIVER_H struct nand_device; @@ -100,4 +100,4 @@ typedef int (*nand_driver_walker_t)(struct nand_flash_controller *c, void *); */ int nand_driver_walk(nand_driver_walker_t f, void *x); -#endif /* FLASH_NAND_DRIVER_H */ +#endif /* OPENOCD_FLASH_NAND_DRIVER_H */ diff --git a/src/flash/nand/fileio.h b/src/flash/nand/fileio.h index 4e6e1f7..af6c766 100644 --- a/src/flash/nand/fileio.h +++ b/src/flash/nand/fileio.h @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NAND_FILEIO_H -#define FLASH_NAND_FILEIO_H +#ifndef OPENOCD_FLASH_NAND_FILEIO_H +#define OPENOCD_FLASH_NAND_FILEIO_H #include <helper/time_support.h> #include <helper/fileio.h> @@ -53,4 +53,4 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state, int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s); -#endif /* FLASH_NAND_FILEIO_H */ +#endif /* OPENOCD_FLASH_NAND_FILEIO_H */ diff --git a/src/flash/nand/imp.h b/src/flash/nand/imp.h index c554704..c8a4ed9 100644 --- a/src/flash/nand/imp.h +++ b/src/flash/nand/imp.h @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NAND_IMP_H -#define FLASH_NAND_IMP_H +#ifndef OPENOCD_FLASH_NAND_IMP_H +#define OPENOCD_FLASH_NAND_IMP_H #include "core.h" #include "driver.h" @@ -35,4 +35,4 @@ int nand_probe(struct nand_device *nand); int nand_erase(struct nand_device *nand, int first_block, int last_block); int nand_build_bbt(struct nand_device *nand, int first, int last); -#endif /* FLASH_NAND_IMP_H */ +#endif /* OPENOCD_FLASH_NAND_IMP_H */ diff --git a/src/flash/nand/lpc3180.h b/src/flash/nand/lpc3180.h index 4b74899..c02ee5b 100644 --- a/src/flash/nand/lpc3180.h +++ b/src/flash/nand/lpc3180.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef LPC3180_NAND_CONTROLLER_H -#define LPC3180_NAND_CONTROLLER_H +#ifndef OPENOCD_FLASH_NAND_LPC3180_H +#define OPENOCD_FLASH_NAND_LPC3180_H enum lpc3180_selected_controller { LPC3180_NO_CONTROLLER, @@ -34,4 +34,4 @@ struct lpc3180_nand_controller { uint32_t sw_wp_upper_bound; }; -#endif /*LPC3180_NAND_CONTROLLER_H */ +#endif /* OPENOCD_FLASH_NAND_LPC3180_H */ diff --git a/src/flash/nand/lpc32xx.h b/src/flash/nand/lpc32xx.h index cde6b7d..90b20b2 100644 --- a/src/flash/nand/lpc32xx.h +++ b/src/flash/nand/lpc32xx.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef LPC32xx_NAND_CONTROLLER_H -#define LPC32xx_NAND_CONTROLLER_H +#ifndef OPENOCD_FLASH_NAND_LPC32XX_H +#define OPENOCD_FLASH_NAND_LPC32XX_H enum lpc32xx_selected_controller { LPC32xx_NO_CONTROLLER, @@ -33,4 +33,4 @@ struct lpc32xx_nand_controller { uint32_t sw_wp_upper_bound; }; -#endif /*LPC32xx_NAND_CONTROLLER_H */ +#endif /* OPENOCD_FLASH_NAND_LPC32XX_H */ diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h index b9fd331..00664d8 100644 --- a/src/flash/nand/mx3.h +++ b/src/flash/nand/mx3.h @@ -17,6 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ +#ifndef OPENOCD_FLASH_NAND_MX3_H +#define OPENOCD_FLASH_NAND_MX3_H + /* * Freescale iMX3* OpenOCD NAND Flash controller support. * @@ -105,3 +108,5 @@ struct mx3_nf_controller { enum mx_nf_finalize_action fin; struct mx3_nf_flags flags; }; + +#endif /* OPENOCD_FLASH_NAND_MX3_H */ diff --git a/src/flash/nand/mxc.h b/src/flash/nand/mxc.h index 0592be2..a188728 100644 --- a/src/flash/nand/mxc.h +++ b/src/flash/nand/mxc.h @@ -1,4 +1,3 @@ - /*************************************************************************** * Copyright (C) 2009 by Alexei Babich * * Rezonans plc., Chelyabinsk, Russia * @@ -21,6 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ +#ifndef OPENOCD_FLASH_NAND_MXC_H +#define OPENOCD_FLASH_NAND_MXC_H + /* * Freescale iMX OpenOCD NAND Flash controller support. * based on Freescale iMX2* and iMX3* OpenOCD NAND Flash controller support. @@ -162,3 +164,5 @@ struct mxc_nf_controller { enum mxc_nf_finalize_action fin; struct mxc_nf_flags flags; }; + +#endif /* OPENOCD_FLASH_NAND_MXC_H */ diff --git a/src/flash/nand/nuc910.h b/src/flash/nand/nuc910.h index 7b94009..8877cf6 100644 --- a/src/flash/nand/nuc910.h +++ b/src/flash/nand/nuc910.h @@ -20,8 +20,8 @@ * NAND controller interface for Nuvoton NUC910 */ -#ifndef NUC910_H -#define NUC910_H +#ifndef OPENOCD_FLASH_NAND_NUC910_H +#define OPENOCD_FLASH_NAND_NUC910_H #define NUC910_FMICSR 0xB000D000 #define NUC910_SMCSR 0xB000D0A0 @@ -54,5 +54,4 @@ /* ECC4 Correction Status (ECC4ST) */ -#endif /* NUC910_H */ - +#endif /* OPENOCD_FLASH_NAND_NUC910_H */ diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h index e8126cd..5c7782d 100644 --- a/src/flash/nand/s3c24xx.h +++ b/src/flash/nand/s3c24xx.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef S3C24xx_NAND_H -#define S3C24xx_NAND_H +#ifndef OPENOCD_FLASH_NAND_S3C24XX_H +#define OPENOCD_FLASH_NAND_S3C24XX_H /* * S3C24XX Series OpenOCD NAND Flash controller support. @@ -75,4 +75,4 @@ int s3c2440_read_block_data(struct nand_device *nand, int s3c2440_write_block_data(struct nand_device *nand, uint8_t *data, int data_size); -#endif /* S3C24xx_NAND_H */ +#endif /* OPENOCD_FLASH_NAND_S3C24XX_H */ diff --git a/src/flash/nand/s3c24xx_regs.h b/src/flash/nand/s3c24xx_regs.h index 312591e..88bc665 100644 --- a/src/flash/nand/s3c24xx_regs.h +++ b/src/flash/nand/s3c24xx_regs.h @@ -20,8 +20,8 @@ * S3C2410 NAND register definitions */ -#ifndef __ASM_ARM_REGS_NAND -#define __ASM_ARM_REGS_NAND +#ifndef OPENOCD_FLASH_NAND_S3C24XX_REGS_H +#define OPENOCD_FLASH_NAND_S3C24XX_REGS_H #define S3C2410_NFREG(x) (x) @@ -126,5 +126,4 @@ #define S3C2412_NFECCERR_MULTIBIT (2) #define S3C2412_NFECCERR_ECCAREA (3) -#endif /* __ASM_ARM_REGS_NAND */ - +#endif /* OPENOCD_FLASH_NAND_S3C24XX_REGS_H */ |