comparison src/cs/layer1/include/l1_confg.h @ 273:5caa86ee2cfa

enable L1_NEW_AEC in l1_confg.h (bold change) The AEC function implemented in DSP ROM 3606 on the Calypso silicon we work with is the one that corresponds to L1_NEW_AEC; the same holds for DSP 34 and even for DSP 33 with more recent patch versions. However, TI shipped their TCS211 reference fw with L1_NEW_AEC set to 0, thus driving AEC the old way if anyone tried to enable it, either via AT%Nxxxx or via the audio mode facility. As a result, the fw would try to control features which no longer exist in the DSP (long vs short echo and the old echo suppression level bits), while providing no way to tune the 8 new parameter words added to the DSP's NDB page. The only sensible solution is to bite the bullet and enable L1_NEW_AEC in L1 config, with fallout propagating into RiViera Audio Service T_AUDIO_AEC_CFG structure and into /aud/*.cfg binary file format. The latter fallout will be addressed in further code changes.
author Mychaela Falconia <falcon@freecalypso.org>
date Thu, 29 Jul 2021 18:32:40 +0000
parents 4e78acac3d88
children
comparison
equal deleted inserted replaced
272:edd8482a6576 273:5caa86ee2cfa
447 #define CLKMOD2 0x4116 // ...65 Mips pll free 447 #define CLKMOD2 0x4116 // ...65 Mips pll free
448 #define CLKSTART 0x29 // ...65 Mips 448 #define CLKSTART 0x29 // ...65 Mips
449 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips 449 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips
450 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs). 450 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs).
451 #define AEC 1 // AEC/NS not supported. 451 #define AEC 1 // AEC/NS not supported.
452 #if (OP_RIV_AUDIO == 0) 452 /* FreeCalypso change: enable L1_NEW_AEC to match DSP reality */
453 #define L1_NEW_AEC 1 453 /* with DSP ROM 33 our patch version 2140 must be used */
454 #else 454 #define L1_NEW_AEC 1
455 // Available but not yet tuned with Riviera AUDIO
456 #define L1_NEW_AEC 0
457 #endif
458 #if ((L1_NEW_AEC) && (!AEC)) 455 #if ((L1_NEW_AEC) && (!AEC))
459 // First undef the flag to avoid warnings at compilation time 456 // First undef the flag to avoid warnings at compilation time
460 #undef AEC 457 #undef AEC
461 #define AEC 1 458 #define AEC 1
462 #endif 459 #endif
555 #define CLKMOD2 0x4116 // ...65 Mips pll free 552 #define CLKMOD2 0x4116 // ...65 Mips pll free
556 #define CLKSTART 0x29 // ...65 Mips 553 #define CLKSTART 0x29 // ...65 Mips
557 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips 554 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips
558 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs). 555 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs).
559 #define AEC 1 // AEC/NS not supported. 556 #define AEC 1 // AEC/NS not supported.
560 #if (OP_RIV_AUDIO == 0) 557 /* FreeCalypso change: enable L1_NEW_AEC to match DSP reality */
561 #define L1_NEW_AEC 1 558 #define L1_NEW_AEC 1
562 #else
563 // Available but not yet tuned with Riviera AUDIO
564 #define L1_NEW_AEC 0
565 #endif
566 #if ((L1_NEW_AEC) && (!AEC)) 559 #if ((L1_NEW_AEC) && (!AEC))
567 // First undef the flag to avoid warnings at compilation time 560 // First undef the flag to avoid warnings at compilation time
568 #undef AEC 561 #undef AEC
569 #define AEC 1 562 #define AEC 1
570 #endif 563 #endif
660 #define CLKMOD2 0x4116 // ...65 Mips pll free 653 #define CLKMOD2 0x4116 // ...65 Mips pll free
661 #define CLKSTART 0x29 // ...65 Mips 654 #define CLKSTART 0x29 // ...65 Mips
662 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips 655 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips
663 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs). 656 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs).
664 #define AEC 1 // AEC/NS not supported. 657 #define AEC 1 // AEC/NS not supported.
665 #if (OP_RIV_AUDIO == 0) 658 /* FreeCalypso change: enable L1_NEW_AEC to match DSP reality */
666 #define L1_NEW_AEC 1 659 #define L1_NEW_AEC 1
667 #else
668 // Available but not yet tuned with Riviera AUDIO
669 #define L1_NEW_AEC 0
670 #endif
671 #if ((L1_NEW_AEC) && (!AEC)) 660 #if ((L1_NEW_AEC) && (!AEC))
672 // First undef the flag to avoid warnings at compilation time 661 // First undef the flag to avoid warnings at compilation time
673 #undef AEC 662 #undef AEC
674 #define AEC 1 663 #define AEC 1
675 #endif 664 #endif
767 #define CLKMOD2 0x4116 // ...65 Mips pll free 756 #define CLKMOD2 0x4116 // ...65 Mips pll free
768 #define CLKSTART 0x29 // ...65 Mips 757 #define CLKSTART 0x29 // ...65 Mips
769 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips 758 #define C_PLL_CONFIG 0x154 // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips
770 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs). 759 #define VOC FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs).
771 #define AEC 1 // AEC/NS not supported. 760 #define AEC 1 // AEC/NS not supported.
772 #if (OP_RIV_AUDIO == 0) 761 /* FreeCalypso change: enable L1_NEW_AEC to match DSP reality */
773 #define L1_NEW_AEC 1 762 #define L1_NEW_AEC 1
774 #else
775 // Available but not yet tuned with Riviera AUDIO
776 #define L1_NEW_AEC 0
777 #endif
778 #if ((L1_NEW_AEC) && (!AEC)) 763 #if ((L1_NEW_AEC) && (!AEC))
779 // First undef the flag to avoid warnings at compilation time 764 // First undef the flag to avoid warnings at compilation time
780 #undef AEC 765 #undef AEC
781 #define AEC 1 766 #define AEC 1
782 #endif 767 #endif