From da6c6bb03c4b2d3f0998215b7bebb3597b8e50ce Mon Sep 17 00:00:00 2001
From: bernd-herzog <bernd@nachregenkommtsonne.de>
Date: Fri, 5 May 2023 12:46:59 +0200
Subject: [PATCH] refactoring

---
 firmware/application/portapack.cpp | 22 ++++++---------
 firmware/common/cpld_update.cpp    | 43 +++++++-----------------------
 firmware/common/cpld_update.hpp    |  7 +----
 3 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
index 9d0fd50f..c2fef913 100644
--- a/firmware/application/portapack.cpp
+++ b/firmware/application/portapack.cpp
@@ -489,20 +489,14 @@ bool init() {
 	
 	chThdSleepMilliseconds(10);
 
-	auto pp_config = portapack_cpld_config();
-	auto cpld_update_possible = portapack::cpld::update_possible(); //QFP100 CPLD fails this check. skip CPLD update
-	auto cpld_update_necessary = cpld_update_possible && portapack::cpld::update_necessary(pp_config);
-	if ( cpld_update_necessary ) {
-		auto ok = portapack::cpld::update(pp_config);
-
-		if( !ok ) {
-			chThdSleepMilliseconds(10);
-			// Mode left (R1) and right (R2,H2,H2+) bypass going into hackrf mode after failing CPLD update
-			// Mode center (autodetect), up (R1) and down (R2,H2,H2) will go into hackrf mode after failing CPLD update
-			if (load_config() != 3 /* left */ && load_config() != 4 /* right */){
-				shutdown_base();
-				return false;
-			}
+	uint32_t result = portapack::cpld::update_if_necessary(portapack_cpld_config());
+	if ( result == 3 /* program failed */ ) {
+		chThdSleepMilliseconds(10);
+		// Mode left (R1) and right (R2,H2,H2+) bypass going into hackrf mode after failing CPLD update
+		// Mode center (autodetect), up (R1) and down (R2,H2,H2) will go into hackrf mode after failing CPLD update
+		if (load_config() != 3 /* left */ && load_config() != 4 /* right */){
+			shutdown_base();
+			return false;
 		}
 	}
 
diff --git a/firmware/common/cpld_update.cpp b/firmware/common/cpld_update.cpp
index 6eae8f00..6baeb68a 100644
--- a/firmware/common/cpld_update.cpp
+++ b/firmware/common/cpld_update.cpp
@@ -33,7 +33,9 @@
 namespace portapack {
 namespace cpld {
 
-bool update_possible() {
+uint32_t update_if_necessary(
+	const Config config
+) {
 	jtag::GPIOTarget target {
 		portapack::gpio_cpld_tck,
 		portapack::gpio_cpld_tms,
@@ -49,7 +51,7 @@ bool update_possible() {
 
 	/* Run-Test/Idle */
 	if( !cpld.idcode_ok() ) {
-		return false;
+		return 1;
 	}
 
 	cpld.sample();
@@ -60,43 +62,16 @@ bool update_possible() {
 	 * in passive state.
 	 */
 	if( !cpld.silicon_id_ok() ) {
-		return false;
+		return 2;
 	}
 
-	return true;
-}
-
-bool update_necessary(
-	const Config config
-) {
-	jtag::GPIOTarget target {
-		portapack::gpio_cpld_tck,
-		portapack::gpio_cpld_tms,
-		portapack::gpio_cpld_tdi,
-		portapack::gpio_cpld_tdo
-	};
-	jtag::JTAG jtag { target };
-	CPLD cpld { jtag };
-
 	/* Verify CPLD contents against current bitstream. */
 	auto ok = cpld.verify(config.block_0, config.block_1);
-	return !ok;
-}
-
-bool update(
-	const Config config
-) {
-	jtag::GPIOTarget target {
-		portapack::gpio_cpld_tck,
-		portapack::gpio_cpld_tms,
-		portapack::gpio_cpld_tdi,
-		portapack::gpio_cpld_tdo
-	};
-	jtag::JTAG jtag { target };
-	CPLD cpld { jtag };
 
 	/* CPLD verifies incorrectly. Erase and program with current bitstream. */
-	auto ok = cpld.program(config.block_0, config.block_1);
+	if( !ok ) {
+		ok = cpld.program(config.block_0, config.block_1);
+	}
 
 	/* If programming OK, reset CPLD to user mode. Otherwise leave it in
 	 * passive (ISP) state.
@@ -111,7 +86,7 @@ bool update(
 		cpld.disable();
 	}
 
-	return ok;
+	return ok ? 0 : 3;
 }
 
 } /* namespace cpld */
diff --git a/firmware/common/cpld_update.hpp b/firmware/common/cpld_update.hpp
index f16ed993..4e151932 100644
--- a/firmware/common/cpld_update.hpp
+++ b/firmware/common/cpld_update.hpp
@@ -27,13 +27,8 @@
 namespace portapack {
 namespace cpld {
 
-bool update_possible();
 
-bool update_necessary(
-	const Config config
-);
-
-bool update(
+uint32_t update_if_necessary(
 	const Config config
 );