Audit and eliminate redundant #include directives in src/flash headers.

[openocd.git] / src / flash / str7x.h

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index fe63b5e5e624baa9ce02b2f5cffd0dd5705befa4..5d0b1824a9eec4ab4ae0933de00d40a769f58009 100644 (file)
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -21,13 +24,14 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {
-       int bank1;
-       struct target_s *target;
-       u32 flash_base;
+       u32 *sector_bits;
+       u32 disable_bit;
+       u32 busy_bits;
+       u32 register_base;
+       working_area_t *write_algorithm;
 } str7x_flash_bank_t;
 
 enum str7x_status_codes
@@ -48,15 +52,15 @@ enum str7x_status_codes
 
 /*  Flash registers */
 
-#define FLASH_CR0              0x00100000
-#define FLASH_CR1              0x00100004
-#define FLASH_DR0              0x00100008
-#define FLASH_DR1              0x0010000C
-#define FLASH_AR               0x00100010
-#define FLASH_ER               0x00100014
-#define FLASH_NVWPAR   0x0010DFB0
-#define FLASH_NVAPR0   0x0010DFB8
-#define FLASH_NVAPR1   0x0010DFBC
+#define FLASH_CR0              0x00000000
+#define FLASH_CR1              0x00000004
+#define FLASH_DR0              0x00000008
+#define FLASH_DR1              0x0000000C
+#define FLASH_AR               0x00000010
+#define FLASH_ER               0x00000014
+#define FLASH_NVWPAR   0x0000DFB0
+#define FLASH_NVAPR0   0x0000DFB8
+#define FLASH_NVAPR1   0x0000DFBC
 
 /* FLASH_CR0 register bits */
 
@@ -68,8 +72,9 @@ enum str7x_status_codes
 #define FLASH_SPR              0x01000000
 #define FLASH_BER              0x04000000
 #define FLASH_MER              0x02000000
-#define FLASH_BSYA1            0x00000002
-#define FLASH_BSYA2            0x00000004
+#define FLASH_LOCK             0x00000010
+#define FLASH_BSYA1            0x00000004
+#define FLASH_BSYA0            0x00000002
 
 /* FLASH_CR1 regsiter bits */
 
@@ -99,8 +104,7 @@ enum str7x_status_codes
 typedef struct str7x_mem_layout_s {
        u32 sector_start;
        u32 sector_size;
-       u32 reg_offset;
+       u32 sector_bit;
 } str7x_mem_layout_t;
 
 #endif /* STR7X_H */
-