Merge pull request #183 from thinkski/master

Fixed missing parenthesis. Resolves issues #92, #161, and #170.
pull/184/head
texane 2013-10-24 09:28:13 -07:00
commit e35c818c19
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -146,7 +146,7 @@ int main(int ac, char** av)
}
}
else if ((o.addr >= sl->sram_base) &&
(o.addr < sl->sram_base + sl->sram_size))
(o.addr < sl->sram_base + sl->sram_size)) {
err = stlink_fwrite_sram(sl, o.filename, o.addr);
if (err == -1)
{
@ -154,7 +154,7 @@ int main(int ac, char** av)
goto on_error;
}
}
else if (o.cmd == DO_ERASE)
} else if (o.cmd == DO_ERASE)
{
err = stlink_erase_flash_mass(sl);
if (err == -1)