projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix segv if only --reset option given
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 110c2964d894fc85136e7ea65adf6c8842ec120a..d550eeeeda9c158c34d6a06a0341d20aaf07ef14 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-17,13
+17,14
@@
struct opts
const char* filename;
stm32_addr_t addr;
size_t size;
const char* filename;
stm32_addr_t addr;
size_t size;
+ int reset;
};
static void usage(void)
{
};
static void usage(void)
{
- puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
+ puts("stlinkv1 command line: ./flash
[--reset]
{read|write} /dev/sgX path addr <size>");
puts("stlinkv1 command line: ./flash /dev/sgX erase");
puts("stlinkv1 command line: ./flash /dev/sgX erase");
- puts("stlinkv2 command line: ./flash {read|write} path addr <size>");
+ puts("stlinkv2 command line: ./flash
[--reset]
{read|write} path addr <size>");
puts("stlinkv2 command line: ./flash erase");
puts(" use hex format for addr and <size>");
}
puts("stlinkv2 command line: ./flash erase");
puts(" use hex format for addr and <size>");
}
@@
-37,6
+38,19
@@
static int get_opts(struct opts* o, int ac, char** av)
if (ac < 1) return -1;
if (ac < 1) return -1;
+ if (strcmp(av[0], "--reset") == 0)
+ {
+ o->reset = 1;
+ ac--;
+ av++;
+ }
+ else
+ {
+ o->reset = 0;
+ }
+
+ if (ac < 1) return -1;
+
/* stlinkv2 */
o->devname = NULL;
/* stlinkv2 */
o->devname = NULL;
@@
-106,13
+120,13
@@
int main(int ac, char** av)
if (o.devname != NULL) /* stlinkv1 */
{
if (o.devname != NULL) /* stlinkv1 */
{
- sl = stlink_v1_open(50);
+ sl = stlink_v1_open(50
, 1
);
if (sl == NULL) goto on_error;
sl->verbose = 50;
}
else /* stlinkv2 */
{
if (sl == NULL) goto on_error;
sl->verbose = 50;
}
else /* stlinkv2 */
{
- sl = stlink_open_usb(50);
+ sl = stlink_open_usb(50
, 1
);
if (sl == NULL) goto on_error;
sl->verbose = 50;
}
if (sl == NULL) goto on_error;
sl->verbose = 50;
}
@@
-123,6
+137,9
@@
int main(int ac, char** av)
if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
stlink_enter_swd_mode(sl);
if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
stlink_enter_swd_mode(sl);
+ if (o.reset)
+ stlink_reset(sl);
+
// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
if (sl->chip_id == STM32_CHIPID_F4)
{
// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
if (sl->chip_id == STM32_CHIPID_F4)
{
@@
-146,7
+163,7
@@
int main(int ac, char** av)
}
}
else if ((o.addr >= sl->sram_base) &&
}
}
else if ((o.addr >= sl->sram_base) &&
- (o.addr < sl->sram_base + sl->sram_size))
+ (o.addr < sl->sram_base + sl->sram_size))
{
err = stlink_fwrite_sram(sl, o.filename, o.addr);
if (err == -1)
{
err = stlink_fwrite_sram(sl, o.filename, o.addr);
if (err == -1)
{
@@
-154,7
+171,7
@@
int main(int ac, char** av)
goto on_error;
}
}
goto on_error;
}
}
- else if (o.cmd == DO_ERASE)
+
}
else if (o.cmd == DO_ERASE)
{
err = stlink_erase_flash_mass(sl);
if (err == -1)
{
err = stlink_erase_flash_mass(sl);
if (err == -1)
@@
-179,6
+196,9
@@
int main(int ac, char** av)
}
}
}
}
+ if (o.reset)
+ stlink_reset(sl);
+
/* success */
err = 0;
/* success */
err = 0;