X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fstr7x.h;h=ecbbc761af34949b1ad8957d23cc88aec73b574e;hb=ed1aed8dd9f282fe7a948676453054c15d8ebd4e;hp=b602498cdaef9e870cd7e34f85b588d88750fe61;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index b602498c..ecbbc761 100644
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.h
@@ -24,14 +24,13 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {
-	u32 *sector_bits;
-	u32 disable_bit;
-	u32 busy_bits;
-	u32 register_base;
+	uint32_t *sector_bits;
+	uint32_t disable_bit;
+	uint32_t busy_bits;
+	uint32_t register_base;
 	working_area_t *write_algorithm;
 } str7x_flash_bank_t;
 
@@ -60,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
@@ -77,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
@@ -103,9 +102,9 @@ enum str7x_status_codes
 #define FLASH_ERR		0x00000001
 
 typedef struct str7x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
-	u32 sector_bit;
+	uint32_t sector_start;
+	uint32_t sector_size;
+	uint32_t sector_bit;
 } str7x_mem_layout_t;
 
 #endif /* STR7X_H */