From 6b5193198b9dbaa2a20c035579a78c619acaeff0 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Mon, 27 Jun 2022 12:27:03 +0100 Subject: [PATCH] Realign GPIO assignments with spaces rather than tabs. --- firmware/common/hackrf_core.c | 98 +++++++++++++++++------------------ firmware/common/mixer.c | 20 +++---- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index d5243c0d..fce7e8da 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -56,85 +56,85 @@ static struct gpio_t gpio_led[] = { #endif }; -static struct gpio_t gpio_1v8_enable = GPIO(3, 6); +static struct gpio_t gpio_1v8_enable = GPIO(3, 6); /* MAX2837 GPIO (XCVR_CTL) PinMux */ -static struct gpio_t gpio_max2837_select = GPIO(0, 15); -static struct gpio_t gpio_max2837_enable = GPIO(2, 6); -static struct gpio_t gpio_max2837_rx_enable = GPIO(2, 5); -static struct gpio_t gpio_max2837_tx_enable = GPIO(2, 4); +static struct gpio_t gpio_max2837_select = GPIO(0, 15); +static struct gpio_t gpio_max2837_enable = GPIO(2, 6); +static struct gpio_t gpio_max2837_rx_enable = GPIO(2, 5); +static struct gpio_t gpio_max2837_tx_enable = GPIO(2, 4); /* MAX5864 SPI chip select (AD_CS) GPIO PinMux */ -static struct gpio_t gpio_max5864_select = GPIO(2, 7); +static struct gpio_t gpio_max5864_select = GPIO(2, 7); /* RFFC5071 GPIO serial interface PinMux */ // #ifdef RAD1O -// static struct gpio_t gpio_rffc5072_select = GPIO(2, 13); -// static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6); -// static struct gpio_t gpio_rffc5072_data = GPIO(3, 3); -// static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14); +// static struct gpio_t gpio_rffc5072_select = GPIO(2, 13); +// static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6); +// static struct gpio_t gpio_rffc5072_data = GPIO(3, 3); +// static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14); // #endif /* RF supply (VAA) control */ #ifdef HACKRF_ONE -static struct gpio_t gpio_vaa_disable = GPIO(2, 9); +static struct gpio_t gpio_vaa_disable = GPIO(2, 9); #endif #ifdef RAD1O -static struct gpio_t gpio_vaa_enable = GPIO(2, 9); +static struct gpio_t gpio_vaa_enable = GPIO(2, 9); #endif -static struct gpio_t gpio_w25q80bv_hold = GPIO(1, 14); -static struct gpio_t gpio_w25q80bv_wp = GPIO(1, 15); -static struct gpio_t gpio_w25q80bv_select = GPIO(5, 11); +static struct gpio_t gpio_w25q80bv_hold = GPIO(1, 14); +static struct gpio_t gpio_w25q80bv_wp = GPIO(1, 15); +static struct gpio_t gpio_w25q80bv_select = GPIO(5, 11); /* RF switch control */ #ifdef HACKRF_ONE -static struct gpio_t gpio_hp = GPIO(2, 0); -static struct gpio_t gpio_lp = GPIO(2, 10); -static struct gpio_t gpio_tx_mix_bp = GPIO(2, 11); -static struct gpio_t gpio_no_mix_bypass = GPIO(1, 0); -static struct gpio_t gpio_rx_mix_bp = GPIO(2, 12); -static struct gpio_t gpio_tx_amp = GPIO(2, 15); -static struct gpio_t gpio_tx = GPIO(5, 15); -static struct gpio_t gpio_mix_bypass = GPIO(5, 16); -static struct gpio_t gpio_rx = GPIO(5, 5); -static struct gpio_t gpio_no_tx_amp_pwr = GPIO(3, 5); -static struct gpio_t gpio_amp_bypass = GPIO(0, 14); -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_hp = GPIO(2, 0); +static struct gpio_t gpio_lp = GPIO(2, 10); +static struct gpio_t gpio_tx_mix_bp = GPIO(2, 11); +static struct gpio_t gpio_no_mix_bypass = GPIO(1, 0); +static struct gpio_t gpio_rx_mix_bp = GPIO(2, 12); +static struct gpio_t gpio_tx_amp = GPIO(2, 15); +static struct gpio_t gpio_tx = GPIO(5, 15); +static struct gpio_t gpio_mix_bypass = GPIO(5, 16); +static struct gpio_t gpio_rx = GPIO(5, 5); +static struct gpio_t gpio_no_tx_amp_pwr = GPIO(3, 5); +static struct gpio_t gpio_amp_bypass = GPIO(0, 14); +static struct gpio_t gpio_rx_amp = GPIO(1, 11); +static struct gpio_t gpio_no_rx_amp_pwr = GPIO(1, 12); #endif #ifdef RAD1O -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_by_mix = GPIO(1, 12); -static struct gpio_t gpio_by_mix_n = GPIO(2, 10); -static struct gpio_t gpio_by_amp = GPIO(1, 0); -static struct gpio_t gpio_by_amp_n = GPIO(5, 5); -static struct gpio_t gpio_mixer_en = GPIO(5, 16); -static struct gpio_t gpio_low_high_filt = GPIO(2, 11); -static struct gpio_t gpio_low_high_filt_n = GPIO(2, 12); -static struct gpio_t gpio_tx_amp = GPIO(2, 15); -static struct gpio_t gpio_rx_lna = GPIO(5, 15); +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_by_mix = GPIO(1, 12); +static struct gpio_t gpio_by_mix_n = GPIO(2, 10); +static struct gpio_t gpio_by_amp = GPIO(1, 0); +static struct gpio_t gpio_by_amp_n = GPIO(5, 5); +static struct gpio_t gpio_mixer_en = GPIO(5, 16); +static struct gpio_t gpio_low_high_filt = GPIO(2, 11); +static struct gpio_t gpio_low_high_filt_n = GPIO(2, 12); +static struct gpio_t gpio_tx_amp = GPIO(2, 15); +static struct gpio_t gpio_rx_lna = GPIO(5, 15); #endif /* CPLD JTAG interface GPIO pins */ -static struct gpio_t gpio_cpld_tdo = GPIO(5, 18); -static struct gpio_t gpio_cpld_tck = GPIO(3, 0); +static struct gpio_t gpio_cpld_tdo = GPIO(5, 18); +static struct gpio_t gpio_cpld_tck = GPIO(3, 0); #if (defined HACKRF_ONE || defined RAD1O) -static struct gpio_t gpio_cpld_tms = GPIO(3, 4); -static struct gpio_t gpio_cpld_tdi = GPIO(3, 1); +static struct gpio_t gpio_cpld_tms = GPIO(3, 4); +static struct gpio_t gpio_cpld_tdi = GPIO(3, 1); #else -static struct gpio_t gpio_cpld_tms = GPIO(3, 1); -static struct gpio_t gpio_cpld_tdi = GPIO(3, 4); +static struct gpio_t gpio_cpld_tms = GPIO(3, 1); +static struct gpio_t gpio_cpld_tdi = GPIO(3, 4); #endif #ifdef HACKRF_ONE -static struct gpio_t gpio_cpld_pp_tms = GPIO(1, 1); -static struct gpio_t gpio_cpld_pp_tdo = GPIO(1, 8); +static struct gpio_t gpio_cpld_pp_tms = GPIO(1, 1); +static struct gpio_t gpio_cpld_pp_tdo = GPIO(1, 8); #endif -static struct gpio_t gpio_hw_sync_enable = GPIO(5,12); -static struct gpio_t gpio_rx_q_invert = GPIO(0, 13); +static struct gpio_t gpio_hw_sync_enable = GPIO(5,12); +static struct gpio_t gpio_rx_q_invert = GPIO(0, 13); i2c_bus_t i2c0 = { .obj = (void*)I2C0_BASE, diff --git a/firmware/common/mixer.c b/firmware/common/mixer.c index 5db296bf..6d2b5870 100644 --- a/firmware/common/mixer.c +++ b/firmware/common/mixer.c @@ -6,18 +6,18 @@ /* RFFC5071 GPIO serial interface PinMux */ #if (defined JAWBREAKER || defined HACKRF_ONE) -static struct gpio_t gpio_rffc5072_select = GPIO(2, 13); -static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6); -static struct gpio_t gpio_rffc5072_data = GPIO(3, 3); -static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14); +static struct gpio_t gpio_rffc5072_select = GPIO(2, 13); +static struct gpio_t gpio_rffc5072_clock = GPIO(5, 6); +static struct gpio_t gpio_rffc5072_data = GPIO(3, 3); +static struct gpio_t gpio_rffc5072_reset = GPIO(2, 14); #endif #ifdef RAD1O -static struct gpio_t gpio_vco_ce = GPIO(2, 13); -static struct gpio_t gpio_vco_sclk = GPIO(5, 6); -static struct gpio_t gpio_vco_sdata = GPIO(3, 3); -static struct gpio_t gpio_vco_le = GPIO(2, 14); -static struct gpio_t gpio_vco_mux = GPIO(5, 25); -static struct gpio_t gpio_synt_rfout_en = GPIO(3, 5); +static struct gpio_t gpio_vco_ce = GPIO(2, 13); +static struct gpio_t gpio_vco_sclk = GPIO(5, 6); +static struct gpio_t gpio_vco_sdata = GPIO(3, 3); +static struct gpio_t gpio_vco_le = GPIO(2, 14); +static struct gpio_t gpio_vco_mux = GPIO(5, 25); +static struct gpio_t gpio_synt_rfout_en = GPIO(3, 5); #endif #if (defined JAWBREAKER || defined HACKRF_ONE)