ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tidy if else code aligment.

pull/5184/head
Chris 2017-09-04 15:06:26 +01:00 committed by adbridge
parent d3b1f69c2d
commit 0711bb14e6
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
targets/TARGET_NXP/TARGET_LPC176X/device/flash_api.c
View File

@ -122,12 +122,9 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
IAP.cmd = 51;// Copy RAM to Flash IAP.cmd = 51;// Copy RAM to Flash
IAP.par[0] = address;// Destination Flash Address IAP.par[0] = address;// Destination Flash Address
if ((unsigned long)data%4==0)// Word boundary if ((unsigned long)data%4==0){// Word boundary
{
IAP.par[1] = (unsigned long)data;// Source RAM Address IAP.par[1] = (unsigned long)data;// Source RAM Address
} } else {
else
{
alignedData = malloc(size); alignedData = malloc(size);
memcpy(alignedData,data,size); memcpy(alignedData,data,size);
IAP.par[1] = (unsigned long)alignedData;// Source RAM Address IAP.par[1] = (unsigned long)alignedData;// Source RAM Address
@ -137,8 +134,7 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
IAP.par[3] = CCLK;// CCLK in kHz IAP.par[3] = CCLK;// CCLK in kHz
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
if(alignedData !=0)//We allocated our own memory if(alignedData !=0){//We allocated our own memory
{
free(alignedData); free(alignedData);
} }
@ -149,16 +145,12 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address) uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
{ {
if(address < flash_get_start_address(obj) || address >= flash_get_start_address(obj) +flash_get_size(obj)) if(address < flash_get_start_address(obj) || address >= flash_get_start_address(obj) +flash_get_size(obj)){
{
return MBED_FLASH_INVALID_SIZE; return MBED_FLASH_INVALID_SIZE;
} }
if(GetSecNum(address)>=0x10) if(GetSecNum(address)>=0x10){
{
return 0x8000; return 0x8000;
} } else {
else
{
return 0x1000; return 0x1000;
} }
} }