From c9f9d97d0768383df58d8c3de04ae8794ba3cc0d Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Sun, 3 Jan 2016 11:49:01 -0800
Subject: [PATCH] Move BasebandConfiguration message handling into baseband
 thread.

---
 firmware/baseband/baseband_thread.cpp | 8 ++++++--
 firmware/baseband/baseband_thread.hpp | 4 ++--
 firmware/baseband/main.cpp            | 8 --------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/firmware/baseband/baseband_thread.cpp b/firmware/baseband/baseband_thread.cpp
index 1035d2dc3..84b23bed6 100644
--- a/firmware/baseband/baseband_thread.cpp
+++ b/firmware/baseband/baseband_thread.cpp
@@ -69,8 +69,12 @@ void BasebandThread::set_configuration(const BasebandConfiguration& new_configur
 }
 
 void BasebandThread::on_message(const Message* const message) {
-	if( baseband_processor ) {
-		baseband_processor->on_message(message);
+	if( message->id == Message::ID::BasebandConfiguration ) {
+		set_configuration(reinterpret_cast<const BasebandConfigurationMessage*>(message)->configuration);
+	} else {
+		if( baseband_processor ) {
+			baseband_processor->on_message(message);
+		}
 	}
 }
 
diff --git a/firmware/baseband/baseband_thread.hpp b/firmware/baseband/baseband_thread.hpp
index 4c16a54d5..c1c5d9041 100644
--- a/firmware/baseband/baseband_thread.hpp
+++ b/firmware/baseband/baseband_thread.hpp
@@ -37,8 +37,6 @@ public:
 
 	Thread* start(const tprio_t priority);
 
-	void set_configuration(const BasebandConfiguration& new_configuration);
-
 	void on_message(const Message* const message);
 	void on_update_spectrum();
 	
@@ -61,6 +59,8 @@ private:
 
 	void disable();
 	void enable();
+
+	void set_configuration(const BasebandConfiguration& new_configuration);
 };
 
 #endif/*__BASEBAND_THREAD_H__*/
diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 79df6ce1c..3e18808a4 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -170,10 +170,6 @@ private:
 
 	void on_message(const Message* const message) {
 		switch(message->id) {
-		case Message::ID::BasebandConfiguration:
-			on_message_baseband_configuration(*reinterpret_cast<const BasebandConfigurationMessage*>(message));
-			break;
-
 		case Message::ID::Shutdown:
 			on_message_shutdown(*reinterpret_cast<const ShutdownMessage*>(message));
 			break;
@@ -184,10 +180,6 @@ private:
 		}
 	}
 
-	void on_message_baseband_configuration(const BasebandConfigurationMessage& message) {
-		baseband_thread.set_configuration(message.configuration);
-	}
-
 	void on_message_shutdown(const ShutdownMessage&) {
 		request_stop();
 	}