[Openocd-svn] r2392 - in trunk/src: flash helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-24 11:37:44 +0200 (Wed, 24 Jun 2009)
New Revision: 2392

Modified:
   trunk/src/flash/at91sam3.c
   trunk/src/helper/membuf.c
Log:
- Fixes '+' whitespace
- Replace '\(\w\)\(+\)\(\w\)' with '\1 \2 \3'.


Modified: trunk/src/flash/at91sam3.c
===================================================================
--- trunk/src/flash/at91sam3.c	2009-06-24 09:37:37 UTC (rev 2391)
+++ trunk/src/flash/at91sam3.c	2009-06-24 09:37:44 UTC (rev 2392)
@@ -1276,7 +1276,7 @@
 	} else if ( diva == 0 ){
 		sam3_sprintf(pChip,"\tPLLA Freq: (Disabled,diva = 0)\n");
 	} else if ( diva == 1 ){
-		pChip->cfg.plla_freq = (pChip->cfg.mainosc_freq * (mula+1));
+		pChip->cfg.plla_freq = (pChip->cfg.mainosc_freq * (mula + 1));
 		sam3_sprintf(pChip,"\tPLLA Freq: %3.03f MHz\n",
 					 _tomhz( pChip->cfg.plla_freq ));
 	}
@@ -1828,7 +1828,7 @@
 
 	LOG_DEBUG("Bank = %d, nbanks = %d",
 			  pPrivate->bank_number , pPrivate->pChip->details.n_banks);
-	if ( (pPrivate->bank_number+1) == pPrivate->pChip->details.n_banks ){
+	if ( (pPrivate->bank_number + 1) == pPrivate->pChip->details.n_banks ){
 		// read unique id, 
 		// it appears to be associated with the *last* flash bank.
 		FLASHD_ReadUniqueID(pPrivate);
@@ -1874,7 +1874,7 @@
 		return ERROR_FLASH_BANK_NOT_PROBED;
 	}
 
-	if ( (first == 0) && ((last+1)== ((int)(pPrivate->nsectors))) ){
+	if ( (first == 0) && ((last + 1)== ((int)(pPrivate->nsectors))) ){
 		// whole chip
 		LOG_DEBUG("Here");
 		return FLASHD_EraseEntireBank( pPrivate );

Modified: trunk/src/helper/membuf.c
===================================================================
--- trunk/src/helper/membuf.c	2009-06-24 09:37:37 UTC (rev 2391)
+++ trunk/src/helper/membuf.c	2009-06-24 09:37:44 UTC (rev 2392)
@@ -77,7 +77,7 @@
     pBuf = calloc( 1, sizeof(*pBuf) );
     if ( pBuf ){
 	// we *ALWAYS* allocate +1 for null terminator.
-	pBuf->buf = calloc( DEFAULT_BUFSIZE+1, sizeof(char));
+	pBuf->buf = calloc( DEFAULT_BUFSIZE + 1, sizeof(char));
 	if ( pBuf->buf == NULL ){
 	    free(pBuf);
 	    pBuf = NULL;
@@ -104,7 +104,7 @@
     }
 
     // always alloc +1 for the null terminator
-    vp = realloc( pBuf->buf, newsize+1 );
+    vp = realloc( pBuf->buf, newsize + 1 );
     if ( vp ){
 	pBuf->buf    = vp;
 	pBuf->maxlen = newsize;