From ad813dc533be45197238da8a4d9063da1fbc1a1f Mon Sep 17 00:00:00 2001
From: Christopher Hewitt <chris@cloudscience.io>
Date: Sun, 4 Feb 2018 20:00:48 -0500
Subject: [PATCH] Fixes required for Vivado 2017.4.

---
 common/hdl/oh_abs.v             | 6 +++++-
 common/hdl/oh_counter.v         | 1 +
 common/hdl/oh_hamming_encoder.v | 5 ++++-
 common/hdl/oh_mux.v             | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/hdl/oh_abs.v b/common/hdl/oh_abs.v
index 327a5bab..8ef283f5 100644
--- a/common/hdl/oh_abs.v
+++ b/common/hdl/oh_abs.v
@@ -1,4 +1,8 @@
-module oh_abs (/*AUTOARG*/);
+module oh_abs (/*AUTOARG*/
+   a,
+   out,
+   overflow
+);
 
    //###############################################################
    //# Parameters
diff --git a/common/hdl/oh_counter.v b/common/hdl/oh_counter.v
index 681ff10d..a9b294c3 100644
--- a/common/hdl/oh_counter.v
+++ b/common/hdl/oh_counter.v
@@ -30,6 +30,7 @@ module oh_counter (/*AUTOARG*/
    //# Interface
    //###############################################################
    reg [DW-1:0]    count;
+   wire [DW-1:0]   count_in;
    
    always @(posedge clk)
      if(load)
diff --git a/common/hdl/oh_hamming_encoder.v b/common/hdl/oh_hamming_encoder.v
index af458b17..44eeebd9 100644
--- a/common/hdl/oh_hamming_encoder.v
+++ b/common/hdl/oh_hamming_encoder.v
@@ -5,7 +5,10 @@ module oh_hamming_enc (/*AUTOARG*/
    in, reset
    );
 
- 
+   output out;
+
+   input in;
+   input reset;
 endmodule // oh_hamming_enc
 
 
diff --git a/common/hdl/oh_mux.v b/common/hdl/oh_mux.v
index 873cbc03..da4f5296 100644
--- a/common/hdl/oh_mux.v
+++ b/common/hdl/oh_mux.v
@@ -30,7 +30,7 @@ module oh_mux (/*AUTOARG*/
      begin
 	out[DW-1:0] = 'b0;
 	for(i=0;i<N;i=i+1)
-	  out[DW-1:0] |= {(DW){sel[i]}} & in[((i+1)*DW-1)-:DW];
+	  out[DW-1:0] = out[DW-1:0] | {(DW){sel[i]}} & in[((i+1)*DW-1)-:DW];
      end
 
 endmodule // oh_mux