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

jedParser: don't always consider STX as first char

This commit is contained in:
Gwenhael Goavec-Merou 2020-05-02 09:08:42 +02:00
parent 3221fd8ee2
commit 77e95d637c
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/jedParser.cpp
View File

@ -211,13 +211,30 @@ int JedParser::parse()
_fd.seekg(0, _fd.beg); _fd.seekg(0, _fd.beg);
/* First line must STX (0x02) */ /* JED file may have some ASCII line before STX (0x02)
content = readline(); * read until STX or EOF
if (content[0] != 0x02) { */
printf("wrong file\n"); char c;
do {
_fd.read(&c, 1);
} while (_fd && c != 0x02);
/* if file descriptor == EOF
* return an ERROR
*/
if (!_fd) {
cerr << "Error: STX not found: wrong file" << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* the line starting with STX may contains
* others informations */
_fd.read(&c, 1);
if (c != '*') // something to process
_fd.seekg(-1, _fd.cur);
else // STX in a dedicated line
content = readline();
/* read full content /* read full content
* JED file end fix ETX (0x03) + file checksum + \n * JED file end fix ETX (0x03) + file checksum + \n
*/ */
@ -242,7 +259,7 @@ int JedParser::parse()
_pin_count = count; _pin_count = count;
break; break;
default: default:
cerr << "Error for 'Q' unknown qualifier " << lines[1] << endl; cerr << "Error for 'Q' unknown qualifier " << lines[0] << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
break; break;