refactoring

portapack-mayhem · May 5, 2023 · df8e79f · df8e79f
1 parent e80e4e3
commit df8e79f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/firmware/common/cpld_update.cpp b/firmware/common/cpld_update.cpp
@@ -33,7 +33,7 @@
 namespace portapack {
 namespace cpld {
 
-uint32_t update_if_necessary(
+CpldUpdateStatus update_if_necessary(
 	const Config config
 ) {
 	jtag::GPIOTarget target {
@@ -51,7 +51,7 @@ uint32_t update_if_necessary(
 
 	/* Run-Test/Idle */
 	if( !cpld.idcode_ok() ) {
-		return 1;
+		return CpldUpdateStatus::Idcode_check_failed;
 	}
 
 	cpld.sample();
@@ -62,7 +62,7 @@ uint32_t update_if_necessary(
 	 * in passive state.
 	 */
 	if( !cpld.silicon_id_ok() ) {
-		return 2;
+		return CpldUpdateStatus::Silicon_id_check_failed;
 	}
 
 	/* Verify CPLD contents against current bitstream. */
@@ -86,7 +86,7 @@ uint32_t update_if_necessary(
 		cpld.disable();
 	}
 
-	return ok ? 0 : 3;
+	return ok ? CpldUpdateStatus::Success : CpldUpdateStatus::Program_failed;
 }
 
 } /* namespace cpld */

diff --git a/firmware/common/cpld_update.hpp b/firmware/common/cpld_update.hpp
@@ -27,8 +27,14 @@
 namespace portapack {
 namespace cpld {
 
-
-uint32_t update_if_necessary(
+enum class CpldUpdateStatus {
+	Success = 0,
+	Idcode_check_failed = 1,
+	Silicon_id_check_failed = 2,
+	Program_failed = 3
+};
+
+CpldUpdateStatus update_if_necessary(
 	const Config config
 );