Add support for new gen3 devices share with gen2 chip id, for example: 0x8087:0x0026.

Author: zxystd

IntelBluetoothFirmware/IntelBluetoothFirmware.cpp

@@ -72,16 +72,10 @@ bool IntelBluetoothFirmware::start(IOService *provider)
         stop(this);
         return false;
     }
-    switch (currentType) {
-        case kTypeGen1:
-            m_pBTIntel = new IntelBluetoothOpsGen1();
-            break;
-        case kTypeGen2:
-            m_pBTIntel = new IntelBluetoothOpsGen2();
-            break;
-        case kTypeGen3:
-            m_pBTIntel = new IntelBluetoothOpsGen3();
-            break;
+    if (currentType == kTypeGen1) {
+        m_pBTIntel = new IntelBluetoothOpsGen1();
+    } else {
+        m_pBTIntel = new IntelBluetoothOpsGen3();
     }
     if (!m_pBTIntel->initWithDevice(this, m_pDevice)) {
         XYLog("start fail, can not init device\n");

IntelBluetoothFirmware/IntelBluetoothOpsGen2.cpp

@@ -12,11 +12,10 @@
 OSDefineMetaClassAndStructors(IntelBluetoothOpsGen2, BtIntel)
 
 bool IntelBluetoothOpsGen2::
-setup()
+bootloaderSetup(IntelVersion *ver)
 {
-    IntelVersion ver;
+    IntelVersion newVer;
     IntelBootParams params;
-    IntelDebugFeatures features;
     uint32_t bootParams;
     char ddcname[64];
 
@@ -26,26 +25,12 @@ setup()
      */
     bootParams = 0x00000000;
 
-    /* Read the Intel version information to determine if the device
-     * is in bootloader mode or if it already has operational firmware
-     * loaded.
-     */
-    if (!readVersion(&ver)) {
-        XYLog("Intel Read version failed\n");
-        resetToBootloader();
-        return false;
-    }
-    
-    if (!intelVersionInfo(&ver)) {
-        return false;
-    }
-    
-    if (!downloadFirmware(&ver, &params, &bootParams)) {
+    if (!downloadFirmware(ver, &params, &bootParams)) {
         return false;
     }
 
     /* controller is already having an operational firmware */
-    if (ver.fw_variant == 0x23) {
+    if (ver->fw_variant == 0x23) {
         XYLog("Frimware is already running, finishing\n");
         goto finish;
     }
@@ -55,7 +40,7 @@ setup()
         return false;
     }
 
-    if (!getFirmware(&ver, &params, ddcname, sizeof(ddcname), "ddc")) {
+    if (!getFirmware(ver, &params, ddcname, sizeof(ddcname), "ddc")) {
         XYLog("Unsupported Intel firmware naming\n");
     } else {
         /* Once the device is running in operational mode, it needs to
@@ -67,20 +52,12 @@ setup()
         loadDDCConfig(ddcname);
     }
 
-    /* Read the Intel supported features and if new exception formats
-     * supported, need to load the additional DDC config to enable.
-     */
-    readDebugFeatures(&features);
-    
-    /* Set DDC mask for available debug features */
-    setDebugFeatures(&features);
-    
     /* Read the Intel version information after loading the FW  */
-    if (!readVersion(&ver)) {
+    if (!readVersion(&newVer)) {
         return false;
     }
 
-    intelVersionInfo(&ver);
+    intelVersionInfo(&newVer);
 
 finish:
 
@@ -96,6 +73,28 @@ setup()
     return true;
 }
 
+bool IntelBluetoothOpsGen2::
+setup()
+{
+    IntelVersion ver;
+    
+    /* Read the Intel version information to determine if the device
+     * is in bootloader mode or if it already has operational firmware
+     * loaded.
+     */
+    if (!readVersion(&ver)) {
+        XYLog("Intel Read version failed\n");
+        resetToBootloader();
+        return false;
+    }
+    
+    if (!intelVersionInfo(&ver)) {
+        return false;
+    }
+    
+    return bootloaderSetup(&ver);
+}
+
 bool IntelBluetoothOpsGen2::
 downloadFirmware(IntelVersion *ver, IntelBootParams *params, uint32_t *bootParams)
 {

IntelBluetoothFirmware/IntelBluetoothOpsGen2.hpp

@@ -38,6 +38,8 @@ class IntelBluetoothOpsGen2 : public BtIntel {
 
     bool firmwareVersion(uint8_t num, uint8_t ww, uint8_t yy, OSData *fwData, uint32_t *bootAddr);
 
+    bool bootloaderSetup(IntelVersion *ver);
+    
 private:
 
     bool getFirmware(IntelVersion *ver, IntelBootParams *params, char *name, size_t len, const char *suffix);