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

Clean up switchctrl code a bit -- redundant #ifdefs and complex if conditions.

Browse Source
This commit is contained in:
Jared Boone
2013-09-07 20:20:48 -07:00
parent bafe97e302
commit d65314db37
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/hackrf_usb/hackrf_usb.c
View File

@ -102,15 +102,13 @@ void update_switches(void)
#ifdef JAWBREAKER #ifdef JAWBREAKER
/* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */ /* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */
switchctrl &= (SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_HP | SWITCHCTRL_MIX_BYPASS); 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_RX_AMP_PWR;
switchctrl |= SWITCHCTRL_NO_TX_AMP_PWR; switchctrl |= SWITCHCTRL_NO_TX_AMP_PWR;
rffc5071_set_gpo(switchctrl); rffc5071_set_gpo(switchctrl);
#endif
#ifdef JAWBREAKER
/* honor SWITCHCTRL_MIX_BYPASS setting from caller */ /* honor SWITCHCTRL_MIX_BYPASS setting from caller */
if ((switchctrl & SWITCHCTRL_MIX_BYPASS) == SWITCHCTRL_MIX_BYPASS) if (switchctrl & SWITCHCTRL_MIX_BYPASS)
rffc5071_disable(); rffc5071_disable();
else else
#endif #endif
@ -120,15 +118,13 @@ void update_switches(void)
#ifdef JAWBREAKER #ifdef JAWBREAKER
/* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */ /* honor SWITCHCTRL_AMP_BYPASS and SWITCHCTRL_HP settings from caller */
switchctrl &= (SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_HP | SWITCHCTRL_MIX_BYPASS); 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_NO_TX_AMP_PWR;
switchctrl |= (SWITCHCTRL_TX | SWITCHCTRL_NO_RX_AMP_PWR); switchctrl |= (SWITCHCTRL_TX | SWITCHCTRL_NO_RX_AMP_PWR);
rffc5071_set_gpo(switchctrl); rffc5071_set_gpo(switchctrl);
#endif
#ifdef JAWBREAKER
/* honor SWITCHCTRL_MIX_BYPASS setting from caller */ /* honor SWITCHCTRL_MIX_BYPASS setting from caller */
if ((switchctrl & SWITCHCTRL_MIX_BYPASS) == SWITCHCTRL_MIX_BYPASS) if (switchctrl & SWITCHCTRL_MIX_BYPASS)
rffc5071_disable(); rffc5071_disable();
else else
#endif #endif