diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:41:13 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:41:13 +0000 |
| commit | aea6815462d3302f7f8b6576f59320d5f5985642 (patch) | |
| tree | 24db5c404a4568beabe33487235dc2befd1e0421 /src/flash/ocl/at91sam7x | |
| parent | 0e2c2fe1d1eec5482078147d551215a58604cc3a (diff) | |
| download | openocd+libswd-aea6815462d3302f7f8b6576f59320d5f5985642.tar.gz openocd+libswd-aea6815462d3302f7f8b6576f59320d5f5985642.tar.bz2 openocd+libswd-aea6815462d3302f7f8b6576f59320d5f5985642.tar.xz openocd+libswd-aea6815462d3302f7f8b6576f59320d5f5985642.zip | |
- Fixes '<<' whitespace
- 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@2370 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/ocl/at91sam7x')
| -rw-r--r-- | src/flash/ocl/at91sam7x/main.c | 2 | ||||
| -rw-r--r-- | src/flash/ocl/at91sam7x/samflash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/ocl/at91sam7x/main.c b/src/flash/ocl/at91sam7x/main.c index 6ecbf35a..b49a5b89 100644 --- a/src/flash/ocl/at91sam7x/main.c +++ b/src/flash/ocl/at91sam7x/main.c @@ -88,7 +88,7 @@ int main (void) 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 */ + 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()); diff --git a/src/flash/ocl/at91sam7x/samflash.c b/src/flash/ocl/at91sam7x/samflash.c index b5255191..893b579f 100644 --- a/src/flash/ocl/at91sam7x/samflash.c +++ b/src/flash/ocl/at91sam7x/samflash.c @@ -100,7 +100,7 @@ int flash_page_program(uint32 *data, int page_num) } /* 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); @@ -136,7 +136,7 @@ int flash_erase_plane(int efc_ofs) /* wait until FLASH is ready, just for sure */ 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); |