Fixed incorrect revision reporting on T2 models (e.g. Macmini8,1)

acidanthera · May 9, 2020 · ba08a62 · ba08a62
1 parent 2d0436a
commit ba08a62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 VirtualSMC Changelog
 ====================
+#### v1.1.4
+- Fixed incorrect revision reporting on T2 models (e.g. Macmini8,1)
+
 #### v1.1.3
 - Fixed compatibility with 10.15 debug kernel with traptrace enabled
 

diff --git a/VirtualSMC.xcodeproj/project.pbxproj b/VirtualSMC.xcodeproj/project.pbxproj
@@ -1461,7 +1461,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				MODULE_VERSION = 1.1.3;
+				MODULE_VERSION = 1.1.4;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				VALID_ARCHS = x86_64;
@@ -1509,7 +1509,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				MODULE_VERSION = 1.1.3;
+				MODULE_VERSION = 1.1.4;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				VALID_ARCHS = x86_64;
@@ -2125,7 +2125,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				MODULE_VERSION = 1.1.3;
+				MODULE_VERSION = 1.1.4;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				VALID_ARCHS = x86_64;

diff --git a/VirtualSMC/kern_vsmc.cpp b/VirtualSMC/kern_vsmc.cpp
@@ -301,12 +301,12 @@ bool VirtualSMC::obtainModelInfo(SMCInfo &deviceInfo, const char *boardIdentifie
 	if (gen != SMCInfo::Generation::Unspecified) {
 		if (gen == SMCInfo::Generation::V1)
 			generic = "GenericV1";
-		else if (gen == SMCInfo::Generation::V2)
+		else if (gen == SMCInfo::Generation::V3)
 			generic = "GenericV3";
 	} else if (deviceInfo.getGeneration() == SMCInfo::Generation::V1) {
-		generic = "GenericV3";
-	} else if (deviceInfo.getGeneration() == SMCInfo::Generation::V3) {
 		generic = "GenericV1";
+	} else if (deviceInfo.getGeneration() == SMCInfo::Generation::V3) {
+		generic = "GenericV3";
 	}
 
 	doObtain(generic, true);