@@ -89,7 +89,7 @@ static program_target_t * get_flash_algo(uint32_t addr)
89
89
}
90
90
}
91
91
}
92
-
92
+
93
93
//could not find a flash algo for the region; use default
94
94
if (default_region ) {
95
95
flash_start = default_region -> start ;
@@ -139,9 +139,9 @@ static error_t target_flash_set(uint32_t addr)
139
139
if (0 == swd_write_memory (new_flash_algo -> algo_start , (uint8_t * )new_flash_algo -> algo_blob , new_flash_algo -> algo_size )) {
140
140
return ERROR_ALGO_DL ;
141
141
}
142
-
142
+
143
143
current_flash_algo = new_flash_algo ;
144
-
144
+
145
145
}
146
146
return ERROR_SUCCESS ;
147
147
}
@@ -150,13 +150,13 @@ static error_t target_flash_init()
150
150
{
151
151
if (g_board_info .target_cfg ) {
152
152
last_flash_func = FLASH_FUNC_NOP ;
153
-
153
+
154
154
current_flash_algo = NULL ;
155
-
155
+
156
156
if (0 == target_set_state (RESET_PROGRAM )) {
157
157
return ERROR_RESET ;
158
158
}
159
-
159
+
160
160
//get default region
161
161
region_info_t * flash_region = g_board_info .target_cfg -> flash_regions ;
162
162
for (; flash_region -> start != 0 || flash_region -> end != 0 ; ++ flash_region ) {
@@ -171,7 +171,7 @@ static error_t target_flash_init()
171
171
} else {
172
172
return ERROR_FAILURE ;
173
173
}
174
-
174
+
175
175
}
176
176
177
177
static error_t target_flash_uninit (void )
@@ -191,7 +191,7 @@ static error_t target_flash_uninit(void)
191
191
// Check to see if anything needs to be done after programming.
192
192
// This is usually a no-op for most targets.
193
193
target_set_state (POST_FLASH_RESET );
194
-
194
+
195
195
state = STATE_CLOSED ;
196
196
swd_off ();
197
197
return ERROR_SUCCESS ;
@@ -205,11 +205,11 @@ static error_t target_flash_program_page(uint32_t addr, const uint8_t *buf, uint
205
205
if (g_board_info .target_cfg ) {
206
206
error_t status = ERROR_SUCCESS ;
207
207
program_target_t * flash = current_flash_algo ;
208
-
208
+
209
209
if (!flash ) {
210
210
return ERROR_INTERNAL ;
211
211
}
212
-
212
+
213
213
// check if security bits were set
214
214
if (g_target_family && g_target_family -> security_bits_set ){
215
215
if (1 == g_target_family -> security_bits_set (addr , (uint8_t * )buf , size )) {
@@ -222,7 +222,7 @@ static error_t target_flash_program_page(uint32_t addr, const uint8_t *buf, uint
222
222
if (status != ERROR_SUCCESS ) {
223
223
return status ;
224
224
}
225
-
225
+
226
226
while (size > 0 ) {
227
227
uint32_t write_size = MIN (size , flash -> program_buffer_size );
228
228
@@ -277,11 +277,11 @@ static error_t target_flash_program_page(uint32_t addr, const uint8_t *buf, uint
277
277
addr += write_size ;
278
278
buf += write_size ;
279
279
size -= write_size ;
280
-
280
+
281
281
}
282
282
283
283
return ERROR_SUCCESS ;
284
-
284
+
285
285
} else {
286
286
return ERROR_FAILURE ;
287
287
}
@@ -296,7 +296,7 @@ static error_t target_flash_erase_sector(uint32_t addr)
296
296
if (!flash ) {
297
297
return ERROR_INTERNAL ;
298
298
}
299
-
299
+
300
300
// Check to make sure the address is on a sector boundary
301
301
if ((addr % target_flash_erase_sector_size (addr )) != 0 ) {
302
302
return ERROR_ERASE_SECTOR ;
@@ -307,7 +307,7 @@ static error_t target_flash_erase_sector(uint32_t addr)
307
307
if (status != ERROR_SUCCESS ) {
308
308
return status ;
309
309
}
310
-
310
+
311
311
if (0 == swd_flash_syscall_exec (& flash -> sys_call_s , flash -> erase_sector , addr , 0 , 0 , 0 )) {
312
312
return ERROR_ERASE_SECTOR ;
313
313
}
@@ -325,7 +325,7 @@ static error_t target_flash_erase_chip(void)
325
325
region_info_t * flash_region = g_board_info .target_cfg -> flash_regions ;
326
326
327
327
for (; flash_region -> start != 0 || flash_region -> end != 0 ; ++ flash_region ) {
328
- status = target_flash_set (flash_region -> start );
328
+ status = target_flash_set (flash_region -> start );
329
329
if (status != ERROR_SUCCESS ) {
330
330
return status ;
331
331
}
@@ -365,7 +365,7 @@ static uint32_t target_flash_program_page_min_size(uint32_t addr)
365
365
static uint32_t target_flash_erase_sector_size (uint32_t addr )
366
366
{
367
367
if (g_board_info .target_cfg ){
368
- if (g_board_info .target_cfg -> sector_info_length > 0 ) {
368
+ if (g_board_info .target_cfg -> sector_info_length > 0 ) {
369
369
int sector_index = g_board_info .target_cfg -> sector_info_length - 1 ;
370
370
for (; sector_index >= 0 ; sector_index -- ) {
371
371
if (addr >= g_board_info .target_cfg -> sectors_info [sector_index ].start ) {
0 commit comments