X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr7x.h;h=81af0f1e7b0aadfb6f7ae9183553ef3a243fc30b;hb=2f6e56e38320350bb300b363d0b3737fa8d1f3ea;hp=a3372f59bad77f5ccb78d04adb267e759a0b3c52;hpb=80d20326a7fafc0f6ed865df2211bc9e609265fb;p=openocd.git

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index a3372f59ba..81af0f1e7b 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,16 +24,15 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
-typedef struct str7x_flash_bank_s
+struct str7x_flash_bank
 {
-	u32 *sector_bits;
-	u32 disable_bit;
-	u32 busy_bits;
-	u32 register_base;
-	working_area_t *write_algorithm;
-} str7x_flash_bank_t;
+	uint32_t *sector_bits;
+	uint32_t disable_bit;
+	uint32_t busy_bits;
+	uint32_t register_base;
+	struct working_area *write_algorithm;
+};
 
 enum str7x_status_codes
 {
@@ -57,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
@@ -74,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
@@ -99,11 +101,10 @@ enum str7x_status_codes
 #define FLASH_ERER		0x00000002
 #define FLASH_ERR		0x00000001
 
-typedef struct str7x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
-	u32 sector_bit;
-} str7x_mem_layout_t;
+struct str7x_mem_layout {
+	uint32_t sector_start;
+	uint32_t sector_size;
+	uint32_t sector_bit;
+};
 
 #endif /* STR7X_H */
-