X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fat91sam7.h;h=4510686909b245090ac6809ce5b99a2eeb82157f;hb=dd47bba6f8c50d202ce716173f8f647dd3f77f49;hp=5e652bf06d8da692ad145dcfaa26d1f902ed34fc;hpb=0643263d68bcddc56eaa7e3678b7502798410711;p=openocd.git

diff --git a/src/flash/at91sam7.h b/src/flash/at91sam7.h
index 5e652bf06d..4510686909 100644
--- a/src/flash/at91sam7.h
+++ b/src/flash/at91sam7.h
@@ -25,49 +25,49 @@
 
 #include "flash.h"
 
-typedef struct at91sam7_flash_bank_s
+struct at91sam7_flash_bank
 {
 	/* chip id register */
-	u32 cidr;
-	u16 cidr_ext;
-	u16 cidr_nvptyp;
-	u16 cidr_arch;
-	u16 cidr_sramsiz;
-	u16 cidr_nvpsiz;
-	u16 cidr_nvpsiz2;
-	u16 cidr_eproc;
-	u16 cidr_version;
+	uint32_t cidr;
+	uint16_t cidr_ext;
+	uint16_t cidr_nvptyp;
+	uint16_t cidr_arch;
+	uint16_t cidr_sramsiz;
+	uint16_t cidr_nvpsiz;
+	uint16_t cidr_nvpsiz2;
+	uint16_t cidr_eproc;
+	uint16_t cidr_version;
 	char *target_name;
 
 	/* flash auto-detection */
-	u8  flash_autodetection;
+	uint8_t  flash_autodetection;
 
 	/* flash geometry */
-	u16 pages_per_sector;
-	u16 pagesize;
-	u16 pages_in_lockregion;
+	uint16_t pages_per_sector;
+	uint16_t pagesize;
+	uint16_t pages_in_lockregion;
 
 	/* nv memory bits */
-	u16 num_lockbits_on;
-	u16 lockbits;
-	u16 num_nvmbits;
-	u16 num_nvmbits_on;
-	u16 nvmbits;
-	u8  securitybit;
+	uint16_t num_lockbits_on;
+	uint16_t lockbits;
+	uint16_t num_nvmbits;
+	uint16_t num_nvmbits_on;
+	uint16_t nvmbits;
+	uint8_t  securitybit;
 
 	/* 0: not init
 	 * 1: fmcn for nvbits (1uS)
 	 * 2: fmcn for flash (1.5uS) */
-	u8  flashmode;
+	uint8_t  flashmode;
 
 	/* main clock status */
-	u8  mck_valid;
-	u32 mck_freq;
+	uint8_t  mck_valid;
+	uint32_t mck_freq;
 
 	/* external clock frequency */
-	u32 ext_freq;
+	uint32_t ext_freq;
 
-} at91sam7_flash_bank_t;
+};
 
 
 /* AT91SAM7 control registers */