From 091c12438a329777981646cf6b8a55c73ae217cd Mon Sep 17 00:00:00 2001 From: Tomasz Michalak Date: Mon, 8 Apr 2019 10:57:34 +0200 Subject: [PATCH] xc7series: fix condition for padding frames detection Signed-off-by: Tomasz Michalak --- lib/include/prjxray/xilinx/xc7series/configuration.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/include/prjxray/xilinx/xc7series/configuration.h b/lib/include/prjxray/xilinx/xc7series/configuration.h index 20dea9c3..c86bc493 100644 --- a/lib/include/prjxray/xilinx/xc7series/configuration.h +++ b/lib/include/prjxray/xilinx/xc7series/configuration.h @@ -147,8 +147,16 @@ absl::optional Configuration::InitWithPackets( // Bitstreams appear to have 2 frames of // padding between rows. - if (next_address->row() != - current_frame_address.row()) { + if (next_address && + (next_address->block_type() != + current_frame_address + .block_type() || + next_address + ->is_bottom_half_rows() != + current_frame_address + .is_bottom_half_rows() || + next_address->row() != + current_frame_address.row())) { ii += 2 * kWordsPerFrame; } current_frame_address = *next_address;