From d7c162902c7d49e9098d153022e575ccc447d7fb Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Wed, 9 Dec 2015 22:26:16 +0100 Subject: [PATCH] fix(hackrf-ui): Make the calls weak --- firmware/common/hackrf-ui.h | 17 +++++++++++++++++ firmware/common/hackrf_core.c | 9 +-------- firmware/common/rf_path.c | 6 ------ firmware/common/tuning.c | 4 ---- firmware/hackrf_usb/hackrf_usb.c | 4 ---- firmware/hackrf_usb/usb_api_transceiver.c | 8 -------- 6 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 firmware/common/hackrf-ui.h diff --git a/firmware/common/hackrf-ui.h b/firmware/common/hackrf-ui.h new file mode 100644 index 00000000..95b82489 --- /dev/null +++ b/firmware/common/hackrf-ui.h @@ -0,0 +1,17 @@ +#ifndef HACKRF_UI_H +#define HACKRF_UI_H + +#include +#include + +void hackrf_ui_init(void) __attribute__((weak)); +void hackrf_ui_setFrequency(uint64_t _freq) __attribute__((weak)); +void hackrf_ui_setSampleRate(uint32_t _sample_rate) __attribute__((weak)); +void hackrf_ui_setDirection(const rf_path_direction_t _direction) __attribute__((weak)); +void hackrf_ui_setFilterBW(uint32_t bw) __attribute__((weak)); +void hackrf_ui_setLNAPower(bool _lna_on) __attribute__((weak)); +void hackrf_ui_setBBLNAGain(const uint32_t gain_db) __attribute__((weak)); +void hackrf_ui_setBBVGAGain(const uint32_t gain_db) __attribute__((weak)); +void hackrf_ui_setBBTXVGAGain(const uint32_t gain_db) __attribute__((weak)); + +#endif diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index 639b8e70..bc5f5084 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -28,9 +28,7 @@ #include "sgpio.h" #include "rf_path.h" -#if HACKRF_ENABLE_UI #include "hackrf-ui.h" -#endif #include #include @@ -91,9 +89,7 @@ bool sample_rate_frac_set(uint32_t rate_num, uint32_t rate_denom) uint32_t a, b, c; uint32_t rem; -#if HACKRF_ENABLE_UI hackrf_ui_setSampleRate(rate_num/2); -#endif /* Find best config */ a = (VCO_FREQ * rate_denom) / rate_num; @@ -179,9 +175,7 @@ bool sample_rate_set(const uint32_t sample_rate_hz) { return false; } -#if HACKRF_ENABLE_UI hackrf_ui_setSampleRate(sample_rate_hz); -#endif /* NOTE: Because MS1, 2, 3 outputs are slaved to PLLA, the p1, p2, p3 * values are irrelevant. */ @@ -262,12 +256,11 @@ bool sample_rate_set(const uint32_t sample_rate_hz) { #endif } + bool baseband_filter_bandwidth_set(const uint32_t bandwidth_hz) { uint32_t bandwidth_hz_real = max2837_set_lpf_bandwidth(bandwidth_hz); -#if HACKRF_ENABLE_UI if(bandwidth_hz_real) hackrf_ui_setFilterBW(bandwidth_hz_real); -#endif return bandwidth_hz_real != 0; } diff --git a/firmware/common/rf_path.c b/firmware/common/rf_path.c index aacab246..2bc3e953 100644 --- a/firmware/common/rf_path.c +++ b/firmware/common/rf_path.c @@ -27,9 +27,7 @@ #include -#if HACKRF_ENABLE_UI #include "hackrf-ui.h" -#endif #include #include @@ -398,9 +396,7 @@ void rf_path_set_direction(const rf_path_direction_t direction) { switchctrl_set(switchctrl); -#if HACKRF_ENABLE_UI hackrf_ui_setDirection(direction); -#endif } void rf_path_set_filter(const rf_path_filter_t filter) { @@ -444,9 +440,7 @@ void rf_path_set_lna(const uint_fast8_t enable) { switchctrl_set(switchctrl); -#if HACKRF_ENABLE_UI hackrf_ui_setLNAPower(enable); -#endif } /* antenna port power control */ diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c index 5c51267f..a6ec5b36 100644 --- a/firmware/common/tuning.c +++ b/firmware/common/tuning.c @@ -22,9 +22,7 @@ #include "tuning.h" -#if HACKRF_ENABLE_UI #include "hackrf-ui.h" -#endif #include #include @@ -112,9 +110,7 @@ bool set_freq(const uint64_t freq) max2837_set_mode(prior_max2837_mode); if( success ) { freq_cache = freq; -#if HACKRF_ENABLE_UI hackrf_ui_setFrequency(freq); -#endif } return success; } diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c index 05e82376..66cd23b2 100644 --- a/firmware/hackrf_usb/hackrf_usb.c +++ b/firmware/hackrf_usb/hackrf_usb.c @@ -49,9 +49,7 @@ #include "si5351c.h" #include "w25q80bv.h" -#if HACKRF_ENABLE_UI #include "hackrf-ui.h" -#endif static volatile transceiver_mode_t _transceiver_mode = TRANSCEIVER_MODE_OFF; @@ -259,9 +257,7 @@ int main(void) { nvic_set_priority(NVIC_USB0_IRQ, 255); -#if HACKRF_ENABLE_UI hackrf_ui_init(); -#endif usb_run(&usb_device); diff --git a/firmware/hackrf_usb/usb_api_transceiver.c b/firmware/hackrf_usb/usb_api_transceiver.c index 20357260..a5cb22bc 100644 --- a/firmware/hackrf_usb/usb_api_transceiver.c +++ b/firmware/hackrf_usb/usb_api_transceiver.c @@ -24,9 +24,7 @@ #include -#if HACKRF_ENABLE_UI #include "hackrf-ui.h" -#endif #include #include @@ -151,9 +149,7 @@ usb_request_status_t usb_vendor_request_set_lna_gain( if( stage == USB_TRANSFER_STAGE_SETUP ) { const uint8_t value = max2837_set_lna_gain(endpoint->setup.index); endpoint->buffer[0] = value; -#if HACKRF_ENABLE_UI if(value) hackrf_ui_setBBLNAGain(endpoint->setup.index); -#endif usb_transfer_schedule_block(endpoint->in, &endpoint->buffer, 1, NULL, NULL); usb_transfer_schedule_ack(endpoint->out); @@ -168,9 +164,7 @@ usb_request_status_t usb_vendor_request_set_vga_gain( if( stage == USB_TRANSFER_STAGE_SETUP ) { const uint8_t value = max2837_set_vga_gain(endpoint->setup.index); endpoint->buffer[0] = value; -#if HACKRF_ENABLE_UI if(value) hackrf_ui_setBBVGAGain(endpoint->setup.index); -#endif usb_transfer_schedule_block(endpoint->in, &endpoint->buffer, 1, NULL, NULL); usb_transfer_schedule_ack(endpoint->out); @@ -185,9 +179,7 @@ usb_request_status_t usb_vendor_request_set_txvga_gain( if( stage == USB_TRANSFER_STAGE_SETUP ) { const uint8_t value = max2837_set_txvga_gain(endpoint->setup.index); endpoint->buffer[0] = value; -#if HACKRF_ENABLE_UI if(value) hackrf_ui_setBBTXVGAGain(endpoint->setup.index); -#endif usb_transfer_schedule_block(endpoint->in, &endpoint->buffer, 1, NULL, NULL); usb_transfer_schedule_ack(endpoint->out);