X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fat91sam7.h;h=43961d5e4121741191c3dc010e3ca66b335b0ae0;hb=379f0b0b9b10d4bc2a018d3683bd6de45e186b2b;hp=0bb8f439b1bd2b7a5d06fa15243a09bbef776d3a;hpb=94ffacdd9309745c8f04b512426bb6d810f5456a;p=openocd.git

diff --git a/src/flash/at91sam7.h b/src/flash/at91sam7.h
index 0bb8f439b1..43961d5e41 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,20 +45,23 @@ 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 */
 	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;
 	u32 mck_freq;
 	
+	int probed;
+	
 } at91sam7_flash_bank_t;
 
 /* AT91SAM7 control registers */
@@ -72,9 +74,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