From 9eaa3c3820deab75e1baecd09827608520a225d4 Mon Sep 17 00:00:00 2001
From: unknown <alfred.krohmer@ENTMCNODE3.ifn.et.tu-dresden.de>
Date: Mon, 9 Mar 2015 17:08:28 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"MAC=20eingef=C3=BChrt"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8efb1c014b5c6ef4818309c7f70095155b0d9ce4.
---
 fft.c        |  2 +-
 fft_inst.tie | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fft.c b/fft.c
index 2073d03..3bd6b8c 100644
--- a/fft.c
+++ b/fft.c
@@ -97,7 +97,7 @@ int fix_fft(fixed fr[], fixed fi[], int m, int inverse)
         	        ++scale;
         	        break;
         	    }
-        	}
+        	}       	
         }
         else
         {
diff --git a/fft_inst.tie b/fft_inst.tie
index 045beb5..1da9a94 100644
--- a/fft_inst.tie
+++ b/fft_inst.tie
@@ -201,12 +201,16 @@ operation FFT_calc {inout FFT_reg data, in AR wr, in AR wi, in AR shift} {}
 	wire [15:0] fij = data[15:0];
 	
 	wire [31:0] tr1  = TIEmul(wr, frj, 1'b1);
-	wire [31:0] tr2  = TIEmac(wi, fij, tr1, 1'b1, 1'b1);
-	wire [15:0] tr = tr2[30:15];
+	wire [15:0] tr1s = tr1[30:15];
+	wire [31:0] tr2  = TIEmul(wi, fij, 1'b1);
+	wire [15:0] tr2s = tr2[30:15];
+	wire [15:0] tr = TIEadd(tr1s, ~tr2s, 1'b1);
 	
 	wire [31:0] ti1 = TIEmul(wr, fij, 1'b1);
-	wire [31:0] ti2 = TIEmac(wi, frj, ti1, 1'b1, 1'b0);
-	wire [15:0] ti = ti2[30:15]; 
+	wire [15:0] ti1s = ti1[30:15];
+	wire [31:0] ti2 = TIEmul(wi, frj, 1'b1);
+	wire [15:0] ti2s = ti2[30:15]; 
+	wire [15:0] ti = TIEadd(ti1s, ti2s, 1'b0);
 	
 	wire [15:0] qr = TIEmux(shift[0], fri, {fri[15], fri[15:1]});
 	wire [15:0] qi = TIEmux(shift[0], fii, {fii[15], fii[15:1]});