From d65314db37cbf7cc293c18d4e09cb8aca8f40506 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sat, 7 Sep 2013 20:20:48 -0700 Subject: [PATCH] Clean up switchctrl code a bit -- redundant #ifdefs and complex if conditions. --- firmware/hackrf_usb/hackrf_usb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c index 525ce912..82092887 100644 --- a/firmware/hackrf_usb/hackrf_usb.c +++ b/firmware/hackrf_usb/hackrf_usb.c @@ -102,15 +102,13 @@ void update_switches(void) #ifdef JAWBREAKER /* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */ switchctrl &= (SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_HP | SWITCHCTRL_MIX_BYPASS); - if ((switchctrl & SWITCHCTRL_AMP_BYPASS) == SWITCHCTRL_AMP_BYPASS) + if (switchctrl & SWITCHCTRL_AMP_BYPASS) switchctrl |= SWITCHCTRL_NO_RX_AMP_PWR; switchctrl |= SWITCHCTRL_NO_TX_AMP_PWR; rffc5071_set_gpo(switchctrl); -#endif -#ifdef JAWBREAKER /* honor SWITCHCTRL_MIX_BYPASS setting from caller */ - if ((switchctrl & SWITCHCTRL_MIX_BYPASS) == SWITCHCTRL_MIX_BYPASS) + if (switchctrl & SWITCHCTRL_MIX_BYPASS) rffc5071_disable(); else #endif @@ -120,15 +118,13 @@ void update_switches(void) #ifdef JAWBREAKER /* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */ switchctrl &= (SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_HP | SWITCHCTRL_MIX_BYPASS); - if ((switchctrl & SWITCHCTRL_AMP_BYPASS) == SWITCHCTRL_AMP_BYPASS) + if (switchctrl & SWITCHCTRL_AMP_BYPASS) switchctrl |= SWITCHCTRL_NO_TX_AMP_PWR; switchctrl |= (SWITCHCTRL_TX | SWITCHCTRL_NO_RX_AMP_PWR); rffc5071_set_gpo(switchctrl); -#endif -#ifdef JAWBREAKER /* honor SWITCHCTRL_MIX_BYPASS setting from caller */ - if ((switchctrl & SWITCHCTRL_MIX_BYPASS) == SWITCHCTRL_MIX_BYPASS) + if (switchctrl & SWITCHCTRL_MIX_BYPASS) rffc5071_disable(); else #endif