From e3f9e204c13e0e8c95c310765e407f9baaea6d6f Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Wed, 20 Nov 2013 13:22:19 -0800 Subject: [PATCH] Relocate SGPIO pin configuration -- it only needs to be done once. --- firmware/common/hackrf_core.c | 3 +++ firmware/common/sgpio.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index dc2f2013..d301731f 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -25,6 +25,7 @@ #include "si5351c.h" #include "max2837.h" #include "rffc5071.h" +#include "sgpio.h" #include #include #include @@ -588,6 +589,8 @@ void pin_setup(void) { /* Configure external clock in */ //scu_pinmux(P4_7, SCU_CLK_IN | SCU_CONF_FUNCTION1); + + sgpio_configure_pin_functions(); } void enable_1v8_power(void) { diff --git a/firmware/common/sgpio.c b/firmware/common/sgpio.c index 42dfb902..0449e8d2 100644 --- a/firmware/common/sgpio.c +++ b/firmware/common/sgpio.c @@ -63,8 +63,6 @@ void sgpio_test_interface() { // Disable all counters during configuration SGPIO_CTRL_ENABLE = 0; - sgpio_configure_pin_functions(); - // Make all SGPIO controlled by SGPIO's "GPIO" registers for (uint_fast8_t i = 0; i < 16; i++) { SGPIO_OUT_MUX_CFG(i) = @@ -117,8 +115,6 @@ void sgpio_configure( // Disable all counters during configuration SGPIO_CTRL_ENABLE = 0; - sgpio_configure_pin_functions(); - // Set SGPIO output values. const uint_fast8_t cpld_direction = (direction == SGPIO_DIRECTION_TX) ? 1 : 0;