Skip to content

Commit

Permalink
Merge pull request #1116 from slyshykO/del-abort
Browse files Browse the repository at this point in the history
Removed abort() from stlink-lib
  • Loading branch information
Nightwalker-87 committed Mar 27, 2021
2 parents 0b72210 + 5b8ee39 commit e39d5cc
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions src/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ static inline uint32_t read_flash_sr(stlink_t *sl, unsigned bank) {
} else if (sl->flash_type == STLINK_FLASH_TYPE_H7) {
sr_reg = (bank==BANK_1)?FLASH_H7_SR1:FLASH_H7_SR2;
} else {
ELOG("unsupported flash method, abort");
ELOG("unsupported flash method, abort\n");
return(-1);
}

Expand Down Expand Up @@ -1010,7 +1010,7 @@ static inline unsigned int is_flash_busy(stlink_t *sl) {
} else if (sl->flash_type == STLINK_FLASH_TYPE_H7) {
sr_busy_shift = FLASH_H7_SR_QW;
} else {
ELOG("unsupported flash method, abort");
ELOG("unsupported flash method, abort\n");
return(-1);
}

Expand Down Expand Up @@ -1617,9 +1617,8 @@ int stlink_write_mem32(stlink_t *sl, uint32_t addr, uint16_t len) {
DLOG("*** stlink_write_mem32 %u bytes to %#x\n", len, addr);

if (len % 4 != 0) {
fprintf(stderr, "Error: Data length doesn't have a 32 bit alignment: +%d byte.\n",
len % 4);
abort();
ELOG("Data length doesn't have a 32 bit alignment: +%d byte.\n", len % 4);
return(-1);
}

return(sl->backend->write_mem32(sl, addr, len));
Expand All @@ -1629,9 +1628,8 @@ int stlink_read_mem32(stlink_t *sl, uint32_t addr, uint16_t len) {
DLOG("*** stlink_read_mem32 ***\n");

if (len % 4 != 0) { // !!! never ever: fw gives just wrong values
fprintf(stderr, "Error: Data length doesn't have a 32 bit alignment: +%d byte.\n",
len % 4);
abort();
ELOG("Data length doesn't have a 32 bit alignment: +%d byte.\n", len % 4);
return(-1);
}

return(sl->backend->read_mem32(sl, addr, len));
Expand All @@ -1641,9 +1639,8 @@ int stlink_write_mem8(stlink_t *sl, uint32_t addr, uint16_t len) {
DLOG("*** stlink_write_mem8 ***\n");

if (len > 0x40) { // !!! never ever: Writing more then 0x40 bytes gives unexpected behaviour
fprintf(stderr, "Error: Data length > 64: +%d byte.\n",
len);
abort();
ELOG("Data length > 64: +%d byte.\n", len);
return(-1);
}

return(sl->backend->write_mem8(sl, addr, len));
Expand Down

0 comments on commit e39d5cc

Please sign in to comment.