Skip to content

Commit 1e454c4

Browse files
chrissnowadbridge
authored andcommitted
Code tidy.
1 parent 0711bb1 commit 1e454c4

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

targets/TARGET_NXP/TARGET_LPC176X/device/flash_api.c

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ typedef void (*IAP_Entry) (unsigned long *cmd, unsigned long *stat);
3939
#define IAP_Call ((IAP_Entry) 0x1FFF1FF1)
4040

4141
typedef struct flash_s flash_t;
42-
unsigned long CCLK;// CCLK in kHz
42+
unsigned long CCLK; // CCLK in kHz
4343

44-
struct sIAP {// IAP Structure
44+
struct sIAP { // IAP Structure
4545
unsigned long cmd;// Command
4646
unsigned long par[4];// Parameters
4747
unsigned long stat;// Status
@@ -57,16 +57,16 @@ struct sIAP {// IAP Structure
5757
unsigned long GetSecNum (unsigned long address) {
5858
unsigned long n;
5959

60-
n = address >> 12;// 4kB Sector
60+
n = address >> 12; // 4kB Sector
6161
if (n >= 0x10) {
62-
n = 0x0E + (n >> 3);// 32kB Sector
62+
n = 0x0E + (n >> 3); // 32kB Sector
6363
}
6464

65-
return (n);// Sector Number
65+
return (n); // Sector Number
6666
}
6767
int32_t flash_init(flash_t *obj)
6868
{
69-
CCLK = SystemCoreClock / 1000;// CCLK value is in kHz, clk in Hz
69+
CCLK = SystemCoreClock / 1000; // CCLK value is in kHz, clk in Hz
7070

7171
MEMMAP = 0x01;// User Flash Mode
7272

@@ -88,16 +88,20 @@ int32_t flash_erase_sector(flash_t *obj, uint32_t address)
8888
IAP.par[0] = n;// Start Sector
8989
IAP.par[1] = n;// End Sector
9090
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
91-
if (IAP.stat) return (1);// Command Failed
91+
if (IAP.stat) {
92+
return (1); // Command Failed
93+
}
9294

93-
IAP.cmd = 52;// Erase Sector
95+
IAP.cmd = 52; // Erase Sector
9496
IAP.par[0] = n;// Start Sector
9597
IAP.par[1] = n;// End Sector
9698
IAP.par[2] = CCLK;// CCLK in kHz
9799
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
98-
if (IAP.stat) return (1);// Command Failed
100+
if (IAP.stat) {
101+
return (1); // Command Failed
102+
}
99103

100-
return (0);// Finished without Errors
104+
return (0); // Finished without Errors
101105

102106
}
103107

@@ -111,44 +115,47 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
111115
unsigned long n;
112116
uint8_t *alignedData = 0;
113117

114-
n = GetSecNum(address);// Get Sector Number
118+
n = GetSecNum(address); // Get Sector Number
115119

116120
IAP.cmd = 50;// Prepare Sector for Write
117121
IAP.par[0] = n;// Start Sector
118122
IAP.par[1] = n;// End Sector
119123
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
120-
if (IAP.stat) return (1);// Command Failed
124+
if (IAP.stat) {
125+
return (1); // Command Failed
126+
}
121127

122-
IAP.cmd = 51;// Copy RAM to Flash
128+
IAP.cmd = 51; // Copy RAM to Flash
123129
IAP.par[0] = address;// Destination Flash Address
124-
125-
if ((unsigned long)data%4==0){// Word boundary
130+
131+
if ((unsigned long)data%4==0) { // Word boundary
126132
IAP.par[1] = (unsigned long)data;// Source RAM Address
127133
} else {
128134
alignedData = malloc(size);
129135
memcpy(alignedData,data,size);
130-
IAP.par[1] = (unsigned long)alignedData;// Source RAM Address
136+
IAP.par[1] = (unsigned long)alignedData; // Source RAM Address
131137
}
132138

133-
IAP.par[2] = 1024;// Fixed Page Size
139+
IAP.par[2] = 1024; // Fixed Page Size
134140
IAP.par[3] = CCLK;// CCLK in kHz
135141
IAP_Call (&IAP.cmd, &IAP.stat);// Call IAP Command
136-
137-
if(alignedData !=0){//We allocated our own memory
142+
143+
if(alignedData !=0) { // We allocated our own memory
138144
free(alignedData);
139145
}
140-
141-
if (IAP.stat) return (1);// Command Failed
142146

143-
return (0);// Finished without Errors
147+
if (IAP.stat) {
148+
return (1); // Command Failed
149+
}
150+
return (0); // Finished without Errors
144151
}
145152

146153
uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
147154
{
148-
if(address < flash_get_start_address(obj) || address >= flash_get_start_address(obj) +flash_get_size(obj)){
155+
if (address < flash_get_start_address(obj) || address >= flash_get_start_address(obj) +flash_get_size(obj)) {
149156
return MBED_FLASH_INVALID_SIZE;
150157
}
151-
if(GetSecNum(address)>=0x10){
158+
if(GetSecNum(address)>=0x10) {
152159
return 0x8000;
153160
} else {
154161
return 0x1000;

0 commit comments

Comments
 (0)