projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore NULL bytes at flash end when reading
[fw/stlink]
/
src
/
stlink-common.c
diff --git
a/src/stlink-common.c
b/src/stlink-common.c
index 79650ede5fdf32a8e5e0660d97be2a03aac186f5..fac7b685c225cdcab25739bdadfc44ee2254001d 100644
(file)
--- a/
src/stlink-common.c
+++ b/
src/stlink-common.c
@@
-368,9
+368,7
@@
uint32_t stlink_core_id(stlink_t *sl) {
}
uint32_t stlink_chip_id(stlink_t *sl) {
}
uint32_t stlink_chip_id(stlink_t *sl) {
- stlink_read_mem32(sl, 0xE0042000, 4);
- uint32_t chip_id = sl->q_buf[0] | (sl->q_buf[1] << 8) | (sl->q_buf[2] << 16) |
- (sl->q_buf[3] << 24);
+ uint32_t chip_id = stlink_read_debug32(sl, 0xE0042000);
return chip_id;
}
return chip_id;
}
@@
-380,8
+378,7
@@
uint32_t stlink_chip_id(stlink_t *sl) {
* @param cpuid pointer to the result object
*/
void stlink_cpu_id(stlink_t *sl, cortex_m3_cpuid_t *cpuid) {
* @param cpuid pointer to the result object
*/
void stlink_cpu_id(stlink_t *sl, cortex_m3_cpuid_t *cpuid) {
- stlink_read_mem32(sl, CM3_REG_CPUID, 4);
- uint32_t raw = read_uint32(sl->q_buf, 0);
+ uint32_t raw = stlink_read_debug32(sl, CM3_REG_CPUID);
cpuid->implementer_id = (raw >> 24) & 0x7f;
cpuid->variant = (raw >> 20) & 0xf;
cpuid->part = (raw >> 4) & 0xfff;
cpuid->implementer_id = (raw >> 24) & 0x7f;
cpuid->variant = (raw >> 20) & 0xf;
cpuid->part = (raw >> 4) & 0xfff;
@@
-428,8
+425,7
@@
int stlink_load_device_params(stlink_t *sl) {
} else if ((chip_id & 0xFFF) == STM32_CHIPID_F4) {
sl->flash_size = 0x100000; //todo: RM0090 error; size register same address as unique ID
} else {
} else if ((chip_id & 0xFFF) == STM32_CHIPID_F4) {
sl->flash_size = 0x100000; //todo: RM0090 error; size register same address as unique ID
} else {
- stlink_read_mem32(sl, params->flash_size_reg, 4);
- uint32_t flash_size = sl->q_buf[0] | (sl->q_buf[1] << 8);
+ uint32_t flash_size = stlink_read_debug32(sl, params->flash_size_reg) & 0xffff;
sl->flash_size = flash_size * 1024;
}
sl->flash_pgsz = params->flash_pagesize;
sl->flash_size = flash_size * 1024;
}
sl->flash_pgsz = params->flash_pagesize;
@@
-807,6
+803,7
@@
int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
int error = -1;
size_t off;
int error = -1;
size_t off;
+ int num_zero = 0;
const int fd = open(path, O_RDWR | O_TRUNC | O_CREAT, 00700);
if (fd == -1) {
const int fd = open(path, O_RDWR | O_TRUNC | O_CREAT, 00700);
if (fd == -1) {
@@
-818,6
+815,7
@@
int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
for (off = 0; off < size; off += 1024) {
size_t read_size = 1024;
size_t rounded_size;
for (off = 0; off < size; off += 1024) {
size_t read_size = 1024;
size_t rounded_size;
+ size_t index;
if ((off + read_size) > size)
read_size = size - off;
if ((off + read_size) > size)
read_size = size - off;
@@
-828,12
+826,21
@@
int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
stlink_read_mem32(sl, addr + off, rounded_size);
stlink_read_mem32(sl, addr + off, rounded_size);
+ for(index = 0; index < read_size; index ++) {
+ if (sl->q_buf[index] == 0)
+ num_zero ++;
+ else
+ num_zero = 0;
+ }
if (write(fd, sl->q_buf, read_size) != (ssize_t) read_size) {
fprintf(stderr, "write() != read_size\n");
goto on_error;
}
}
if (write(fd, sl->q_buf, read_size) != (ssize_t) read_size) {
fprintf(stderr, "write() != read_size\n");
goto on_error;
}
}
+ /* Ignore NULL Bytes at end of file */
+ ftruncate(fd, size - num_zero);
+
/* success */
error = 0;
/* success */
error = 0;
@@
-970,7
+977,7
@@
int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
#endif /* fix_to_be_confirmed */
/* write 0 to the first word of the page to be erased */
#endif /* fix_to_be_confirmed */
/* write 0 to the first word of the page to be erased */
- stlink_write_
mem
32(sl, flashaddr, 0);
+ stlink_write_
debug
32(sl, flashaddr, 0);
/* MP: It is better to wait for clearing the busy bit after issuing
page erase command, even though PM0062 recommends to wait before it.
/* MP: It is better to wait for clearing the busy bit after issuing
page erase command, even though PM0062 recommends to wait before it.
@@
-1240,6
+1247,7
@@
int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
#define PROGRESS_CHUNK_SIZE 0x1000
/* write a word in program memory */
for (off = 0; off < len; off += sizeof(uint32_t)) {
#define PROGRESS_CHUNK_SIZE 0x1000
/* write a word in program memory */
for (off = 0; off < len; off += sizeof(uint32_t)) {
+ uint32_t data;
if (sl->verbose >= 1) {
if ((off & (PROGRESS_CHUNK_SIZE - 1)) == 0) {
/* show progress. writing procedure is slow
if (sl->verbose >= 1) {
if ((off & (PROGRESS_CHUNK_SIZE - 1)) == 0) {
/* show progress. writing procedure is slow
@@
-1250,8
+1258,8
@@
int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
}
}
}
}
-
memcpy(sl->q_buf, (const void*)(base + off), sizeof(uint32_t
));
- stlink_write_
mem32(sl, addr + off, sizeof(uint32_t)
);
+
write_uint32((unsigned char*) &data, *(uint32_t*) (base + off
));
+ stlink_write_
debug32(sl, addr + off, data
);
/* wait for sr.busy to be cleared */
wait_flash_busy(sl);
/* wait for sr.busy to be cleared */
wait_flash_busy(sl);
@@
-1304,6
+1312,7
@@
int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
/* write a word in program memory */
for (off = 0; off < len; off += sizeof(uint32_t)) {
/* write a word in program memory */
for (off = 0; off < len; off += sizeof(uint32_t)) {
+ uint32_t data;
if (sl->verbose >= 1) {
if ((off & (sl->flash_pgsz - 1)) == 0) {
/* show progress. writing procedure is slow
if (sl->verbose >= 1) {
if ((off & (sl->flash_pgsz - 1)) == 0) {
/* show progress. writing procedure is slow
@@
-1314,18
+1323,18
@@
int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
}
}
}
}
-
memcpy(sl->q_buf, (const void*)(base + off), sizeof(uint32_t
));
- stlink_write_
mem32(sl, addr + off, sizeof(uint32_t)
);
+
write_uint32((unsigned char*) &data, *(uint32_t*) (base + off
));
+ stlink_write_
debug32(sl, addr + off, data
);
/* wait for sr.busy to be cleared */
/* wait for sr.busy to be cleared */
- while (
stlink_read_debug32(sl, STM32L_FLASH_SR
& (1 << 0)) != 0) {
+ while (
(stlink_read_debug32(sl, STM32L_FLASH_SR)
& (1 << 0)) != 0) {
}
#if 0 /* todo: check redo write operation */
/* check written bytes. todo: should be on a per page basis. */
}
#if 0 /* todo: check redo write operation */
/* check written bytes. todo: should be on a per page basis. */
-
stlink_read_mem32(sl, addr + off, sizeof(uint32_t)
);
- if (
memcmp(sl->q_buf, base + off, sizeof(uint32_t)
)) {
+
data = stlink_read_debug32(sl, addr + off
);
+ if (
data == *(uint32_t*)(base + off
)) {
/* re erase the page and redo the write operation */
uint32_t page;
uint32_t val;
/* re erase the page and redo the write operation */
uint32_t page;
uint32_t val;