From 88c1ec9fe35ab978612a51336610cc623c46ece8 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Mon, 13 Jul 2015 13:04:42 +0000
Subject: [PATCH] Cosmetic: Simplified ASSERT condition. Simplified range
 definition for burstsize.

---
 libraries/base/reorder/src/vhdl/reorder_sequencer.vhd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd b/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd
index 24d6853c4f..28a481a4e5 100644
--- a/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd
@@ -158,7 +158,7 @@ ARCHITECTURE rtl OF reorder_sequencer IS
     page_cnt         : NATURAL RANGE 0 TO g_reorder_seq.nof_blocks;    -- Counter that counts the number of write accesses to determine the page-swap. 
     first_write      : STD_LOGIC;
     start_addr       : NATURAL RANGE 0 TO c_mem_size-1;
-    burstsize        : NATURAL RANGE 0 TO sel_a_b(c_wr_chunksize > c_rd_chunksize, c_wr_chunksize, c_rd_chunksize);
+    burstsize        : NATURAL RANGE 0 TO largest(c_wr_chunksize, c_rd_chunksize);
     state            : state_type;  -- The state machine. 
   END RECORD;
 
@@ -169,7 +169,7 @@ BEGIN
   ---------------------------------------------------------------
   -- CHECK IF PROVIDED GENERICS ARE ALLOWED. 
   ---------------------------------------------------------------
-  ASSERT NOT(g_reorder_seq.wr_chunksize /= (g_reorder_seq.rd_nof_chunks*g_reorder_seq.rd_chunksize) AND rising_edge(dp_clk)) REPORT "Total write configuration is different from total read configuration!!!" SEVERITY FAILURE;
+  ASSERT g_reorder_seq.wr_chunksize = g_reorder_seq.rd_nof_chunks*g_reorder_seq.rd_chunksize REPORT "Total write configuration is different from total read configuration!!!" SEVERITY FAILURE;
     
   p_comb : PROCESS(r, dp_rst, done)
     VARIABLE v : reg_type;
-- 
GitLab