X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.h;h=ff3b6d9a29ae485a77c3378c4a907810c4893ac6;hb=4bc46d61cade59a43d158862dfbe738255f00a81;hp=52340a54779892556caaa035a55de25a43f66199;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05;p=openocd.git

diff --git a/src/flash/str9xpec.h b/src/flash/str9xpec.h
index 52340a5477..ff3b6d9a29 100644
--- a/src/flash/str9xpec.h
+++ b/src/flash/str9xpec.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 STR9XPEC_H
 
 #include "flash.h"
-#include "target.h"
 #include "jtag.h"
 
 typedef struct str9xpec_flash_controller_s
 {
-	u32 *sector_bits;
+	struct jtag_tap *tap;
+	uint32_t *sector_bits;
 	int chain_pos;
 	int isc_enable;
-	jtag_device_t* devarm;
-	u8 options[8];
+	uint8_t options[8];
 } str9xpec_flash_controller_t;
 
 enum str9xpec_status_codes
@@ -66,12 +68,6 @@ enum str9xpec_status_codes
 #define ISC_STATUS_BUSY			0x04
 #define ISC_STATUS_ERROR		0x03
 
-typedef struct mem_layout_str9pec {
-	u32 sector_start;
-	u32 sector_size;
-	u32 sector_bit;
-} str9xpec_mem_layout_t;
-
 /* Option bytes definitions */
 
 #define STR9XPEC_OPT_CSMAPBIT		48
@@ -81,4 +77,3 @@ typedef struct mem_layout_str9pec {
 #define STR9XPEC_OPT_OTPBIT			63
 
 #endif /* STR9XPEC_H */
-