From b4600148116b0aaeb91291d3c8bd7c50977dbde2 Mon Sep 17 00:00:00 2001
From: Martin Ling <martin-git@earth.li>
Date: Wed, 13 May 2026 21:52:51 +0100
Subject: [PATCH] Move cpld_jtag_sram_load() into cpld_jtag.c.

---
 firmware/common/cpld_jtag.c      | 13 +++++++++++++
 firmware/common/cpld_jtag.h      |  1 +
 firmware/hackrf_usb/hackrf_usb.c | 15 ---------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/firmware/common/cpld_jtag.c b/firmware/common/cpld_jtag.c
index 441fefe8..4d313d01 100644
--- a/firmware/common/cpld_jtag.c
+++ b/firmware/common/cpld_jtag.c
@@ -21,6 +21,7 @@
 
 #include "cpld_jtag.h"
 
+#include "cpld_xc2c.h"
 #include "platform_detect.h"
 #ifdef IS_NOT_PRALINE
 	#include <stdint.h>
@@ -138,4 +139,16 @@ unsigned char cpld_jtag_get_next_byte(void)
 	xsvf_pos++;
 	return byte;
 }
+
+bool cpld_jtag_sram_load(jtag_t* const jtag)
+{
+	cpld_jtag_take(jtag);
+	cpld_xc2c64a_jtag_sram_write(jtag, &cpld_hackrf_program_sram);
+	const bool success = cpld_xc2c64a_jtag_sram_verify(
+		jtag,
+		&cpld_hackrf_program_sram,
+		&cpld_hackrf_verify);
+	cpld_jtag_release(jtag);
+	return success;
+}
 #endif
diff --git a/firmware/common/cpld_jtag.h b/firmware/common/cpld_jtag.h
index f49f1317..b9a4b52f 100644
--- a/firmware/common/cpld_jtag.h
+++ b/firmware/common/cpld_jtag.h
@@ -58,6 +58,7 @@ int cpld_jtag_program(
 	unsigned char* const buffer,
 	refill_buffer_cb refill);
 unsigned char cpld_jtag_get_next_byte(void);
+bool cpld_jtag_sram_load(jtag_t* const jtag);
 
 /* Driver instance. */
 extern jtag_gpio_t jtag_gpio_cpld;
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index 97863876..eb7f85c5 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -69,7 +69,6 @@
 #endif
 #ifdef IS_NOT_PRALINE
 	#include <cpld_jtag.h>
-	#include <cpld_xc2c.h>
 #endif
 
 #include "usb_api_adc.h"
@@ -261,20 +260,6 @@ void usb_set_descriptor_by_serial_number(void)
 	}
 }
 
-#ifdef IS_NOT_PRALINE
-static bool cpld_jtag_sram_load(jtag_t* const jtag)
-{
-	cpld_jtag_take(jtag);
-	cpld_xc2c64a_jtag_sram_write(jtag, &cpld_hackrf_program_sram);
-	const bool success = cpld_xc2c64a_jtag_sram_verify(
-		jtag,
-		&cpld_hackrf_program_sram,
-		&cpld_hackrf_verify);
-	cpld_jtag_release(jtag);
-	return success;
-}
-#endif
-
 static void m0_rom_to_ram(void)
 {
 	uint32_t* dest = &__ram_m0_start__;