- Fixes '+' whitespace
- Replace '\(\w\)\(+\)\(\w\)' with '\1 \2 \3'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2392 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
5e53d488dc
commit
9cd160608c
|
@ -1276,7 +1276,7 @@ sam3_explain_ckgr_plla( struct sam3_chip *pChip )
|
||||||
} else if ( diva == 0 ){
|
} else if ( diva == 0 ){
|
||||||
sam3_sprintf(pChip,"\tPLLA Freq: (Disabled,diva = 0)\n");
|
sam3_sprintf(pChip,"\tPLLA Freq: (Disabled,diva = 0)\n");
|
||||||
} else if ( diva == 1 ){
|
} 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",
|
sam3_sprintf(pChip,"\tPLLA Freq: %3.03f MHz\n",
|
||||||
_tomhz( pChip->cfg.plla_freq ));
|
_tomhz( pChip->cfg.plla_freq ));
|
||||||
}
|
}
|
||||||
|
@ -1828,7 +1828,7 @@ _sam3_probe(struct flash_bank_s *bank, int noise)
|
||||||
|
|
||||||
LOG_DEBUG("Bank = %d, nbanks = %d",
|
LOG_DEBUG("Bank = %d, nbanks = %d",
|
||||||
pPrivate->bank_number , pPrivate->pChip->details.n_banks);
|
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,
|
// read unique id,
|
||||||
// it appears to be associated with the *last* flash bank.
|
// it appears to be associated with the *last* flash bank.
|
||||||
FLASHD_ReadUniqueID(pPrivate);
|
FLASHD_ReadUniqueID(pPrivate);
|
||||||
|
@ -1874,7 +1874,7 @@ sam3_erase(struct flash_bank_s *bank, int first, int last)
|
||||||
return ERROR_FLASH_BANK_NOT_PROBED;
|
return ERROR_FLASH_BANK_NOT_PROBED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( (first == 0) && ((last+1)== ((int)(pPrivate->nsectors))) ){
|
if ( (first == 0) && ((last + 1)== ((int)(pPrivate->nsectors))) ){
|
||||||
// whole chip
|
// whole chip
|
||||||
LOG_DEBUG("Here");
|
LOG_DEBUG("Here");
|
||||||
return FLASHD_EraseEntireBank( pPrivate );
|
return FLASHD_EraseEntireBank( pPrivate );
|
||||||
|
|
|
@ -77,7 +77,7 @@ membuf_new(void)
|
||||||
pBuf = calloc( 1, sizeof(*pBuf) );
|
pBuf = calloc( 1, sizeof(*pBuf) );
|
||||||
if ( pBuf ){
|
if ( pBuf ){
|
||||||
// we *ALWAYS* allocate +1 for null terminator.
|
// 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 ){
|
if ( pBuf->buf == NULL ){
|
||||||
free(pBuf);
|
free(pBuf);
|
||||||
pBuf = NULL;
|
pBuf = NULL;
|
||||||
|
@ -104,7 +104,7 @@ membuf_grow( struct membuf *pBuf, int n )
|
||||||
}
|
}
|
||||||
|
|
||||||
// always alloc +1 for the null terminator
|
// always alloc +1 for the null terminator
|
||||||
vp = realloc( pBuf->buf, newsize+1 );
|
vp = realloc( pBuf->buf, newsize + 1 );
|
||||||
if ( vp ){
|
if ( vp ){
|
||||||
pBuf->buf = vp;
|
pBuf->buf = vp;
|
||||||
pBuf->maxlen = newsize;
|
pBuf->maxlen = newsize;
|
||||||
|
|
Loading…
Reference in New Issue