projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chevck first for NULL before writing anything to the alloceted structure
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 791b0730b90dee0c0f906184601d59edc6db758d..9033b17b6069828817cad513a70516108b17a804 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>
@@
-17,6
+19,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)
{
@@
-40,15
+48,15
@@
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)
{
o->do_read = 0;
/* stlinkv1 mode */
}
else if (strcmp(av[0], "write") == 0)
{
o->do_read = 0;
/* stlinkv1 mode */
- if (ac ==
5
)
+ if (ac ==
4
)
{
o->devname = av[1];
i = 1;
{
o->devname = av[1];
i = 1;
@@
-72,31
+80,37
@@
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");
+ usage();
goto on_error;
}
if (o.devname != NULL) /* stlinkv1 */
{
goto on_error;
}
if (o.devname != NULL) /* stlinkv1 */
{
- 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;
+ sl->verbose = 50;
}
else /* stlinkv2 */
{
}
else /* stlinkv2 */
{
- sl = stlink_open_usb(NULL, 10);
+ sl = stlink_open_usb(50);
+ if (sl == NULL) goto on_error;
+ sl->verbose = 50;
}
}
- if (sl == NULL) goto on_error;
+ if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+ stlink_exit_dfu_mode(sl);
- if (o.do_read == 0) /* write */
- {
- 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_enter_swd_mode(sl);
- stlink_reset(sl);
+ stlink_reset(sl);
+
+ if (o.do_read == 0) /* write */
+ {
err = stlink_fwrite_flash(sl, o.filename, o.addr);
if (err == -1)
{
err = stlink_fwrite_flash(sl, o.filename, o.addr);
if (err == -1)
{
@@
-118,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;
}