From 76df4f03692e06eef645920f2bb206ad8dd68503 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 4 Aug 2015 14:08:15 -0700
Subject: [PATCH] Extract magnitude_squared to utility.

---
 firmware/baseband/main.cpp  | 9 ---------
 firmware/common/utility.hpp | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 0c2eb866e..e731c261f 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -67,7 +67,6 @@
 
 #include <cstdint>
 #include <cstddef>
-#include <complex>
 #include <array>
 #include <string>
 #include <bitset>
@@ -688,14 +687,6 @@ static void init() {
 	);
 }
 
-static inline float magnitude_squared(const std::complex<float> c) {
-	const auto r = c.real();
-	const auto r2 = r * r;
-	const auto i = c.imag();
-	const auto i2 = i * i;
-	return r2 + i2;
-}
-
 class EventDispatcher {
 public:
 	MessageHandlerMap& message_handlers() {
diff --git a/firmware/common/utility.hpp b/firmware/common/utility.hpp
index b8bb5f57b..1407f6878 100644
--- a/firmware/common/utility.hpp
+++ b/firmware/common/utility.hpp
@@ -25,6 +25,7 @@
 #include <type_traits>
 #include <cstdint>
 #include <cstddef>
+#include <complex>
 #include <memory>
 
 #include <hal.h>
@@ -67,6 +68,14 @@ static inline void clear_m4_flag_saturation() {
 
 float complex16_mag_squared_to_dbv_norm(const float c16_mag_squared);
 
+inline float magnitude_squared(const std::complex<float> c) {
+	const auto r = c.real();
+	const auto r2 = r * r;
+	const auto i = c.imag();
+	const auto i2 = i * i;
+	return r2 + i2;
+}
+
 /* Override new/delete to use Chibi/OS heap functions */
 /* NOTE: Do not inline these, it doesn't work. ;-) */
 void* operator new(size_t size);