projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only call strtoul when there is an argument that strtoul can work on
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 46a8ce1711e295651cf2c16e1bfae3c08bc6dd09..39910b63665ad388c658951ad43bf6db7639571b 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-1,5
+1,7
@@
/* simple wrapper around the stlink_flash_write function */
/* 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>
#include <stdio.h>
#include <stdlib.h>
@@
-21,6
+23,7
@@
static void usage(void)
{
puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
puts("stlinkv2 command line: ./flash {read|write} path addr <size>");
{
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)
}
static int get_opts(struct opts* o, int ac, char** av)
@@
-45,8
+48,8
@@
static int get_opts(struct opts* o, int ac, char** av)
o->devname = av[1];
i = 1;
}
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)
{
}
else if (strcmp(av[0], "write") == 0)
{
@@
-77,6
+80,7
@@
int main(int ac, char** av)
struct opts o;
int err = -1;
struct opts o;
int err = -1;
+ o.size = 0;
if (get_opts(&o, ac - 1, av + 1) == -1)
{
printf("invalid command line\n");
if (get_opts(&o, ac - 1, av + 1) == -1)
{
printf("invalid command line\n");
@@
-86,18
+90,14
@@
int main(int ac, char** av)
if (o.devname != NULL) /* stlinkv1 */
{
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);
+ sl->verbose = 50;
if (sl == NULL) goto on_error;
if (sl == NULL) goto on_error;
-#else
- printf("not compiled for use with STLink/V1");
- goto on_error;
-#endif
}
else /* stlinkv2 */
{
}
else /* stlinkv2 */
{
- sl = stlink_open_usb(1);
+ sl = stlink_open_usb(50);
+ sl->verbose = 50;
if (sl == NULL) goto on_error;
}
if (sl == NULL) goto on_error;
}
@@
-132,7
+132,12
@@
int main(int ac, char** av)
err = 0;
on_error:
err = 0;
on_error:
- if (sl != NULL) stlink_close(sl);
+ if (sl != NULL)
+ {
+ stlink_reset(sl);
+ stlink_run(sl);
+ stlink_close(sl);
+ }
return err;
}
return err;
}