Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OperaCake code conflicts with PortaPack code, make compile-time conditional.

Browse Source
This commit is contained in:
Jared Boone
2018-12-27 15:14:52 -08:00
parent d8f579af2b
commit 0b46745aed
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/common/tuning.c
View File

@ -116,7 +116,9 @@ bool set_freq(const uint64_t freq)
if( success ) { if( success ) {
freq_cache = freq; freq_cache = freq;
hackrf_ui_setFrequency(freq); hackrf_ui_setFrequency(freq);
#ifndef USER_INTERFACE_PORTAPACK
operacake_set_range(freq_mhz); operacake_set_range(freq_mhz);
#endif
} }
return success; return success;
} }

8
firmware/hackrf_usb/CMakeLists.txt
View File

@ -42,7 +42,6 @@ set(SRC_M4
usb_api_register.c usb_api_register.c
usb_api_spiflash.c usb_api_spiflash.c
usb_api_transceiver.c usb_api_transceiver.c
"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
usb_api_operacake.c usb_api_operacake.c
usb_api_sweep.c usb_api_sweep.c
"${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c" "${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c"
@ -54,4 +53,11 @@ set(SRC_M4
"${PATH_HACKRF_FIRMWARE_COMMON}/rom_iap.c" "${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() DeclareTargets()

16
firmware/hackrf_usb/hackrf_usb.c
View File

@ -85,15 +85,28 @@ static const usb_request_handler_fn vendor_request_handler[] = {
usb_vendor_request_set_freq_explicit, usb_vendor_request_set_freq_explicit,
usb_vendor_request_read_wcid, // USB_WCID_VENDOR_REQ usb_vendor_request_read_wcid, // USB_WCID_VENDOR_REQ
usb_vendor_request_init_sweep, usb_vendor_request_init_sweep,
#ifdef USER_INTERFACE_PORTAPACK
NULL,
NULL,
#else
usb_vendor_request_operacake_get_boards, usb_vendor_request_operacake_get_boards,
usb_vendor_request_operacake_set_ports, usb_vendor_request_operacake_set_ports,
#endif
usb_vendor_request_set_hw_sync_mode, usb_vendor_request_set_hw_sync_mode,
usb_vendor_request_reset, usb_vendor_request_reset,
#ifdef USER_INTERFACE_PORTAPACK
NULL,
#else
usb_vendor_request_operacake_set_ranges, usb_vendor_request_operacake_set_ranges,
#endif
usb_vendor_request_set_clkout_enable, usb_vendor_request_set_clkout_enable,
usb_vendor_request_spiflash_status, usb_vendor_request_spiflash_status,
usb_vendor_request_spiflash_clear_status, usb_vendor_request_spiflash_clear_status,
#ifdef USER_INTERFACE_PORTAPACK
NULL
#else
usb_vendor_request_operacake_gpio_test usb_vendor_request_operacake_gpio_test
#endif
}; };
static const uint32_t vendor_request_handler_count = static const uint32_t vendor_request_handler_count =
@ -198,7 +211,10 @@ int main(void) {
usb_run(&usb_device); usb_run(&usb_device);
rf_path_init(&rf_path); rf_path_init(&rf_path);
#ifndef USER_INTERFACE_PORTAPACK
operacake_init(); operacake_init();
#endif
unsigned int phase = 0; unsigned int phase = 0;