X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fat91sam7.h;h=20e0737d382f233fd8b18c893ed7236001fc6a1e;hb=1796e1602e9ffe1cbf35f1b001cb6a534bb2f738;hp=c65600eb6627e853ff8d8f5723a4ea79b321661b;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f;p=openocd.git

diff --git a/src/flash/at91sam7.h b/src/flash/at91sam7.h
index c65600eb66..20e0737d38 100644
--- a/src/flash/at91sam7.h
+++ b/src/flash/at91sam7.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Magnus Lundin                                   *
- *   lundinªmlu.mine.nu                                                    *
+ *   lundin@mlu.mine.nu                                                   *
  *                                                                         *
  *   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  *
@@ -25,7 +25,6 @@
 
 typedef struct at91sam7_flash_bank_s
 {
-	struct target_s *target;
 	u32 working_area;
 	u32 working_area_size;
 
@@ -46,15 +45,16 @@ typedef struct at91sam7_flash_bank_s
 	u16 pagesize;
 	u16 pages_in_lockregion;
 	u8 num_erase_regions;
+	u8 num_planes;
 	u32 *erase_region_info;
 
-        /* nv memory bits */
+	/* nv memory bits */
 	u16 num_lockbits;
-	u16 lockbits;
+	u16 lockbits[4];
 	u16 num_nvmbits;
 	u16 nvmbits;
 	u8  securitybit;
-	u8  flashmode;         /* 0: not init, 1: fmcn for nvbits (1uS), 2: fmcn for flash (1.5uS) */
+	u8  flashmode[4];         /* 0: not init, 1: fmcn for nvbits (1uS), 2: fmcn for flash (1.5uS) */
 
 	/* main clock status */
 	u8  mck_valid;
@@ -72,9 +72,6 @@ typedef struct at91sam7_flash_bank_s
 #define PMC_MCKR  0xFFFFFC30
 #define PMC_MCKR_CSS  0x03
 #define PMC_MCKR_PRES 0x1c
-#define MC_FMR	0xFFFFFF60
-#define MC_FCR	0xFFFFFF64
-#define MC_FSR	0xFFFFFF68
 
 /* Flash Controller Commands */
 #define  WP   0x01
@@ -86,7 +83,16 @@ typedef struct at91sam7_flash_bank_s
 #define  CGPB 0x0D
 #define  SSB  0x0F
 
+/* MC_FSR bit definitions */
+#define        MC_FSR_FRDY 1
+#define        MC_FSR_EOL 2
+
 /* AT91SAM7 constants */
 #define RC_FREQ  32000
 
+/*  FLASH_TIMING_MODES */
+#define  FMR_TIMING_NONE    0
+#define  FMR_TIMING_NVBITS  1
+#define  FMR_TIMING_FLASH   2
+
 #endif /* AT91SAM7_H */