diff --git a/Hackintool.xcodeproj/project.pbxproj b/Hackintool.xcodeproj/project.pbxproj index eea4d44d..4d098989 100644 --- a/Hackintool.xcodeproj/project.pbxproj +++ b/Hackintool.xcodeproj/project.pbxproj @@ -714,7 +714,7 @@ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0342; + CURRENT_PROJECT_VERSION = 0343; DEVELOPMENT_TEAM = 5LGHPJM9ZR; ENABLE_HARDENED_RUNTIME = NO; ENABLE_STRICT_OBJC_MSGSEND = NO; @@ -728,7 +728,7 @@ HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks"; - MARKETING_VERSION = 3.4.2; + MARKETING_VERSION = 3.4.3; PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -748,7 +748,7 @@ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0342; + CURRENT_PROJECT_VERSION = 0343; DEVELOPMENT_TEAM = 5LGHPJM9ZR; ENABLE_HARDENED_RUNTIME = NO; ENABLE_STRICT_OBJC_MSGSEND = NO; @@ -762,7 +762,7 @@ HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks"; - MARKETING_VERSION = 3.4.2; + MARKETING_VERSION = 3.4.3; PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Hackintool.xcodeproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate b/Hackintool.xcodeproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate index 1edce59a..5e9adeeb 100644 Binary files a/Hackintool.xcodeproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate and b/Hackintool.xcodeproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Hackintool/AppDelegate.m b/Hackintool/AppDelegate.m index de1971b1..d33b08d9 100644 --- a/Hackintool/AppDelegate.m +++ b/Hackintool/AppDelegate.m @@ -1946,6 +1946,7 @@ - (void)updateBluetoothDevices NSArray *brcmDeviceArray = nil; NSArray *atherosDeviceArray = nil; + NSArray *intelDeviceArray = nil; if ((filePath = [mainBundle pathForResource:@"BRCMDevice" ofType:@"plist" inDirectory:@"BT"])) brcmDeviceArray = [NSArray arrayWithContentsOfFile:filePath]; @@ -1953,6 +1954,9 @@ - (void)updateBluetoothDevices if ((filePath = [mainBundle pathForResource:@"AtherosDevice" ofType:@"plist" inDirectory:@"BT"])) atherosDeviceArray = [NSArray arrayWithContentsOfFile:filePath]; + if ((filePath = [mainBundle pathForResource:@"IntelDevice" ofType:@"plist" inDirectory:@"BT"])) + intelDeviceArray = [NSArray arrayWithContentsOfFile:filePath]; + NSMutableArray *usbPropertyDictionaryArray = nil; if (!getIORegPropertyDictionaryArray(@"IOUSBDevice", &usbPropertyDictionaryArray)) @@ -2034,6 +2038,30 @@ - (void)updateBluetoothDevices break; } } + + for (NSDictionary *intelDeviceDictionary in intelDeviceArray) + { + NSString *name = [intelDeviceDictionary objectForKey:@"Name"]; + NSNumber *productID = [intelDeviceDictionary objectForKey:@"ProductID"]; + NSNumber *vendorID = [intelDeviceDictionary objectForKey:@"VendorID"]; + + if ([productID isEqualToNumber:idProduct] && [vendorID isEqualToNumber:idVendor]) + { + NSMutableDictionary *bluetoothDeviceDictionary = [NSMutableDictionary dictionary]; + + [bluetoothDeviceDictionary setObject:idVendor forKey:@"VendorID"]; + [bluetoothDeviceDictionary setObject:idProduct forKey:@"DeviceID"]; + [bluetoothDeviceDictionary setObject:(vendorName != nil ? vendorName : @"???") forKey:@"VendorName"]; + [bluetoothDeviceDictionary setObject:name forKey:@"DeviceName"]; + + if (fwLoaded) + [bluetoothDeviceDictionary setObject:fwLoaded forKey:@"FWLoaded"]; + + [_bluetoothDevicesArray addObject:bluetoothDeviceDictionary]; + + break; + } + } } [_bluetoothDevicesTableView reloadData]; diff --git a/Resources/BT/IntelDevice.plist b/Resources/BT/IntelDevice.plist new file mode 100644 index 00000000..5a0fcf5c --- /dev/null +++ b/Resources/BT/IntelDevice.plist @@ -0,0 +1,96 @@ + + + + + + FirmwareName + + Name + Bluetooth wireless interface + ProductID + 2602 + VendorID + 32903 + + + FirmwareName + + Name + Bluetooth wireless interface + ProductID + 2012 + VendorID + 32903 + + + FirmwareName + + Name + Wireless-AC 3168 Bluetooth + ProductID + 2727 + VendorID + 32903 + + + FirmwareName + + Name + Wireless-AC 9260 Bluetooth Adapter + ProductID + 37 + VendorID + 32903 + + + FirmwareName + + Name + Bluetooth 9460/9560 Jefferson Peak (JfP) + ProductID + 2730 + VendorID + 32903 + + + FirmwareName + + Name + Bluetooth wireless interface + ProductID + 38 + VendorID + 32903 + + + FirmwareName + + Name + AX200 Bluetooth + ProductID + 41 + VendorID + 32903 + + + FirmwareName + + Name + Bluetooth wireless interface + ProductID + 2603 + VendorID + 32903 + + + FirmwareName + + Name + Bluetooth wireless interface + ProductID + 50 + VendorID + 32903 + + + diff --git a/Resources/Kexts/kexts.plist b/Resources/Kexts/kexts.plist index 109fbec1..79165fad 100644 --- a/Resources/Kexts/kexts.plist +++ b/Resources/Kexts/kexts.plist @@ -530,7 +530,7 @@ Description Try to load the Intel Bluetooth driver firmware. ProjectUrl - https://github.com/zxystd/IntelBluetoothFirmware + https://github.com/OpenIntelWireless/IntelBluetoothFirmware Type Kext @@ -543,6 +543,18 @@ https://github.com/zxystd/AppleIntelWifiAdapter Type Kext + Superseder + itlwm + + + Name + itlwm + Description + OpenBSD based macOS Intel network card driver. + ProjectUrl + https://github.com/OpenIntelWireless/itlwmr + Type + Kext