Ticket #1267: qtopia-use-Ficgta01ModemHiddenFeatures-class-for-echo-suppression.patch

devices/ficgta01/src/plugins/phonevendors/ficgta01/vendor_ficgta01.cpp

@@ -769 +769 @@
         m_vibratorService->setVibrateNow(false);
 }
 
-void Ficgta01ModemService::echoCancellation(QAtChat * atChat)
+void Ficgta01ModemService::echoCancellation(QAtChat* atChat)
 {
-        atChat->chat( "AT@ST=\"-26\"" ); // audio side tone: set to minimum
-        atChat->chat( "AT%N028B" ); // Long Echo Cancellation: active, -6db
-        atChat->chat( "AT%N0125" ); // Noise reduction: active, -6db
+    Ficgta01ModemHiddenFeatures* hs = new Ficgta01ModemHiddenFeatures(atChat);
+    atChat->chat( "AT@ST=\"-26\"" );  // audio side tone: set to minimum
+    hs->enableAEC( -6, true );        // Long Echo Cancellation: active, -6db
+    hs->enableNoiseReduction( -6 );   // Noise reduction: active, -6db
 }
 
- Ficgta01VibrateAccessory::Ficgta01VibrateAccessory
+Ficgta01VibrateAccessory::Ficgta01VibrateAccessory
         ( QModemService *service )
     : QVibrateAccessoryProvider( service->service(), service )
 {
@@ -909 +910 @@
 Ficgta01PreferredNetworkOperators::~Ficgta01PreferredNetworkOperators()
 {
 }
+
+Ficgta01ModemHiddenFeatures::Ficgta01ModemHiddenFeatures(QAtChat* atChat) :
+    atPrefix( "AT%N" )
+{
+    m_atChat = atChat;
+}
+
+Ficgta01ModemHiddenFeatures::~Ficgta01ModemHiddenFeatures()
+{
+}
+
+void Ficgta01ModemHiddenFeatures::sendHiddenFeatureCommand(int code)
+{
+    m_atChat->chat(atPrefix + QString::number(code, 16).toUpper().rightJustified(4, '0'));
+}
+
+void Ficgta01ModemHiddenFeatures::enableAEC(int type, bool longAEC = true)
+{
+    if (type <= 0 && type >= -18 && (-type) % 6 == 0) {
+        int code = 0x0083 + (((-type) / 6) * 0x8);
+        
+        if (longAEC)
+            code += 0x0200;
+            
+         sendHiddenFeatureCommand(code);
+    }
+}
+
+void Ficgta01ModemHiddenFeatures::enableNoiseReduction(int type)
+{
+    if (type <= 0 && type >= -18 && (-type) % 6 == 0) {
+        int code = 0x0105 + (((-type) / 6) * 0x20);
+            
+        sendHiddenFeatureCommand(code);
+    }
+}
+
+void Ficgta01ModemHiddenFeatures::enableNoiseReductionAEC()
+{
+    sendHiddenFeatureCommand(0x0187);
+}
+
+void Ficgta01ModemHiddenFeatures::disableNoiseReductionAEC()
+{
+    sendHiddenFeatureCommand(0x0001);
+}
+

devices/ficgta01/src/plugins/phonevendors/ficgta01/vendor_ficgta01_p.h

@@ -168 +168 @@
     void setVibrateOnRing( const bool value );
 };
 
-
-
 class Ficgta01CallVolume : public QModemCallVolume
 {
       Q_OBJECT
@@ -211 +209 @@
     void setChannels(const QList<int>& list);
 };
 
+class Ficgta01ModemHiddenFeatures
+{
+public:
+    Ficgta01ModemHiddenFeatures( QAtChat* );
+    ~Ficgta01ModemHiddenFeatures();
 
+    void sendHiddenFeatureCommand( int );
+    void enableAEC( int, bool );
+    void enableNoiseReduction( int );
+    void enableNoiseReductionAEC();
+    void disableNoiseReductionAEC();
+
+private:
+    QAtChat * m_atChat;
+    const QString atPrefix;
+};
 
 
 #endif