X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Focl%2Fat91sam7x%2Fsamflash.c;h=6f7bf5f55f005a33d03436862183953e5b6360e5;hp=a534f6d8de1dc270efa879609a583cf1ea4cc5f5;hb=fb1a9b2cb2f844a17d26dfeb3d26849364d93e26;hpb=3813fda44adcea486b7308423a699f63d79273ee

diff --git a/src/flash/ocl/at91sam7x/samflash.c b/src/flash/ocl/at91sam7x/samflash.c
index a534f6d8de..6f7bf5f55f 100644
--- a/src/flash/ocl/at91sam7x/samflash.c
+++ b/src/flash/ocl/at91sam7x/samflash.c
@@ -20,11 +20,11 @@
 #include "samflash.h"
 
 
-unsigned int flash_page_count=1024;
-unsigned int flash_page_size=256;
+unsigned int flash_page_count = 1024;
+unsigned int flash_page_size = 256;
 
 /* pages per lock bit */
-unsigned int flash_lock_pages=1024/16;
+unsigned int flash_lock_pages = 1024/16;
 
 
 /* detect chip and set loader parameters */
@@ -32,38 +32,38 @@ int flash_init(void)
 {
 	unsigned int nvpsiz;
 
-	nvpsiz=(inr(DBGU_CIDR) >> 8)&0xf;
+	nvpsiz = (inr(DBGU_CIDR) >> 8)&0xf;
 
 	switch (nvpsiz) {
 		case 3:
 			/* AT91SAM7x32 */
-			flash_page_count=256;
-			flash_page_size=128;
-			flash_lock_pages=256/8;
+			flash_page_count = 256;
+			flash_page_size = 128;
+			flash_lock_pages = 256/8;
 			break;
 		case 5:
 			/* AT91SAM7x64 */
-			flash_page_count=512;
-			flash_page_size=128;
-			flash_lock_pages=512/16;
+			flash_page_count = 512;
+			flash_page_size = 128;
+			flash_lock_pages = 512/16;
 			break;
 		case 7:
 			/* AT91SAM7x128*/
-			flash_page_count=512;
-			flash_page_size=256;
-			flash_lock_pages=512/8;
+			flash_page_count = 512;
+			flash_page_size = 256;
+			flash_lock_pages = 512/8;
 			break;
 		case 9:
 			/* AT91SAM7x256 */
-			flash_page_count=1024;
-			flash_page_size=256;
-			flash_lock_pages=1024/16;
+			flash_page_count = 1024;
+			flash_page_size = 256;
+			flash_lock_pages = 1024/16;
 			break;
 		case 10:
 			/* AT91SAM7x512 */
-			flash_page_count=2048;
-			flash_page_size=256;
-			flash_lock_pages=2048/32;
+			flash_page_count = 2048;
+			flash_page_size = 256;
+			flash_lock_pages = 2048/32;
 			break;
 		default:
 			return FLASH_STAT_INITE;
@@ -82,39 +82,39 @@ int flash_page_program(uint32 *data, int page_num)
 	uint32 *data_ptr;
 
 	/* select proper controller */
-	if (page_num >= 1024) efc_ofs=0x10;
-	else efc_ofs=0;
+	if (page_num >= 1024) efc_ofs = 0x10;
+	else efc_ofs = 0;
 
 	/* wait until FLASH is ready, just for sure */
-	while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+	while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
 	/* calculate page address, only lower 8 bits are used to address the latch,
 		 but the upper part of address is needed for writing to proper EFC */
-	flash_ptr=(uint32 *)(FLASH_AREA_ADDR+(page_num*flash_page_size));
-	data_ptr=data;
+	flash_ptr = (uint32 *)(FLASH_AREA_ADDR + (page_num*flash_page_size));
+	data_ptr = data;
 
 	/* copy data to latch */
-	for (i=flash_page_size/4; i; i--) {
+	for (i = flash_page_size/4; i; i--) {
 		/* we do not use memcpy to be sure that only 32 bit access is used */
 		*(flash_ptr++)=*(data_ptr++);
 	}
 
 	/* page number and page write command to FCR */
-	outr(MC_FCR+efc_ofs, ((page_num&0x3ff) << 8) | MC_KEY | MC_FCMD_WP);
+	outr(MC_FCR + efc_ofs, ((page_num&0x3ff) << 8) | MC_KEY | MC_FCMD_WP);
 
 	/* wait until it's done */
-	while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+	while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
 	/* check for errors */
-	if ((inr(MC_FSR+efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
-	if ((inr(MC_FSR+efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
+	if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
+	if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
 
 #if 0
 	/* verify written data */
-	flash_ptr=(uint32 *)(FLASH_AREA_ADDR+(page_num*flash_page_size));
-	data_ptr=data;
+	flash_ptr = (uint32 *)(FLASH_AREA_ADDR + (page_num*flash_page_size));
+	data_ptr = data;
 
-	for (i=flash_page_size/4; i; i--) {
+	for (i = flash_page_size/4; i; i--) {
 		if (*(flash_ptr++)!=*(data_ptr++)) return FLASH_STAT_VERIFE;
 	}
 #endif
@@ -128,22 +128,22 @@ int flash_erase_plane(int efc_ofs)
 	unsigned int lockbits;
 	int page_num;
 
-	page_num=0;
-	lockbits=inr(MC_FSR+efc_ofs) >> 16;
+	page_num = 0;
+	lockbits = inr(MC_FSR + efc_ofs) >> 16;
 	while (lockbits) {
 		if (lockbits&1) {
 
 			/* wait until FLASH is ready, just for sure */
-			while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+			while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
-			outr(MC_FCR+efc_ofs, ((page_num&0x3ff) << 8) | 0x5a000004);
+			outr(MC_FCR + efc_ofs, ((page_num&0x3ff) << 8) | 0x5a000004);
 
 			/* wait until it's done */
-			while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+			while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
 			/* check for errors */
-			if ((inr(MC_FSR+efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
-			if ((inr(MC_FSR+efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
+			if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
+			if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
 
 		}
 		if ((page_num += flash_lock_pages)>flash_page_count) break;
@@ -151,20 +151,20 @@ int flash_erase_plane(int efc_ofs)
 	}
 
 	/* wait until FLASH is ready, just for sure */
-	while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+	while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
 	/* erase all command to FCR */
-	outr(MC_FCR+efc_ofs, 0x5a000008);
+	outr(MC_FCR + efc_ofs, 0x5a000008);
 
 	/* wait until it's done */
-	while ((inr(MC_FSR+efc_ofs)&MC_FRDY) == 0);
+	while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0);
 
 	/* check for errors */
-	if ((inr(MC_FSR+efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
-	if ((inr(MC_FSR+efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
+	if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE;
+	if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
 
 	/* set no erase before programming */
-	outr(MC_FMR+efc_ofs, inr(MC_FMR+efc_ofs)|0x80);
+	outr(MC_FMR + efc_ofs, inr(MC_FMR + efc_ofs) | 0x80);
 
 	return FLASH_STAT_OK;
 }
@@ -175,10 +175,10 @@ int flash_erase_all(void)
 {
 	int result;
 	
-	if ((result=flash_erase_plane(0)) != FLASH_STAT_OK) return result;
+	if ((result = flash_erase_plane(0)) != FLASH_STAT_OK) return result;
 
 	/* the second flash controller, if any */
-	if (flash_page_count>1024) result=flash_erase_plane(0x10);
+	if (flash_page_count>1024) result = flash_erase_plane(0x10);
 
 	return result;
 }
@@ -188,7 +188,7 @@ int flash_verify(uint32 adr, unsigned int len, uint8 *src)
 {
 	unsigned char *flash_ptr;
 
-	flash_ptr=(uint8 *)FLASH_AREA_ADDR+adr;
+	flash_ptr = (uint8 *)FLASH_AREA_ADDR + adr;
 	for ( ;len; len--) {
 		if (*(flash_ptr++)!=*(src++)) return FLASH_STAT_VERIFE;
 	}