Skip to content

Commit

Permalink
General maintenance & review
Browse files Browse the repository at this point in the history 
- Aligned whitespace formatting
- Case separation for version.jtag_api in usb.c
  • Loading branch information
@Nightwalker-87
Nightwalker-87 committed Jan 18, 2025
1 parent f2ad364 commit eecfe05
Show file tree
Hide file tree
Showing 30 changed files with 1,399 additions and 1,379 deletions.
108 changes: 54 additions & 54 deletions src/st-flash/flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static stlink_t *connected_stlink = NULL;
static void cleanup(int32_t signum) {
(void)signum;

if (connected_stlink) { // switch back to mass storage mode before closing
if(connected_stlink) { // switch back to mass storage mode before closing
stlink_run(connected_stlink, RUN_NORMAL);
stlink_exit_debug_mode(connected_stlink);
stlink_close(connected_stlink);
Expand Down Expand Up @@ -90,11 +90,11 @@ int32_t main(int32_t ac, char** av) {
o.connect = CONNECT_NORMAL;

getopt_ret = flash_get_opts(&o, ac - 1, av + 1);
if (getopt_ret == -1) {
if(getopt_ret == -1) {
printf("invalid command line\n");
usage();
return (-1);
} else if (getopt_ret == 1) {
} else if(getopt_ret == 1) {
usage();
return 0;
}
Expand All @@ -104,15 +104,15 @@ int32_t main(int32_t ac, char** av) {

sl = stlink_open_usb(o.log_level, o.connect, (char *)o.serial, o.freq);

if (sl == NULL) { return (-1); }
if(sl == NULL) { return (-1); }

if (sl->flash_type == STM32_FLASH_TYPE_UNKNOWN) {
if(sl->flash_type == STM32_FLASH_TYPE_UNKNOWN) {
printf("Failed to connect to target\n");
fprintf(stderr, "Failed to parse flash type or unrecognized flash type\n");
goto on_error;
}

if ( o.flash_size != 0u && o.flash_size != sl->flash_size ) {
if( o.flash_size != 0u && o.flash_size != sl->flash_size ) {
sl->flash_size = o.flash_size;
printf("Forcing flash size: --flash=0x%08X\n", sl->flash_size);
}
Expand All @@ -127,98 +127,98 @@ int32_t main(int32_t ac, char** av) {
signal(SIGSEGV, &cleanup);

// core must be halted to use RAM based flashloaders
if (stlink_force_debug(sl)) {
if(stlink_force_debug(sl)) {
printf("Failed to halt the core\n");
goto on_error;
}

if (stlink_status(sl)) {
if(stlink_status(sl)) {
printf("Failed to get Core's status\n");
goto on_error;
}

if (o.cmd == FLASH_CMD_WRITE) {
if(o.cmd == FLASH_CMD_WRITE) {
uint32_t size = 0;

if (erase_type == MASS_ERASE) {
if(erase_type == MASS_ERASE) {
err = stlink_erase_flash_mass(sl);
if (err == -1) {
if(err == -1) {
printf("stlink_erase_flash_mass() == -1\n");
goto on_error;
}
}

// write
if (o.format == FLASH_FORMAT_IHEX) {
if(o.format == FLASH_FORMAT_IHEX) {
err = stlink_parse_ihex(o.filename, stlink_get_erased_pattern(sl), &mem, &size, &o.addr);

if (err == -1) {
if(err == -1) {
printf("Cannot parse %s as Intel-HEX file\n", o.filename);
goto on_error;
}
}
if ((o.addr >= sl->flash_base) && (o.addr < sl->flash_base + sl->flash_size)) {
if (o.format == FLASH_FORMAT_IHEX) {
if((o.addr >= sl->flash_base) && (o.addr < sl->flash_base + sl->flash_size)) {
if(o.format == FLASH_FORMAT_IHEX) {
err = stlink_mwrite_flash(sl, mem, size, o.addr, erase_type);
} else {
err = stlink_fwrite_flash(sl, o.filename, o.addr, erase_type);
}

if (err == -1) {
if(err == -1) {
printf("stlink_fwrite_flash() == -1\n");
goto on_error;
}
} else if ((o.addr >= sl->sram_base) && (o.addr < sl->sram_base + sl->sram_size)) {
if (o.format == FLASH_FORMAT_IHEX) {
} else if((o.addr >= sl->sram_base) && (o.addr < sl->sram_base + sl->sram_size)) {
if(o.format == FLASH_FORMAT_IHEX) {
err = stlink_mwrite_sram(sl, mem, size, o.addr);
} else {
err = stlink_fwrite_sram(sl, o.filename, o.addr);
}

if (err == -1) {
if(err == -1) {
printf("stlink_fwrite_sram() == -1\n");
goto on_error;
}
} else if ((o.addr >= sl->option_base) && (o.addr < sl->option_base + sl->option_size)) {
} else if((o.addr >= sl->option_base) && (o.addr < sl->option_base + sl->option_size)) {
err = stlink_fwrite_option_bytes(sl, o.filename, o.addr);

if (err == -1) {
if(err == -1) {
printf("stlink_fwrite_option_bytes() == -1\n");
goto on_error;
}
} else if (o.area == FLASH_OPTION_BYTES) {
if (o.val == 0) {
} else if(o.area == FLASH_OPTION_BYTES) {
if(o.val == 0) {
printf("attempting to set option byte to 0, abort.\n");
goto on_error;
}

err = stlink_write_option_bytes32(sl, o.val);

if (err == -1) {
if(err == -1) {
printf("stlink_write_option_bytes32() == -1\n");
goto on_error;
}
} else if (o.area == FLASH_OPTCR) {
} else if(o.area == FLASH_OPTCR) {
DLOG("@@@@ Write %d (%0#10x) to option control register\n", o.val, o.val);

err = stlink_write_option_control_register32(sl, o.val);
} else if (o.area == FLASH_OPTCR1) {
} else if(o.area == FLASH_OPTCR1) {
DLOG("@@@@ Write %d (%0#10x) to option control register 1\n", o.val, o.val);

err = stlink_write_option_control_register1_32(sl, o.val);
} else if (o.area == FLASH_OPTION_BYTES_BOOT_ADD) {
} else if(o.area == FLASH_OPTION_BYTES_BOOT_ADD) {
DLOG("@@@@ Write %d (%0#10x) to option bytes boot address\n", o.val, o.val);

err = stlink_write_option_bytes_boot_add32(sl, o.val);
} else if (o.area == FLASH_OTP) {
} else if(o.area == FLASH_OTP) {
if(sl->otp_base == 0) {
err = -1;
printf("OTP Write NOT implemented\n");
goto on_error;
}
err = stlink_fwrite_flash(sl, o.filename, o.addr, NO_ERASE);

if (err == -1) {
if(err == -1) {
printf("stlink_fwrite_flash() == -1\n");
goto on_error;
}
Expand All @@ -228,35 +228,35 @@ int32_t main(int32_t ac, char** av) {
goto on_error;
}

} else if (o.cmd == FLASH_CMD_ERASE) {
} else if(o.cmd == FLASH_CMD_ERASE) {

// erase
if ((erase_type == MASS_ERASE) || (o.size == 0 || o.addr == 0)) {
if((erase_type == MASS_ERASE) || (o.size == 0 || o.addr == 0)) {
err = stlink_erase_flash_mass(sl);
if (err == -1) {
if(err == -1) {
printf("stlink_erase_flash_mass() == -1\n");
goto on_error;
}
printf("Mass erase completed successfully.\n");
} else {
err = stlink_erase_flash_section(sl, o.addr, o.size, false);
if (err == -1) {
if(err == -1) {
printf("stlink_erase_flash_section() == -1\n");
goto on_error;
}
printf("Section erase completed successfully.\n");
}

// reset after erase
if (stlink_reset(sl, RESET_AUTO)) {
if(stlink_reset(sl, RESET_AUTO)) {
printf("Failed to reset device\n");
goto on_error;
}

} else if (o.cmd == CMD_RESET) {
} else if(o.cmd == CMD_RESET) {

// reset
if (stlink_reset(sl, RESET_AUTO)) {
if(stlink_reset(sl, RESET_AUTO)) {
printf("Failed to reset device\n");
goto on_error;
} else {
Expand All @@ -266,20 +266,20 @@ int32_t main(int32_t ac, char** av) {
} else {

// read
if ((o.area == FLASH_MAIN_MEMORY) || (o.area == FLASH_SYSTEM_MEMORY)) {
if ((o.size == 0) && (o.addr >= sl->flash_base) && (o.addr < sl->flash_base + sl->flash_size)) {
if((o.area == FLASH_MAIN_MEMORY) || (o.area == FLASH_SYSTEM_MEMORY)) {
if((o.size == 0) && (o.addr >= sl->flash_base) && (o.addr < sl->flash_base + sl->flash_size)) {
o.size = sl->flash_size;
}
else if ((o.size == 0) && (o.addr >= sl->sram_base) && (o.addr < sl->sram_base + sl->sram_size)) {
else if((o.size == 0) && (o.addr >= sl->sram_base) && (o.addr < sl->sram_base + sl->sram_size)) {
o.size = sl->sram_size;
}
err = stlink_fread(sl, o.filename, o.format == FLASH_FORMAT_IHEX, o.addr, o.size);

if (err == -1) {
if(err == -1) {
printf("could not read main memory (%d)\n", err);
goto on_error;
}
} else if (o.area == FLASH_OPTION_BYTES) {
} else if(o.area == FLASH_OPTION_BYTES) {
uint32_t remaining_option_length = sl->option_size / 4;
DLOG("@@@@ Read %u (%#x) option bytes from %#10x\n",
remaining_option_length,
Expand All @@ -288,66 +288,66 @@ int32_t main(int32_t ac, char** av) {

uint32_t option_byte = 0;
err = stlink_read_option_bytes32(sl, &option_byte);
if (err == -1) {
if(err == -1) {
printf("could not read option bytes (%d)\n", err);
goto on_error;
} else if (NULL != o.filename) {
} else if(NULL != o.filename) {
int32_t fd = open(o.filename, O_RDWR | O_TRUNC | O_CREAT | O_BINARY, 00700);
if (fd == -1) {
if(fd == -1) {
fprintf(stderr, "open(%s) == -1\n", o.filename);
goto on_error;
}
err = (uint32_t) write(fd, &option_byte, 4);
if (err == -1) {
if(err == -1) {
printf("could not write buffer to file (%d)\n", err);
goto on_error;
}
close(fd);
} else {
printf("%08x\n", option_byte);
}
} else if (o.area == FLASH_OPTION_BYTES_BOOT_ADD) {
} else if(o.area == FLASH_OPTION_BYTES_BOOT_ADD) {
uint32_t option_byte = 0;
err = stlink_read_option_bytes_boot_add32(sl, &option_byte);
if (err == -1) {
if(err == -1) {
printf("could not read option bytes boot address (%d)\n", err);
goto on_error;
} else {
printf("%08x\n",option_byte);
}
} else if (o.area == FLASH_OPTCR) {
} else if(o.area == FLASH_OPTCR) {
uint32_t option_byte = 0;
err = stlink_read_option_control_register32(sl, &option_byte);
if (err == -1) {
if(err == -1) {
printf("could not read option control register (%d)\n", err);
goto on_error;
} else {
printf("%08x\n",option_byte);
}
} else if (o.area == FLASH_OPTCR1) {
} else if(o.area == FLASH_OPTCR1) {
uint32_t option_byte = 0;
err = stlink_read_option_control_register1_32(sl, &option_byte);
if (err == -1) {
if(err == -1) {
printf("could not read option control register (%d)\n", err);
goto on_error;
} else {
printf("%08x\n",option_byte);
}
} else if (o.area == FLASH_OTP) {
} else if(o.area == FLASH_OTP) {
if(sl->otp_base == 0) {
err = -1;
printf("OTP Read NOT implemented\n");
goto on_error;
}
err = stlink_fread(sl, o.filename, 0, sl->otp_base, sl->otp_size);
if (err == -1) {
if(err == -1) {
printf("could not read OTP area (%d)\n", err);
goto on_error;
}
}
}

if (o.reset) stlink_reset(sl, RESET_AUTO);
if(o.reset) stlink_reset(sl, RESET_AUTO);

stlink_run(sl, RUN_NORMAL);

Expand Down
Loading

0 comments on commit eecfe05

Please sign in to comment.