- Fixes '[|]' whitespace

- Replace ')\([|]\)(' with ') \1 ('.
- Replace ')\([|]\)\(\w\)' with ') \1 \2'.
- Replace '\(\w\)\([|]\)(' with '\1 \2 ('.
- Replace '\(\w\)\([|]\)\(\w\)' with '\1 \2 \3'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2374 b42882b7-edfa-0310-969c-e2dbd0fdcd60

2 files changed, 4 insertions, 4 deletions

diff --git a/src/flash/ocl/at91sam7x/main.c b/src/flash/ocl/at91sam7x/main.c
index 2d6ba0a5..c675b20a 100644
--- a/src/flash/ocl/at91sam7x/main.c
+++ b/src/flash/ocl/at91sam7x/main.c
@@ -72,7 +72,7 @@ void cmd_flash(uint32 cmd)
 	/* verify written data */
 	if (!result) result = flash_verify(adr, len, ((uint8 *)buffer) + ofs);
 
-	dcc_wr(OCL_CMD_DONE|result);
+	dcc_wr(OCL_CMD_DONE | result);
 }
 
 
@@ -84,14 +84,14 @@ int main (void)
 		cmd = dcc_rd();
 		switch (cmd&OCL_CMD_MASK) {
 			case OCL_PROBE:
-				dcc_wr(OCL_CMD_DONE|flash_init());
+				dcc_wr(OCL_CMD_DONE | flash_init());
 				dcc_wr(0x100000); /* base */
 				dcc_wr(flash_page_count*flash_page_size); /* size */
 				dcc_wr(1); /* num_sectors */
 				dcc_wr(4096 | ((unsigned long) flash_page_size << 16)); /* buflen and bufalign */
 				break;
 			case OCL_ERASE_ALL:
-				dcc_wr(OCL_CMD_DONE|flash_erase_all());
+				dcc_wr(OCL_CMD_DONE | flash_erase_all());
 				break;
 			case OCL_FLASH_BLOCK:
 				cmd_flash(cmd);
diff --git a/src/flash/ocl/at91sam7x/samflash.c b/src/flash/ocl/at91sam7x/samflash.c
index caa3dad4..6f7bf5f5 100644
--- a/src/flash/ocl/at91sam7x/samflash.c
+++ b/src/flash/ocl/at91sam7x/samflash.c
@@ -164,7 +164,7 @@ int flash_erase_plane(int efc_ofs)
 	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;
 }