mirror
/
stlink
kopia lustrzana https://github.com/stlink-org/stlink
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #922 from grevaillot/to_merge/st-flash_v1v2 

flash.c: stlink_open_usb is actually able to open v1 and v2 (and v3)
pull/934/head
nightwalker-87 2020-04-14 12:13:11 +02:00 zatwierdzone przez GitHub
rodzic 1d00424dfd fc507fd484
commit b5be03a9cc
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 5 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
src/tools/flash.c
Wyświetl plik

@ -29,11 +29,9 @@ static void cleanup(int signum) {
static void usage(void)
{
puts("stlinkv1 command line: ./st-flash [--debug] [--reset] [--opt] [--format <format>] [--flash=<fsize>] {read|write} /dev/sgX <path> <addr> <size>");
puts("stlinkv1 command line: ./st-flash [--debug] /dev/sgX erase");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--reset] [--opt] [--serial <serial>] [--format <format>] [--flash=<fsize>] {read|write} <path> [addr] [size]");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--serial <serial>] erase");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--serial <serial>] reset");
puts("command line: ./st-flash [--debug] [--reset] [--opt] [--serial <serial>] [--format <format>] [--flash=<fsize>] {read|write} <path> [addr] [size]");
puts("command line: ./st-flash [--debug] [--serial <serial>] erase");
puts("command line: ./st-flash [--debug] [--serial <serial>] reset");
puts(" <addr>, <serial> and <size>: Use hex format.");
puts(" <fsize>: Use decimal, octal or hex (prefix 0xXXX) format, optionally followed by k=KB, or m=MB (eg. --flash=128k)");
puts(" <format>: Can be 'binary' (default) or 'ihex', although <addr> must be specified for binary format only.");
@ -59,10 +57,7 @@ int main(int ac, char** av)
printf("st-flash %s\n", STLINK_VERSION);
if (o.devname != NULL) /* stlinkv1 */
sl = stlink_v1_open(o.log_level, 1);
else /* stlinkv2 */
sl = stlink_open_usb(o.log_level, 1, (char *)o.serial);
sl = stlink_open_usb(o.log_level, 1, (char *)o.serial);
if (sl == NULL)
return -1;

11
src/tools/flash_opts.c
Wyświetl plik

@ -22,7 +22,6 @@ static int bad_arg(const char *arg) {
}
int flash_get_opts(struct flash_opts* o, int ac, char** av) {
bool serial_specified = false;
// defaults
memset(o, 0, sizeof(*o));
@ -63,7 +62,6 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
memcpy(buffer, serial + j, 2);
o->serial[length - k] = (uint8_t)strtol(buffer, NULL, 16);
}
serial_specified = true;
}
else if (strcmp(av[0], "--area") == 0 || starts_with(av[0], "--area=")) {
const char * area;
@ -138,7 +136,7 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
}
// command and (optional) device name
while(ac >= 1) { // looks like for stlinkv1 the device name and command may be swaped - check both positions in all cases
while(ac >= 1) {
if (strcmp(av[0], "erase") == 0) {
if (o->cmd != FLASH_CMD_NONE) return -1;
o->cmd = FLASH_CMD_ERASE;
@ -155,10 +153,6 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
if (o->cmd != FLASH_CMD_NONE) return -1;
o->cmd = CMD_RESET;
}
else if(starts_with(av[0], "/dev/")) {
if (o->devname) return -1;
o->devname = av[0];
}
else {
break;
}
@ -210,8 +204,5 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
default: break ;
}
// some constistence checks
if(serial_specified && o->devname != NULL) return -1; // serial not supported for v1
return 0;
}