From 84cc93d2e18fd7cd548040d4e9e1c32eff565d56 Mon Sep 17 00:00:00 2001
From: Michele <m.mastella@rug.nl>
Date: Wed, 23 Feb 2022 11:36:15 +0100
Subject: [PATCH] Added merge empty func

---
 dataflow_neuro/primitives.act | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dataflow_neuro/primitives.act b/dataflow_neuro/primitives.act
index c7152b1..fc49684 100644
--- a/dataflow_neuro/primitives.act
+++ b/dataflow_neuro/primitives.act
@@ -152,6 +152,7 @@ namespace tmpl {
 
         export template<pint N>
         defproc fork (avMx1of2<N> in; avMx1of2<N> out1; avMx1of2<N> out2 ; bool? reset_B; power supply) {
+          
           // control 
           bool _en, _reset_BX,_reset_BXX[N*2];
           A_4C_RB_X4 inack_ctl(.c1=_en,.c2=in.v,.c3=out1.v,.c4=out2.v,.y=in.a,.pr_B=reset_B,.sr_B=reset_B,.vdd=supply.vdd,.vss=supply.vss);
@@ -222,5 +223,16 @@ namespace tmpl {
                 out2_f_buf_func[i].sr_B = _reset_BXX[i+N-1];
             )
         }
+        export template<pint N>
+        defproc merge (avMx1of2<N> in1; avMx1of2<N> in2; avMx1of2<N> out ; bool? reset_B; power supply) {
+
+          //control
+          
+          
+          //reset_buffers
+
+          //validity
+
+          //function
     }
 }