X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr9x.h;h=c9d5152f2b436040af3665ac6dee42f059e5d7a7;hb=fd654c8a3e3dbd5ab97eb6b3834ee462dd509a66;hp=6e589c0c845225448134224dbc12a486f950ed0f;hpb=89d0e422c9698dd9a1fcbd7d4b6c8490633b0029;p=openocd.git

diff --git a/src/flash/str9x.h b/src/flash/str9x.h
index 6e589c0c84..c9d5152f2b 100644
--- a/src/flash/str9x.h
+++ b/src/flash/str9x.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 STR9X_H
 
 #include "flash.h"
-#include "target.h"
 
-typedef struct str9x_flash_bank_s
+struct str9x_flash_bank
 {
-	u32 *sector_bits;
-	working_area_t *write_algorithm;
-} str9x_flash_bank_t;
+	uint32_t *sector_bits;
+	int variant;
+	int bank1;
+	struct working_area *write_algorithm;
+};
 
 enum str9x_status_codes
 {
@@ -45,7 +49,7 @@ enum str9x_status_codes
 	STR9X_BUSY = 11
 };
 
-/*  Flash registers */
+/* Flash registers */
 
 #define FLASH_BBSR		0x54000000		/* Boot Bank Size Register                */
 #define FLASH_NBBSR		0x54000004		/* Non-Boot Bank Size Register            */
@@ -55,11 +59,4 @@ enum str9x_status_codes
 #define FLASH_SR		0x5400001C		/* Status Register                        */
 #define FLASH_BCE5ADDR	0x54000020		/* BC Fifth Entry Target Address Register */
 
-typedef struct str9x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
-	u32 sector_bit;
-} str9x_mem_layout_t;
-
 #endif /* STR9X_H */
-