From 0b46745aedd4b52e616733208e816db433951b93 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Thu, 27 Dec 2018 15:14:52 -0800
Subject: [PATCH] OperaCake code conflicts with PortaPack code, make
 compile-time conditional.

---
 firmware/common/tuning.c           |  2 ++
 firmware/hackrf_usb/CMakeLists.txt |  8 +++++++-
 firmware/hackrf_usb/hackrf_usb.c   | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c
index d4c27a5c..95ff7ed8 100644
--- a/firmware/common/tuning.c
+++ b/firmware/common/tuning.c
@@ -116,7 +116,9 @@ bool set_freq(const uint64_t freq)
 	if( success ) {
 		freq_cache = freq;
 		hackrf_ui_setFrequency(freq);
+#ifndef USER_INTERFACE_PORTAPACK
 		operacake_set_range(freq_mhz);
+#endif
 	}
 	return success;
 }
diff --git a/firmware/hackrf_usb/CMakeLists.txt b/firmware/hackrf_usb/CMakeLists.txt
index 820ec089..d950535d 100644
--- a/firmware/hackrf_usb/CMakeLists.txt
+++ b/firmware/hackrf_usb/CMakeLists.txt
@@ -42,7 +42,6 @@ set(SRC_M4
 	usb_api_register.c
 	usb_api_spiflash.c
 	usb_api_transceiver.c
-	"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
 	usb_api_operacake.c
 	usb_api_sweep.c
 	"${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c"
@@ -54,4 +53,11 @@ set(SRC_M4
 	"${PATH_HACKRF_FIRMWARE_COMMON}/rom_iap.c"
 )
 
+if(NOT USER_INTERFACE STREQUAL "PORTAPACK")
+	SET(SRC_M4
+		${SRC_M4}
+		"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
+	)
+endif()
+
 DeclareTargets()
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index 280ad4b2..43d70142 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -85,15 +85,28 @@ static const usb_request_handler_fn vendor_request_handler[] = {
 	usb_vendor_request_set_freq_explicit,
 	usb_vendor_request_read_wcid,  // USB_WCID_VENDOR_REQ
 	usb_vendor_request_init_sweep,
+#ifdef USER_INTERFACE_PORTAPACK
+	NULL,
+	NULL,
+#else
 	usb_vendor_request_operacake_get_boards,
 	usb_vendor_request_operacake_set_ports,
+#endif
 	usb_vendor_request_set_hw_sync_mode,
 	usb_vendor_request_reset,
+#ifdef USER_INTERFACE_PORTAPACK
+	NULL,
+#else
 	usb_vendor_request_operacake_set_ranges,
+#endif
 	usb_vendor_request_set_clkout_enable,
 	usb_vendor_request_spiflash_status,
 	usb_vendor_request_spiflash_clear_status,
+#ifdef USER_INTERFACE_PORTAPACK
+	NULL
+#else
 	usb_vendor_request_operacake_gpio_test
+#endif
 };
 
 static const uint32_t vendor_request_handler_count =
@@ -198,7 +211,10 @@ int main(void) {
 	usb_run(&usb_device);
 	
 	rf_path_init(&rf_path);
+
+#ifndef USER_INTERFACE_PORTAPACK
 	operacake_init();
+#endif
 
 	unsigned int phase = 0;