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

CMake: Fix blinky and rad1o dependencies and PortaPack-related breakage.

Browse Source
This commit is contained in:
Jared Boone
2019-03-01 17:16:46 -08:00
parent 8bc8bc13f0
commit 4fefd829ba
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/common/hackrf-ui.c
View File

@ -59,12 +59,16 @@ static const hackrf_ui_t hackrf_ui_null = {
&hackrf_ui_set_antenna_bias_null, &hackrf_ui_set_antenna_bias_null,
}; };
const hackrf_ui_t* portapack_detect(void) __attribute__((weak));
static const hackrf_ui_t* ui = NULL; static const hackrf_ui_t* ui = NULL;
const hackrf_ui_t* hackrf_ui(void) { const hackrf_ui_t* hackrf_ui(void) {
/* Detect on first use. If no UI hardware is detected, use a stub function table. */ /* Detect on first use. If no UI hardware is detected, use a stub function table. */
if( ui == NULL ) { if( ui == NULL ) {
if( portapack_detect ) {
ui = portapack_detect(); ui = portapack_detect();
}
if( ui == NULL ) { if( ui == NULL ) {
ui = &hackrf_ui_null; ui = &hackrf_ui_null;
} }

7
firmware/hackrf-common.cmake
View File

@ -127,6 +127,7 @@ macro(DeclareTargets)
${PATH_HACKRF_FIRMWARE_COMMON}/spi_bus.c ${PATH_HACKRF_FIRMWARE_COMMON}/spi_bus.c
${PATH_HACKRF_FIRMWARE_COMMON}/spi_ssp.c ${PATH_HACKRF_FIRMWARE_COMMON}/spi_ssp.c
${PATH_HACKRF_FIRMWARE_COMMON}/gpio_lpc.c ${PATH_HACKRF_FIRMWARE_COMMON}/gpio_lpc.c
${PATH_HACKRF_FIRMWARE_COMMON}/hackrf-ui.c
) )
if(BOARD STREQUAL "RAD1O") if(BOARD STREQUAL "RAD1O")
@ -140,12 +141,6 @@ macro(DeclareTargets)
${SRC_M4} ${SRC_M4}
${PATH_HACKRF_FIRMWARE_COMMON}/rffc5071.c ${PATH_HACKRF_FIRMWARE_COMMON}/rffc5071.c
${PATH_HACKRF_FIRMWARE_COMMON}/rffc5071_spi.c ${PATH_HACKRF_FIRMWARE_COMMON}/rffc5071_spi.c
${PATH_HACKRF_FIRMWARE_COMMON}/cpld_jtag.c
${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/lenval.c
${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/micro.c
${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/ports.c
${PATH_HACKRF_FIRMWARE_COMMON}/hackrf-ui.c
${PATH_HACKRF_FIRMWARE_COMMON}/ui_portapack.c
) )
endif() endif()

11
firmware/hackrf_usb/CMakeLists.txt
View File

@ -46,10 +46,21 @@ set(SRC_M4
usb_api_sweep.c usb_api_sweep.c
"${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c" "${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/fault_handler.c" "${PATH_HACKRF_FIRMWARE_COMMON}/fault_handler.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/cpld_jtag.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/cpld_xc2c.c" "${PATH_HACKRF_FIRMWARE_COMMON}/cpld_xc2c.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/lenval.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/micro.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/ports.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/crc.c" "${PATH_HACKRF_FIRMWARE_COMMON}/crc.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/rom_iap.c" "${PATH_HACKRF_FIRMWARE_COMMON}/rom_iap.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c" "${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
) )
if(NOT BOARD STREQUAL "RAD1O")
SET(SRC_M4
${SRC_M4}
"${PATH_HACKRF_FIRMWARE_COMMON}/ui_portapack.c"
)
endif()
DeclareTargets() DeclareTargets()