X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fcfi.h;h=ed858a9de5772eb2bddbca74a37d6e192dc64976;hb=1b864d6e49d634a382ba1ed13f650898872627cf;hp=04153b688075287cb6be558774a7bb584ff901bd;hpb=9f0cba528a163645c8ecace413731c23310f2c26;p=openocd.git

diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index 04153b6880..ed858a9de5 100644
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -13,25 +13,24 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef CFI_H
-#define CFI_H
+#ifndef OPENOCD_FLASH_NOR_CFI_H
+#define OPENOCD_FLASH_NOR_CFI_H
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
 
 struct cfi_flash_bank {
-	struct working_area *write_algorithm;
-
 	int x16_as_x8;
 	int jedec_probe;
 	int not_cfi;
 	int probed;
 
+	enum target_endianness endianness;
+	int data_swap;
+
 	uint16_t manufacturer;
 	uint16_t device_id;
 
@@ -145,8 +144,8 @@ struct cfi_unlock_addresses {
 struct cfi_fixup {
 	uint16_t mfr;
 	uint16_t id;
-	void (*fixup)(struct flash_bank *bank, void *param);
-	void *param;
+	void (*fixup)(struct flash_bank *bank, const void *param);
+	const void *param;
 };
 
 #define CFI_MFR_AMD		0x0001
@@ -161,4 +160,4 @@ struct cfi_fixup {
 #define CFI_MFR_ANY		0xffff
 #define CFI_ID_ANY		0xffff
 
-#endif /* CFI_H */
+#endif /* OPENOCD_FLASH_NOR_CFI_H */