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>
This commit is contained in:
committed by
Andreas Fritiofson
parent
d0e763ac7e
commit
d4b7cbff88
@@ -16,8 +16,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CFI_H
|
||||
#define CFI_H
|
||||
#ifndef OPENOCD_FLASH_NOR_CFI_H
|
||||
#define OPENOCD_FLASH_NOR_CFI_H
|
||||
|
||||
#define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
|
||||
#define CFI_STATUS_POLL_MASK_DQ6_DQ7 0xC0 /* DQ6..DQ7 */
|
||||
@@ -159,4 +159,4 @@ struct cfi_fixup {
|
||||
#define CFI_MFR_ANY 0xffff
|
||||
#define CFI_ID_ANY 0xffff
|
||||
|
||||
#endif /* CFI_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_CFI_H */
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef FLASH_NOR_CORE_H
|
||||
#define FLASH_NOR_CORE_H
|
||||
#ifndef OPENOCD_FLASH_NOR_CORE_H
|
||||
#define OPENOCD_FLASH_NOR_CORE_H
|
||||
|
||||
#include <flash/common.h>
|
||||
|
||||
@@ -206,4 +206,4 @@ struct flash_bank *get_flash_bank_by_num_noprobe(int num);
|
||||
int get_flash_bank_by_addr(struct target *target, uint32_t addr, bool check,
|
||||
struct flash_bank **result_bank);
|
||||
|
||||
#endif /* FLASH_NOR_CORE_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_CORE_H */
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef FLASH_NOR_DRIVER_H
|
||||
#define FLASH_NOR_DRIVER_H
|
||||
#ifndef OPENOCD_FLASH_NOR_DRIVER_H
|
||||
#define OPENOCD_FLASH_NOR_DRIVER_H
|
||||
|
||||
struct flash_bank;
|
||||
|
||||
@@ -221,4 +221,4 @@ struct flash_driver {
|
||||
*/
|
||||
struct flash_driver *flash_driver_find_by_name(const char *name);
|
||||
|
||||
#endif /* FLASH_NOR_DRIVER_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_DRIVER_H */
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef FLASH_NOR_IMP_H
|
||||
#define FLASH_NOR_IMP_H
|
||||
#ifndef OPENOCD_FLASH_NOR_IMP_H
|
||||
#define OPENOCD_FLASH_NOR_IMP_H
|
||||
|
||||
/* this is an internal header */
|
||||
#include "core.h"
|
||||
@@ -46,4 +46,4 @@ int flash_driver_read(struct flash_bank *bank,
|
||||
int flash_write_unlock(struct target *target, struct image *image,
|
||||
uint32_t *written, int erase, bool unlock);
|
||||
|
||||
#endif /* FLASH_NOR_IMP_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_IMP_H */
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef NON_CFI_H
|
||||
#define NON_CFI_H
|
||||
#ifndef OPENOCD_FLASH_NOR_NON_CFI_H
|
||||
#define OPENOCD_FLASH_NOR_NON_CFI_H
|
||||
|
||||
struct non_cfi {
|
||||
uint16_t mfr;
|
||||
@@ -33,4 +33,4 @@ struct non_cfi {
|
||||
|
||||
void cfi_fixup_non_cfi(struct flash_bank *bank);
|
||||
|
||||
#endif /* NON_CFI_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_NON_CFI_H */
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef OCL_H
|
||||
#define OCL_H
|
||||
#ifndef OPENOCD_FLASH_NOR_OCL_H
|
||||
#define OPENOCD_FLASH_NOR_OCL_H
|
||||
|
||||
/* command/response mask */
|
||||
#define OCL_CMD_MASK 0xFFFF0000L
|
||||
@@ -36,4 +36,4 @@
|
||||
|
||||
#define OCL_CHKS_INIT 0xC100CD0CL
|
||||
|
||||
#endif /* OCL_H */
|
||||
#endif /* OPENOCD_FLASH_NOR_OCL_H */
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef OPENOCD_FLASH_NOR_SPI_H
|
||||
#define OPENOCD_FLASH_NOR_SPI_H
|
||||
|
||||
/* data structure to maintain flash ids from different vendors */
|
||||
struct flash_device {
|
||||
char *name;
|
||||
@@ -54,3 +57,5 @@ extern const struct flash_device flash_devices[];
|
||||
#define SPIFLASH_PAGE_PROGRAM 0x02 /* Page Program */
|
||||
#define SPIFLASH_FAST_READ 0x0B /* Fast Read */
|
||||
#define SPIFLASH_READ 0x03 /* Normal Read */
|
||||
|
||||
#endif /* OPENOCD_FLASH_NOR_SPI_H */
|
||||
|
||||
Reference in New Issue
Block a user