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

lib: xc7series: Account for padding between rows in bitstreams 

There seem to be 2 frames of padding between rows in a bitstream.  For
single-frame writes, these are parsed as type 0 packets and ignored.
Normal bitstreams use a single FDRI write that apparently includes this
padding and needs to be ignored in the auto-increment handling.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
This commit is contained in:
Rick Altherr 2018-01-04 15:14:08 -08:00
parent 6ba411294e
commit 6222be77d3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/include/prjxray/xilinx/xc7series/configuration.h
View File

@ -112,20 +112,25 @@ absl::optional<Configuration> Configuration::InitWithPackets(
// 7-series frames are 101-words long. Writes to this // 7-series frames are 101-words long. Writes to this
// register can be multiples of that to do // register can be multiples of that to do
// auto-incrementing block writes. // auto-incrementing block writes.
int frames_written = packet.data().size() / for (size_t ii = 0;
kWordsPerFrame; ii < packet.data().size();
ii += kWordsPerFrame) {
for (int ii = 0; ii < frames_written; ++ii) {
frames[current_frame_address] = frames[current_frame_address] =
packet.data().subspan( packet.data().subspan(
ii * kWordsPerFrame, ii, kWordsPerFrame);
kWordsPerFrame);
auto next_address = auto next_address =
part.GetNextConfigurationFrameAddress( part.GetNextConfigurationFrameAddress(
current_frame_address); current_frame_address);
if (next_address) { if (!next_address) break;
current_frame_address = *next_address;
// Bitstreams appear to have 2 frames of
// padding between rows.
if (next_address->row_address() !=
current_frame_address.row_address()) {
ii += 2 * kWordsPerFrame;
} }
current_frame_address = *next_address;
} }
break; break;
} }