X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fstr7x.h;h=7e904fa2d66771ffce84bf7251e46479fed23c09;hb=30fca8e531ee0be5b33a517dd166da84a1d615ff;hp=e1d9b2e01e9d0fac31f42eb351fb398fd66ffbf8;hpb=3f74f764c7c7b9e22906d2885666d844768c4351;p=openocd

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index e1d9b2e0..7e904fa2 100644
--- 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,13 @@
 #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;
 
@@ -49,30 +52,31 @@ 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 */
 
 #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
 #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 */
+/* FLASH_CR1 register bits */
 
 #define FLASH_B1S		0x02000000
 #define FLASH_B0S		0x01000000
@@ -100,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 */
-