X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr7x.h;h=81af0f1e7b0aadfb6f7ae9183553ef3a243fc30b;hb=d5e4e23f9a5b1074cd298d5386e638a9fa78b1ad;hp=5d0b1824a9eec4ab4ae0933de00d40a769f58009;hpb=0643263d68bcddc56eaa7e3678b7502798410711;p=openocd.git

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index 5d0b1824a9..81af0f1e7b 100644
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.h
@@ -25,14 +25,14 @@
 
 #include "flash.h"
 
-typedef struct str7x_flash_bank_s
+struct str7x_flash_bank
 {
-	u32 *sector_bits;
-	u32 disable_bit;
-	u32 busy_bits;
-	u32 register_base;
-	working_area_t *write_algorithm;
-} str7x_flash_bank_t;
+	uint32_t *sector_bits;
+	uint32_t disable_bit;
+	uint32_t busy_bits;
+	uint32_t register_base;
+	struct working_area *write_algorithm;
+};
 
 enum str7x_status_codes
 {
@@ -59,14 +59,14 @@ enum str7x_status_codes
 #define FLASH_AR		0x00000010
 #define FLASH_ER		0x00000014
 #define FLASH_NVWPAR	0x0000DFB0
-#define FLASH_NVAPR0 	0x0000DFB8
-#define FLASH_NVAPR1 	0x0000DFBC
+#define FLASH_NVAPR0	0x0000DFB8
+#define FLASH_NVAPR1	0x0000DFBC
 
 /* FLASH_CR0 register bits */
 
 #define FLASH_WMS		0x80000000
 #define FLASH_SUSP		0x40000000
-#define FLASH_WPG   	0x20000000
+#define FLASH_WPG		0x20000000
 #define FLASH_DWPG		0x10000000
 #define FLASH_SER		0x08000000
 #define FLASH_SPR		0x01000000
@@ -76,7 +76,7 @@ enum str7x_status_codes
 #define FLASH_BSYA1		0x00000004
 #define FLASH_BSYA0		0x00000002
 
-/* FLASH_CR1 regsiter bits */
+/* FLASH_CR1 register bits */
 
 #define FLASH_B1S		0x02000000
 #define FLASH_B0S		0x01000000
@@ -101,10 +101,10 @@ enum str7x_status_codes
 #define FLASH_ERER		0x00000002
 #define FLASH_ERR		0x00000001
 
-typedef struct str7x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
-	u32 sector_bit;
-} str7x_mem_layout_t;
+struct str7x_mem_layout {
+	uint32_t sector_start;
+	uint32_t sector_size;
+	uint32_t sector_bit;
+};
 
 #endif /* STR7X_H */