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

fsparser: use map provided by configBitstreamParser instead of a lot a variable.

This commit is contained in:
Gwenhael Goavec-Merou 2020-03-20 18:55:13 +01:00
parent 232b189286
commit a373bf1613
2 changed files with 9 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/fsparser.cpp
View File

@ -15,11 +15,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <cstdio>
#include "fsparser.hpp" #include "fsparser.hpp"
#include "display.hpp" #include "display.hpp"
@ -28,10 +26,7 @@ using namespace std;
FsParser::FsParser(string filename, bool reverseByte, bool verbose): FsParser::FsParser(string filename, bool reverseByte, bool verbose):
ConfigBitstreamParser(filename, ConfigBitstreamParser::ASCII_MODE, ConfigBitstreamParser(filename, ConfigBitstreamParser::ASCII_MODE,
verbose), _reverseByte(reverseByte), _toolVersion(), _partNumber(), verbose), _reverseByte(reverseByte), _checksum(0)
_devicePackage(), _backgroundProgramming(false), _checksum(0),
_crcCheck(false), _compress(false), _encryption(false),
_securityBit(false), _jtagAsRegularIO(false), _date()
{ {
} }
FsParser::~FsParser() FsParser::~FsParser()
@ -58,42 +53,15 @@ int FsParser::parseHeader()
else else
v2 = buffer.substr(pos+2) + '\0'; // ':' + ' ' v2 = buffer.substr(pos+2) + '\0'; // ':' + ' '
if (v1 == "GOWIN Version") _hdr[v1] = v2;
_toolVersion = v2;
if (v1 == "Part Number")
_partNumber = v2;
if (v1 == "Device-package")
_devicePackage = v2;
if (v1 == "BackgroundProgramming")
_backgroundProgramming = ((v2 == "OFF")?false:true);
if (v1 == "CheckSum")
sscanf(v2.c_str(), "0x%04hx", &_checksum);
if (v1 == "CRCCheck")
_crcCheck = ((v2 == "OFF")?false:true);
if (v1 == "Compress")
_compress = ((v2 == "OFF")?false:true);
if (v1 == "Encryption")
_encryption = ((v2 == "OFF")?false:true);
if (v1 == "SecurityBit")
_securityBit = ((v2 == "OFF")?false:true);
if (v1 == "JTAGAsRegularIO")
_jtagAsRegularIO = ((v2 == "OFF")?false:true);
if (v1 == "Created Time")
_date = v2;
} }
if (_hdr.find("CheckSum") != _hdr.end())
sscanf(_hdr["CheckSum"].c_str(), "0x%04hx", &_checksum);
if (_verbose) { if (_verbose) {
printInfo("tool version: " + _toolVersion); for (auto &&t: _hdr)
printInfo("Part number: " + _partNumber); printInfo("x" + t.first + ": " + t.second);
printInfo("Device package: " + _devicePackage);
printInfo("Background programming: " +
string((_backgroundProgramming)?"ON":"OFF"));
printInfo("Checksum: " + _checksum);
printInfo("CRC check: " + string((_crcCheck)?"ON":"OFF"));
printInfo("Compression: " + string((_compress)?"ON":"OFF"));
printInfo("Encryption: " + string((_encryption)?"ON":"OFF"));
printInfo("Security bit: " + string((_securityBit)?"ON":"OFF"));
printInfo("Jtag as regular IO: " + string((_jtagAsRegularIO)?"ON":"OFF"));
printInfo("Creation date: " + _date);
} }
return ret; return ret;

10
src/fsparser.hpp
View File

@ -35,17 +35,7 @@ class FsParser: public ConfigBitstreamParser {
private: private:
int parseHeader(); int parseHeader();
bool _reverseByte; bool _reverseByte;
std::string _toolVersion;
std::string _partNumber;
std::string _devicePackage;
bool _backgroundProgramming;
uint16_t _checksum; uint16_t _checksum;
bool _crcCheck;
bool _compress;
bool _encryption;
bool _securityBit;
bool _jtagAsRegularIO;
std::string _date;
}; };
#endif // FSPARSER_HPP_ #endif // FSPARSER_HPP_