Refactored dongle initialization code

The code for dongle initialization (WANDongleInitializer.cpp) was removed from
this class, it will be added by each modem as needed.

Author: bogdanm

libraries/USBHost/USB3GModule/WANDongle.cpp

@@ -32,7 +32,7 @@
 #include "WANDongle.h"
 #include "WANDongleInitializer.h"
 
-WANDongle::WANDongle() : m_pInitializer(NULL), m_serialCount(0)
+WANDongle::WANDongle() : m_pInitializer(NULL), m_serialCount(0), m_totalInitializers(0)
 {
     host = USBHost::getHostInst();
     init();
@@ -166,28 +166,28 @@ void WANDongle::init()
 
 /*virtual*/ void WANDongle::setVidPid(uint16_t vid, uint16_t pid)
 {
-    //Load right initializer
-  WANDongleInitializer** initializer = WANDongleInitializer::getInitializers(host);
-  
-  while(*initializer)
+  WANDongleInitializer* initializer;
+
+  for(unsigned i = 0; i < m_totalInitializers; i++)
   {
-    DBG("*initializer=%p", *initializer);
-    DBG("(*initializer)->getSerialVid()=%04x", (*initializer)->getSerialVid());
-    DBG("(*initializer)->getSerialPid()=%04x", (*initializer)->getSerialPid());
-    if ((dev->getVid() == (*initializer)->getSerialVid()) && (dev->getPid() == (*initializer)->getSerialPid()))
+    initializer = m_Initializers[i];
+    DBG("initializer=%p", initializer);
+    DBG("initializer->getSerialVid()=%04x", initializer->getSerialVid());
+    DBG("initializer->getSerialPid()=%04x", initializer->getSerialPid());
+    if ((dev->getVid() == initializer->getSerialVid()) && (dev->getPid() == initializer->getSerialPid()))
     {
       DBG("The dongle is in virtual serial mode");
-      m_pInitializer = *initializer;
+      m_pInitializer = initializer;
       break;
     }
-    else if ((dev->getVid() == (*initializer)->getMSDVid()) && (dev->getPid() == (*initializer)->getMSDPid()))
+    else if ((dev->getVid() == initializer->getMSDVid()) && (dev->getPid() == initializer->getMSDPid()))
     {
-      DBG("Vodafone K3370 dongle detected in MSD mode");
-      m_pInitializer = *initializer;
+      DBG("Dongle detected in MSD mode");
+      m_pInitializer = initializer;
       break;
     }
     initializer++;
-  } //while()
+  } //for
   if(m_pInitializer)
   {
     m_pInitializer->setVidPid(vid, pid);
@@ -218,4 +218,19 @@ void WANDongle::init()
   }
 }
 
+
+bool WANDongle::addInitializer(WANDongleInitializer* pInitializer)
+{
+  if (m_totalInitializers >= MAX_DEVICE_CONNECTED)
+    return false;
+  m_Initializers[m_totalInitializers++] = pInitializer;
+  return true;
+}
+
+WANDongle::~WANDongle()
+{
+  for(unsigned i = 0; i < m_totalInitializers; i++)
+    delete m_Initializers[i];
+}
+
 #endif /* USBHOST_3GMODULE */

libraries/USBHost/USB3GModule/WANDongle.h

@@ -47,6 +47,11 @@ class WANDongle : public IUSBEnumerator {
     */
     WANDongle();
 
+    /*
+    * Destructor
+    */
+    virtual ~WANDongle();
+
     /*
     * Check if a serial port device is connected
     *
@@ -72,7 +77,8 @@ class WANDongle : public IUSBEnumerator {
 
     IUSBHostSerial& getSerial(int index);
     int getSerialCount();
-    
+    bool addInitializer(WANDongleInitializer* pInitializer);
+
     //From IUSBEnumerator
 
     virtual void setVidPid(uint16_t vid, uint16_t pid);
@@ -92,6 +98,9 @@ class WANDongle : public IUSBEnumerator {
 
     WANDongleSerialPort m_serial[WANDONGLE_MAX_SERIAL_PORTS];
     int m_serialCount;
+ 
+    int m_totalInitializers;
+    WANDongleInitializer* m_Initializers[MAX_DEVICE_CONNECTED];
 };
 
 #endif /* USBHOST_3GMODULE */