luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

efinix: program(): thow exception when something fails

This commit is contained in:
Gwenhael Goavec-Merou 2024-07-29 07:53:05 +02:00
parent aed4f9a263
commit a7cb7ec050
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/efinix.cpp
View File

@ -166,6 +166,7 @@ void Efinix::reset()
void Efinix::program(unsigned int offset, bool unprotect_flash) void Efinix::program(unsigned int offset, bool unprotect_flash)
{ {
bool ret;
if (_file_extension.empty()) if (_file_extension.empty())
return; return;
if (_mode == Device::NONE_MODE) if (_mode == Device::NONE_MODE)
@ -184,7 +185,7 @@ void Efinix::program(unsigned int offset, bool unprotect_flash)
} }
} catch (std::exception &e) { } catch (std::exception &e) {
printError("FAIL: " + std::string(e.what())); printError("FAIL: " + std::string(e.what()));
return; throw std::runtime_error(e.what());
} }
printInfo("Parse file ", false); printInfo("Parse file ", false);
@ -193,7 +194,7 @@ void Efinix::program(unsigned int offset, bool unprotect_flash)
} else { } else {
printError("FAIL"); printError("FAIL");
delete bit; delete bit;
return; throw std::runtime_error("Efinix: Failed to parse file: " + _filename);
} }
const uint8_t *data = bit->getData(); const uint8_t *data = bit->getData();
@ -204,14 +205,21 @@ void Efinix::program(unsigned int offset, bool unprotect_flash)
switch (_mode) { switch (_mode) {
case MEM_MODE: case MEM_MODE:
programJTAG(data, length); if (!programJTAG(data, length)) {
delete bit;
throw std::runtime_error("Efinix: Failed to load bitstream");
}
break; break;
case FLASH_MODE: case FLASH_MODE:
if (_jtag) if (_jtag)
SPIInterface::write(offset, const_cast<uint8_t *>(data), ret = SPIInterface::write(offset, const_cast<uint8_t *>(data),
length, unprotect_flash); length, unprotect_flash);
else else
programSPI(offset, data, length, unprotect_flash); ret = programSPI(offset, data, length, unprotect_flash);
if (!ret) {
delete bit;
throw std::runtime_error("Efinix: Failed to write bitstream in flash");
}
break; break;
default: default:
return; return;
@ -398,7 +406,8 @@ bool Efinix::prepare_flash_access()
bridge.parse(); bridge.parse();
const uint8_t *data = bridge.getData(); const uint8_t *data = bridge.getData();
const int length = bridge.getLength() / 8; const int length = bridge.getLength() / 8;
programJTAG(data, length); if (!programJTAG(data, length))
return false;
} catch (std::exception &e) { } catch (std::exception &e) {
printError(e.what()); printError(e.what());
return false; return false;