From 204c6246adcc3e5add8072bb388500d812f11512 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Mon, 22 Oct 2018 11:20:03 -0700
Subject: [PATCH] Fix comments.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 minitests/roi_harness/bit2fasm.sh | 2 +-
 minitests/roi_harness/fasm2bit.sh | 2 +-
 prjxray/bitstream.py              | 2 ++
 prjxray/fasm_assembler.py         | 6 +-----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/minitests/roi_harness/bit2fasm.sh b/minitests/roi_harness/bit2fasm.sh
index 13a6c4c6..235d6888 100755
--- a/minitests/roi_harness/bit2fasm.sh
+++ b/minitests/roi_harness/bit2fasm.sh
@@ -4,4 +4,4 @@ BIT_IN=$1
 BITS=$(tempfile --suffix .bits)
 
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${BITS} -z -y ${BIT_IN}
-${XRAY_DIR}/utils/bits2fasm.py ${BITS}
+${XRAY_BITS2FASM} ${BITS}
diff --git a/minitests/roi_harness/fasm2bit.sh b/minitests/roi_harness/fasm2bit.sh
index 88bff430..ee1d389a 100755
--- a/minitests/roi_harness/fasm2bit.sh
+++ b/minitests/roi_harness/fasm2bit.sh
@@ -27,7 +27,7 @@ echo "Design .fasm: $fasm_in"
 echo "Harness .bit: $bit_in"
 echo "Out .bit: $bit_out"
 
-${XRAY_DIR}/utils/fasm2frames.py --sparse $fasm_in roi_partial.frm
+${XRAY_FASM2FRAMES} --sparse $fasm_in roi_partial.frm
 
 ${XRAY_TOOLS_DIR}/xc7patch \
 	--part_name ${XRAY_PART} \
diff --git a/prjxray/bitstream.py b/prjxray/bitstream.py
index ede19df2..ce73157d 100644
--- a/prjxray/bitstream.py
+++ b/prjxray/bitstream.py
@@ -1,6 +1,8 @@
 # Break frames into WORD_SIZE bit words.
 WORD_SIZE_BITS = 32
 
+# How many 32-bit words for frame in a 7-series bitstream?
+FRAME_WORD_COUNT = 101
 
 def load_bitdata(f):
     """ Read bit file and return bitdata map.
diff --git a/prjxray/fasm_assembler.py b/prjxray/fasm_assembler.py
index 75290a87..7a69f882 100644
--- a/prjxray/fasm_assembler.py
+++ b/prjxray/fasm_assembler.py
@@ -11,14 +11,10 @@ class FasmInconsistentBits(Exception):
     pass
 
 
-# How many 32-bit words for frame in a 7-series bitstream?
-FRAME_WORD_COUNT = 101
-
-
 def init_frame_at_address(frames, addr):
     '''Set given frame to 0 if not initialized '''
     if not addr in frames:
-        frames[addr] = [0 for _i in range(FRAME_WORD_COUNT)]
+        frames[addr] = [0 for _i in range(bitstream.FRAME_WORD_COUNT)]
 
 
 class FasmAssembler(object):