Transform 'u16' to 'uint16_t'

[fw/openocd] / src / flash / stm32x.h

diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h
index 04f813aa9dcb1448c749ba319febd4d5433dd688..ef35d856e811619a8de5fdfa94277c32970db348 100644 (file)
--- a/src/flash/stm32x.h
+++ b/src/flash/stm32x.h
@@ -24,13 +24,12 @@
 #define STM32X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stm32x_options_s
 {
-       u16 RDP;
-       u16 user_options;
-       u16 protection[4];
+       uint16_t RDP;
+       uint16_t user_options;
+       uint16_t protection[4];
 } stm32x_options_t;
 
 typedef struct stm32x_flash_bank_s
@@ -67,17 +66,17 @@ typedef struct stm32x_flash_bank_s
 
 #define FLASH_PG               (1<<0)
 #define FLASH_PER              (1<<1)
-#define FLASH_MER      (1<<2)
+#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_PGERR            (1<<2)
 #define FLASH_WRPRTERR (1<<4)
 #define FLASH_EOP              (1<<5)
 
@@ -100,4 +99,3 @@ typedef struct stm32x_mem_layout_s {
 } stm32x_mem_layout_t;
 
 #endif /* STM32X_H */
-