FreeCalypso > hg > fc-magnetite
comparison src/g23m-aci/aci/ati_audio.c @ 600:8f50b202e81f
board preprocessor conditionals: prep for more FC hw in the future
This change eliminates the CONFIG_TARGET_FCDEV3B preprocessor symbol and
all preprocessor conditionals throughout the code base that tested for it,
replacing them with CONFIG_TARGET_FCFAM or CONFIG_TARGET_FCMODEM. These
new symbols are specified as follows:
CONFIG_TARGET_FCFAM is intended to cover all hardware designs created by
Mother Mychaela under the FreeCalypso trademark. This family will include
modem products (repackagings of the FCDEV3B, possibly with RFFE or even
RF transceiver changes), and also my desired FreeCalypso handset product.
CONFIG_TARGET_FCMODEM is intended to cover all FreeCalypso modem products
(which will be firmware-compatible with the FCDEV3B if they use TI Rita
transceiver, or will require a different fw build if we switch to one of
Silabs Aero transceivers), but not the handset product. Right now this
CONFIG_TARGET_FCMODEM preprocessor symbol is used to conditionalize
everything dealing with MCSI.
At the present moment the future of FC hardware evolution is still unknown:
it is not known whether we will ever have any beyond-FCDEV3B hardware at all
(contingent on uncertain funding), and if we do produce further FC hardware
designs, it is not known whether they will retain the same FIC modem core
(triband), if we are going to have a quadband design that still retains the
classic Rita transceiver, or if we are going to switch to Silabs Aero II
or some other transceiver. If we produce a quadband modem that still uses
Rita, it will run exactly the same fw as the FCDEV3B thanks to the way we
define TSPACT signals for the RF_FAM=12 && CONFIG_TARGET_FCFAM combination,
and the current fcdev3b build target will be renamed to fcmodem. OTOH, if
that putative quadband modem will be Aero-based, then it will require a
different fw build target, the fcdev3b target will stay as it is, and the
two targets will both define CONFIG_TARGET_FCFAM and CONFIG_TARGET_FCMODEM,
but will have different RF_FAM numbers. But no matter which way we are
going to evolve, it is not right to have conditionals on CONFIG_TARGET_FCDEV3B
in places like ACI, and the present change clears the way for future
evolution.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Mon, 01 Apr 2019 01:05:24 +0000 |
parents | f18b29e27be5 |
children | 92dbfa906f66 |
comparison
equal
deleted
inserted
replaced
599:4626d7a955de | 600:8f50b202e81f |
---|---|
67 #include "audio.h" /* Condat */ | 67 #include "audio.h" /* Condat */ |
68 | 68 |
69 #include "fc-target.cfg" | 69 #include "fc-target.cfg" |
70 #include "armio.h" | 70 #include "armio.h" |
71 | 71 |
72 #if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCDEV3B) | 72 #if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM) |
73 /* AT@SPKR - turn loudspeaker amplifier on or off */ | 73 /* AT@SPKR - turn loudspeaker amplifier on or off */ |
74 GLOBAL T_ATI_RSLT atAtSPKR ( char *cl, UBYTE srcId ) | 74 GLOBAL T_ATI_RSLT atAtSPKR ( char *cl, UBYTE srcId ) |
75 { | 75 { |
76 int state; | 76 int state; |
77 | 77 |
165 io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT); | 165 io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT); |
166 | 166 |
167 return (ATI_CMPL); | 167 return (ATI_CMPL); |
168 } | 168 } |
169 | 169 |
170 #ifdef CONFIG_TARGET_FCDEV3B | 170 #ifdef CONFIG_TARGET_FCMODEM |
171 extern UBYTE aci_digital_voice_autoswitch; | 171 extern UBYTE aci_digital_voice_autoswitch; |
172 | 172 |
173 /* AT@VPATH - configure digital voice path */ | 173 /* AT@VPATH - configure digital voice path */ |
174 GLOBAL T_ATI_RSLT atAtVPATH ( char *cl, UBYTE srcId ) | 174 GLOBAL T_ATI_RSLT atAtVPATH ( char *cl, UBYTE srcId ) |
175 { | 175 { |