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

ifdef out HackRF One rf path pins for jawbreaker build

Browse Source
This commit is contained in:
Dominic Spill
2017-01-27 12:24:19 -07:00
parent 63db12053d
commit cb06ce9656
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/common/hackrf_core.c
View File

@ -99,9 +99,9 @@ static struct gpio_t gpio_sync_out_b = GPIO(3, 9);
#endif #endif
/* RF LDO control */ /* RF LDO control */
#ifdef JAWBREAKER // #ifdef JAWBREAKER
static struct gpio_t gpio_rf_ldo_enable = GPIO(2, 9); // static struct gpio_t gpio_rf_ldo_enable = GPIO(2, 9);
#endif // #endif
/* RF supply (VAA) control */ /* RF supply (VAA) control */
#ifdef HACKRF_ONE #ifdef HACKRF_ONE
@ -297,6 +297,7 @@ sgpio_config_t sgpio_config = {
rf_path_t rf_path = { rf_path_t rf_path = {
.switchctrl = 0, .switchctrl = 0,
#ifdef HACKRF_ONE
.gpio_hp = &gpio_hp, .gpio_hp = &gpio_hp,
.gpio_lp = &gpio_lp, .gpio_lp = &gpio_lp,
.gpio_tx_mix_bp = &gpio_tx_mix_bp, .gpio_tx_mix_bp = &gpio_tx_mix_bp,
@ -310,6 +311,7 @@ rf_path_t rf_path = {
.gpio_amp_bypass = &gpio_amp_bypass, .gpio_amp_bypass = &gpio_amp_bypass,
.gpio_rx_amp = &gpio_rx_amp, .gpio_rx_amp = &gpio_rx_amp,
.gpio_no_rx_amp_pwr = &gpio_no_rx_amp_pwr, .gpio_no_rx_amp_pwr = &gpio_no_rx_amp_pwr,
#endif
}; };
jtag_gpio_t jtag_gpio_cpld = { jtag_gpio_t jtag_gpio_cpld = {

3
firmware/common/rf_path.c
View File

@ -157,6 +157,7 @@ static void switchctrl_set_hackrf_one(rf_path_t* const rf_path, uint8_t ctrl) {
static void switchctrl_set(rf_path_t* const rf_path, const uint8_t gpo) { static void switchctrl_set(rf_path_t* const rf_path, const uint8_t gpo) {
#ifdef JAWBREAKER #ifdef JAWBREAKER
(void) rf_path; /* silence unused param warning */
rffc5071_set_gpo(&rffc5072, gpo); rffc5071_set_gpo(&rffc5072, gpo);
#elif HACKRF_ONE #elif HACKRF_ONE
switchctrl_set_hackrf_one(rf_path, gpo); switchctrl_set_hackrf_one(rf_path, gpo);
@ -205,6 +206,8 @@ void rf_path_pin_setup(rf_path_t* const rf_path) {
* power and enable both amp bypass and mixer bypass. * power and enable both amp bypass and mixer bypass.
*/ */
switchctrl_set(rf_path, SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_MIX_BYPASS); switchctrl_set(rf_path, SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_MIX_BYPASS);
#else
(void) rf_path; /* silence unused param warning */
#endif #endif
} }