projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed size argument to hex
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 5fb6f1c97f902687250d4f238258749fd373d893..f1d0b4f845d0cd90f62ab313624c2cb60156621e 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-17,6
+17,12
@@
struct opts
size_t size;
};
size_t size;
};
+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(" 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)
{
@@
-41,7
+47,7
@@
static int get_opts(struct opts* o, int ac, char** av)
i = 1;
}
i = 1;
}
- o->size = strtoul(av[i + 3], NULL, 1
0
);
+ o->size = strtoul(av[i + 3], NULL, 1
6
);
}
else if (strcmp(av[0], "write") == 0)
{
}
else if (strcmp(av[0], "write") == 0)
{
@@
-75,25
+81,33
@@
int main(int ac, char** av)
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");
+ usage();
goto on_error;
}
if (o.devname != NULL) /* stlinkv1 */
{
goto on_error;
}
if (o.devname != NULL) /* stlinkv1 */
{
+#if CONFIG_USE_LIBSG
static const int scsi_verbose = 2;
sl = stlink_quirk_open(o.devname, scsi_verbose);
if (sl == NULL) goto on_error;
static const int scsi_verbose = 2;
sl = stlink_quirk_open(o.devname, scsi_verbose);
if (sl == NULL) goto on_error;
-
- if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
- stlink_exit_dfu_mode(sl);
+#else
+ printf("not compiled for use with STLink/V1");
+ goto on_error;
+#endif
}
else /* stlinkv2 */
{
}
else /* stlinkv2 */
{
- sl = stlink_open_usb(
NULL, 10
);
+ sl = stlink_open_usb(
1
);
if (sl == NULL) goto on_error;
}
if (sl == NULL) goto on_error;
}
- stlink_enter_swd_mode(sl);
+ if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+ stlink_exit_dfu_mode(sl);
+
+ if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
+ stlink_enter_swd_mode(sl);
+
stlink_reset(sl);
if (o.do_read == 0) /* write */
stlink_reset(sl);
if (o.do_read == 0) /* write */