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

fix(sgpio): Update rad1o update_q_invert gpio access

Browse Source
This commit is contained in:
schneider
2017-01-27 20:51:44 +01:00
parent fb2057cd09
commit f063f87c49
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/common/sgpio.c
View File

@ -28,7 +28,7 @@
#include <sgpio.h> #include <sgpio.h>
#ifdef RAD1O #ifdef RAD1O
static void update_q_invert(void); static void update_q_invert(sgpio_config_t* const config);
#endif #endif
void sgpio_configure_pin_functions(sgpio_config_t* const config) { void sgpio_configure_pin_functions(sgpio_config_t* const config) {
@ -95,7 +95,7 @@ void sgpio_configure(
#ifdef RAD1O #ifdef RAD1O
// The data direction might have changed. Check if we need to // The data direction might have changed. Check if we need to
// adjust the q inversion. // adjust the q inversion.
update_q_invert(); update_q_invert(config);
#endif #endif
// Enable SGPIO pin outputs. // Enable SGPIO pin outputs.
@ -291,22 +291,20 @@ static bool sgpio_invert = false;
* Called when TX/RX changes od sgpio_cpld_stream_rx_set_q_invert * Called when TX/RX changes od sgpio_cpld_stream_rx_set_q_invert
* gets called. * gets called.
*/ */
static void update_q_invert(void) { static void update_q_invert(sgpio_config_t* const config) {
#if 0 //XXX
/* 1=Output SGPIO11 High(TX mode), 0=Output SGPIO11 Low(RX mode)*/ /* 1=Output SGPIO11 High(TX mode), 0=Output SGPIO11 Low(RX mode)*/
bool tx_mode = (SGPIO_GPIO_OUTREG & (1 << 11)) > 0; bool tx_mode = (SGPIO_GPIO_OUTREG & (1 << 11)) > 0;
// 0.13: P1_18 // 0.13: P1_18
if( !sgpio_invert & !tx_mode) { if( !sgpio_invert & !tx_mode) {
GPIO_SET(GPIO0) = GPIOPIN13; gpio_write(config->gpio_rx_q_invert, 1);
} else if( !sgpio_invert & tx_mode) { } else if( !sgpio_invert & tx_mode) {
GPIO_CLR(GPIO0) = GPIOPIN13; gpio_write(config->gpio_rx_q_invert, 0);
} else if( sgpio_invert & !tx_mode) { } else if( sgpio_invert & !tx_mode) {
GPIO_CLR(GPIO0) = GPIOPIN13; gpio_write(config->gpio_rx_q_invert, 0);
} else if( sgpio_invert & tx_mode) { } else if( sgpio_invert & tx_mode) {
GPIO_SET(GPIO0) = GPIOPIN13; gpio_write(config->gpio_rx_q_invert, 1);
} }
#endif
} }
void sgpio_cpld_stream_rx_set_q_invert(sgpio_config_t* const config, const uint_fast8_t invert) { void sgpio_cpld_stream_rx_set_q_invert(sgpio_config_t* const config, const uint_fast8_t invert) {
@ -316,7 +314,7 @@ void sgpio_cpld_stream_rx_set_q_invert(sgpio_config_t* const config, const uint_
sgpio_invert = false; sgpio_invert = false;
} }
update_q_invert(); update_q_invert(config);
} }
#else #else