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

Merge pull request #397 from schneider42/rad1o-fixes

Browse Source 
rad1o fixes
This commit is contained in:
Dominic Spill
2017-08-05 18:08:16 +02:00
committed by GitHub
parent 90d3f7f293 1acd7ccf7c
commit ded4258105
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/common/hackrf_core.c
View File

@ -99,7 +99,7 @@ static struct gpio_t gpio_rx_amp = GPIO(1, 11);
static struct gpio_t gpio_no_rx_amp_pwr = GPIO(1, 12); static struct gpio_t gpio_no_rx_amp_pwr = GPIO(1, 12);
#endif #endif
#ifdef RAD1O #ifdef RAD1O
static struct gpio_t gpio_tx_rx_n = GPIO(0, 11); static struct gpio_t gpio_tx_rx_n = GPIO(1, 11);
static struct gpio_t gpio_tx_rx = GPIO(0, 14); static struct gpio_t gpio_tx_rx = GPIO(0, 14);
static struct gpio_t gpio_by_mix = GPIO(1, 12); static struct gpio_t gpio_by_mix = GPIO(1, 12);
static struct gpio_t gpio_by_mix_n = GPIO(2, 10); static struct gpio_t gpio_by_mix_n = GPIO(2, 10);
@ -648,12 +648,6 @@ void cpu_clock_init(void)
// CCU2_CLK_APLL_CFG = 0; // CCU2_CLK_APLL_CFG = 0;
// CCU2_CLK_SDIO_CFG = 0; // CCU2_CLK_SDIO_CFG = 0;
#endif #endif
#ifdef RAD1O
/* Disable unused clock outputs. They generate noise. */
scu_pinmux(CLK0, SCU_CLK_IN | SCU_CONF_FUNCTION7);
scu_pinmux(CLK2, SCU_CLK_IN | SCU_CONF_FUNCTION7);
#endif
} }
@ -816,6 +810,10 @@ void pin_setup(void) {
/* Safe state: start with VAA turned off: */ /* Safe state: start with VAA turned off: */
disable_rf_power(); disable_rf_power();
/* Disable unused clock outputs. They generate noise. */
scu_pinmux(CLK0, SCU_CLK_IN | SCU_CONF_FUNCTION7);
scu_pinmux(CLK2, SCU_CLK_IN | SCU_CONF_FUNCTION7);
scu_pinmux(SCU_PINMUX_GPIO3_10, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); scu_pinmux(SCU_PINMUX_GPIO3_10, SCU_GPIO_PDN | SCU_CONF_FUNCTION0);
scu_pinmux(SCU_PINMUX_GPIO3_11, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); scu_pinmux(SCU_PINMUX_GPIO3_11, SCU_GPIO_PDN | SCU_CONF_FUNCTION0);

4
firmware/common/mixer.c
View File

@ -118,7 +118,7 @@ void mixer_enable(mixer_driver_t* const mixer)
rffc5071_enable(mixer); rffc5071_enable(mixer);
#endif #endif
#ifdef RAD1O #ifdef RAD1O
(void) mixer; max2871_enable(mixer);
#endif #endif
} }
@ -128,7 +128,7 @@ void mixer_disable(mixer_driver_t* const mixer)
rffc5071_disable(mixer); rffc5071_disable(mixer);
#endif #endif
#ifdef RAD1O #ifdef RAD1O
(void) mixer; max2871_disable(mixer);
#endif #endif
} }