David Brownell <david-b@pacbell.net>:

[openocd] / src / flash / str7x.h

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index 7e48f4a421f25d6da384855cefcb47df97f72323..7e904fa2d66771ffce84bf7251e46479fed23c09 100644 (file)
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.h
@@ -24,7 +24,6 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {
@@ -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
@@ -109,4 +108,3 @@ typedef struct str7x_mem_layout_s {
 } str7x_mem_layout_t;
 
 #endif /* STR7X_H */
-