Skip to content

LPC176X: Fix flash program size #6413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 29, 2018
Merged

LPC176X: Fix flash program size #6413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76d511
LPC176X: Fix flash program size
toyowata Mar 21, 2018
3acdc81
Add alignment check in the flash_program_page
toyowata Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions targets/TARGET_NXP/TARGET_LPC176X/device/flash_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,42 +112,64 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
const uint8_t *data, uint32_t size)
{
unsigned long n;
// always malloc outside critical section
uint8_t *alignedData = malloc(size);
const uint32_t copySize = 1024; // should be 256|512|1024|4096
uint8_t *alignedData, *source;

alignedData = 0;
source = (uint8_t *)data;

// check word boundary
if (((uint32_t)data % 4) != 0) {
// always malloc outside critical section
alignedData = malloc(copySize);
if (alignedData == 0) {
return (1);
}
}

n = GetSecNum(address); // Get Sector Number

core_util_critical_section_enter();
IAP.cmd = 50;// Prepare Sector for Write
IAP.par[0] = n;// Start Sector
IAP.par[1] = n;// End Sector
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
if (IAP.stat) {
return (1); // Command Failed
}

IAP.cmd = 51; // Copy RAM to Flash
IAP.par[0] = address;// Destination Flash Address

if ((unsigned long)data%4==0) { // Word boundary
IAP.par[1] = (unsigned long)data;// Source RAM Address
} else {
memcpy(alignedData,data,size);
IAP.par[1] = (unsigned long)alignedData; // Source RAM Address
while (size) {
if (((uint32_t)data % 4) != 0) {
memcpy(alignedData, source, copySize);
source = alignedData;
}

/*
Prepare_Sector_for_Write command must be exected before
Copy_RAM_to_Flash command.
*/
IAP.cmd = 50; // Prepare Sector for Write
IAP.par[0] = n; // Start Sector
IAP.par[1] = n; // End Sector
IAP_Call (&IAP.cmd, &IAP.stat); // Call IAP Command
if (IAP.stat) {
return (1); // Command Failed
}

IAP.cmd = 51; // Copy RAM to Flash
IAP.par[0] = address; // Destination Flash Address
IAP.par[1] = (unsigned long)source; // Source RAM Address
IAP.par[2] = copySize; // number of bytes to be written
IAP.par[3] = CCLK; // CCLK in kHz
IAP_Call (&IAP.cmd, &IAP.stat); // Call IAP Command
if (IAP.stat) {
return (1); // Command Failed
}

source += copySize;
size -= copySize;
address += copySize;
}

IAP.par[2] = 1024; // Fixed Page Size
IAP.par[3] = CCLK;// CCLK in kHz
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
core_util_critical_section_exit();

if(alignedData !=0) { // We allocated our own memory
if(alignedData != 0) { // We allocated our own memory
free(alignedData);
}

if (IAP.stat) {
return (1); // Command Failed
}
return (0); // Finished without Errors
}

Expand Down