From 630cd06cb33d628fa6426866f006580aad30f84b Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sat, 5 May 2012 13:21:38 -0700
Subject: blocks: adds new top-level component gr-blocks with first block 
 gr::blocks::add_XX

---
 gr-blocks/lib/add_ff_impl.cc | 71 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 gr-blocks/lib/add_ff_impl.cc

(limited to 'gr-blocks/lib/add_ff_impl.cc')

diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc
new file mode 100644
index 000000000..754618d96
--- /dev/null
+++ b/gr-blocks/lib/add_ff_impl.cc
@@ -0,0 +1,71 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "add_ff_impl.h"
+#include <gr_io_signature.h>
+#include <volk/volk.h>
+
+namespace gr {
+  namespace blocks {
+
+    add_ff::sptr add_ff::make(size_t vlen)
+    {
+      return gnuradio::get_initial_sptr(new add_ff_impl(vlen));
+    }
+
+    add_ff_impl::add_ff_impl(size_t vlen)
+      : gr_sync_block("add_ff",
+		      gr_make_io_signature (1, -1, sizeof(float)*vlen),
+		      gr_make_io_signature (1,  1, sizeof(float)*vlen)),
+	d_vlen(vlen)
+    {
+      const int alignment_multiple =
+	volk_get_alignment() / sizeof(float);
+      set_alignment(alignment_multiple);
+    }
+
+    int
+    add_ff_impl::work(int noutput_items,
+		      gr_vector_const_void_star &input_items,
+		      gr_vector_void_star &output_items)
+    {
+      float *out = (float *) output_items[0];
+      int noi = d_vlen*noutput_items;
+      
+      memcpy(out, input_items[0], noi*sizeof(float));
+      if(is_unaligned()) {
+	for(size_t i = 1; i < input_items.size(); i++)
+	  volk_32f_x2_add_32f_u(out, out, (const float*)input_items[i], noi);
+      }
+      else {
+	for(size_t i = 1; i < input_items.size(); i++)
+	  volk_32f_x2_add_32f_a(out, out, (const float*)input_items[i], noi);
+      }
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+}/* namespace gr */
-- 
cgit 


From 6260c4263231718c81770916c2574f8d395d10d6 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 10 Jun 2012 11:25:02 -0700
Subject: blocks: copy alignment fix from maint

---
 gr-blocks/lib/add_ff_impl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-blocks/lib/add_ff_impl.cc')

diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc
index 754618d96..83359ef80 100644
--- a/gr-blocks/lib/add_ff_impl.cc
+++ b/gr-blocks/lib/add_ff_impl.cc
@@ -44,7 +44,7 @@ namespace gr {
     {
       const int alignment_multiple =
 	volk_get_alignment() / sizeof(float);
-      set_alignment(alignment_multiple);
+      set_alignment(std::max(1, alignment_multiple));
     }
 
     int
-- 
cgit