X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstm32x.h;h=471b633f96255d4700e2f917168b7b236f08a7df;hp=1357162c8be826ef25003aadcb76679945a3d668;hb=c7b2cad52dbc59b53d6f1734a443d3ad5e826a42;hpb=0cba0d4df3fe120f08945703506f8405760325c9

diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h
index 1357162c8b..471b633f96 100644
--- a/src/flash/stm32x.h
+++ b/src/flash/stm32x.h
@@ -24,22 +24,21 @@
 #define STM32X_H
 
 #include "flash.h"
-#include "target.h"
 
-typedef struct stm32x_options_s
+struct stm32x_options
 {
-	u16 RDP;
-	u16 user_options;
-	u16 protection[4];
-} stm32x_options_t;
+	uint16_t RDP;
+	uint16_t user_options;
+	uint16_t protection[4];
+};
 
-typedef struct stm32x_flash_bank_s
+struct stm32x_flash_bank
 {
-	stm32x_options_t option_bytes;
+	struct stm32x_options option_bytes;
 	working_area_t *write_algorithm;
 	int ppage_size;
 	int probed;
-} stm32x_flash_bank_t;
+};
 
 /* stm32x register locations */
 
@@ -65,21 +64,21 @@ typedef struct stm32x_flash_bank_s
 
 /* FLASH_CR register bits */
 
-#define FLASH_PG		(1<<0)
-#define FLASH_PER		(1<<1)
-#define FLASH_MER   	(1<<2)
-#define FLASH_OPTPG		(1<<4)
-#define FLASH_OPTER		(1<<5)
-#define FLASH_STRT		(1<<6)
-#define FLASH_LOCK		(1<<7)
-#define FLASH_OPTWRE	(1<<9)
+#define FLASH_PG		(1 << 0)
+#define FLASH_PER		(1 << 1)
+#define FLASH_MER		(1 << 2)
+#define FLASH_OPTPG		(1 << 4)
+#define FLASH_OPTER		(1 << 5)
+#define FLASH_STRT		(1 << 6)
+#define FLASH_LOCK		(1 << 7)
+#define FLASH_OPTWRE	(1 << 9)
 
-/* FLASH_SR regsiter bits */
+/* FLASH_SR register bits */
 
-#define FLASH_BSY		(1<<0)
-#define FLASH_PGERR   	(1<<2)
-#define FLASH_WRPRTERR	(1<<4)
-#define FLASH_EOP		(1<<5)
+#define FLASH_BSY		(1 << 0)
+#define FLASH_PGERR		(1 << 2)
+#define FLASH_WRPRTERR	(1 << 4)
+#define FLASH_EOP		(1 << 5)
 
 /* STM32_FLASH_OBR bit definitions (reading) */
 
@@ -95,8 +94,8 @@ typedef struct stm32x_flash_bank_s
 #define KEY2			0xCDEF89AB
 
 typedef struct stm32x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
+	uint32_t sector_start;
+	uint32_t sector_size;
 } stm32x_mem_layout_t;
 
 #endif /* STM32X_H */