/* simple wrapper around the stlink_flash_write function */
+// TODO - this should be done as just a simple flag to the st-util command line...
+
#include <stdio.h>
#include <stdlib.h>
{
puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
puts("stlinkv2 command line: ./flash {read|write} path addr <size>");
+ puts(" use hex format for addr and <size>");
}
static int get_opts(struct opts* o, int ac, char** av)
o->devname = av[1];
i = 1;
}
-
- o->size = strtoul(av[i + 3], NULL, 10);
+ if (ac > 3)
+ o->size = strtoul(av[i + 3], NULL, 16);
}
else if (strcmp(av[0], "write") == 0)
{
struct opts o;
int err = -1;
+ o.size = 0;
if (get_opts(&o, ac - 1, av + 1) == -1)
{
printf("invalid command line\n");
if (o.devname != NULL) /* stlinkv1 */
{
-#if CONFIG_USE_LIBSG
- static const int scsi_verbose = 2;
- sl = stlink_quirk_open(o.devname, scsi_verbose);
+ sl = stlink_v1_open(50);
if (sl == NULL) goto on_error;
-#else
- printf("not compiled for use with STLink/V1");
- goto on_error;
-#endif
+ sl->verbose = 50;
}
else /* stlinkv2 */
{
- sl = stlink_open_usb(1);
+ sl = stlink_open_usb(50);
if (sl == NULL) goto on_error;
+ sl->verbose = 50;
}
if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
stlink_enter_swd_mode(sl);
stlink_reset(sl);
+ stlink_load_device_params(sl);
if (o.do_read == 0) /* write */
{
-
err = stlink_fwrite_flash(sl, o.filename, o.addr);
if (err == -1)
{
err = 0;
on_error:
- if (sl != NULL) stlink_close(sl);
+ if (sl != NULL)
+ {
+ stlink_reset(sl);
+ stlink_run(sl);
+ stlink_close(sl);
+ }
return err;
}