From d6e3cc1d1b6a5cb111d2bf3debc81a2255287272 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 2 May 2017 06:44:50 +0100
Subject: [PATCH] Move CPLD updating to earlier in start-up

Make sure CPLD code is up-to-date before attempting to interact with PortaPack.
---
 firmware/application/portapack.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
index 24a0c989e..a1a18e76c 100644
--- a/firmware/application/portapack.cpp
+++ b/firmware/application/portapack.cpp
@@ -145,6 +145,14 @@ void init() {
 	clock_manager.set_reference_ppb(persistent_memory::correction_ppb());
 	clock_manager.run_at_full_speed();
 
+	if( !cpld_update_if_necessary() ) {
+		chSysHalt();
+	}
+
+	if( !cpld_hackrf_load_sram() ) {
+		chSysHalt();
+	}
+
 	audio::init();
 	
 	clock_manager.enable_first_if_clock();
@@ -153,14 +161,6 @@ void init() {
 	radio::init();
 
 	touch::adc::init();
-
-	if( !cpld_update_if_necessary() ) {
-		chSysHalt();
-	}
-
-	if( !cpld_hackrf_load_sram() ) {
-		chSysHalt();
-	}
 }
 
 void shutdown() {