Fixed installer. Initial GP100 support

Illest1xx69 · Dec 18, 2016 · 51937f7 · 51937f7
1 parent 07ae765
commit 51937f7
Show file tree

Hide file tree

Showing 264 changed files with 9,152 additions and 5,046 deletions.
diff --git a/GPUSensors/NouveauSensors/gm100.cpp b/GPUSensors/NouveauSensors/gm100.cpp
@@ -59,6 +59,10 @@ bool gm100_identify(struct nouveau_device *device)
         case 0x126:
             device->cname = "GM206"; // GTX 960
             break;
+
+//        case 0x12b:
+//            device->cname = "GM20B"; // GTX 980 Ti?
+//            break;
 
         default:
             nv_fatal(device, "unknown Maxwell chipset 0x%x\n", device->chipset);

diff --git a/GPUSensors/NouveauSensors/gp100.cpp b/GPUSensors/NouveauSensors/gp100.cpp
@@ -0,0 +1,59 @@
+//
+//  gp100.cpp
+//  HWSensors
+//
+//  Created by Natan Zalkin on 17/12/2016.
+//
+//
+
+#include "gp100.h"
+
+#include "nouveau.h"
+#include "nv50.h"
+#include "nva3.h"
+#include "nv84.h"
+#include "nvd0.h"
+#include "nve0.h"
+#include "nouveau_therm.h"
+
+bool gp100_identify(struct nouveau_device *device)
+{
+    switch (device->chipset) {
+        case 0x130:
+            device->cname = "GP100";
+            break;
+
+        case 0x132:
+            device->cname = "GP102";
+            break;
+
+        case 0x134:
+            device->cname = "GP104";
+            break;
+
+        case 0x136:
+            device->cname = "GP106";
+            break;
+
+        default:
+            nv_fatal(device, "unknown Pascal chipset 0x%x\n", device->chipset);
+            return false;
+    }
+
+    return true;
+}
+
+void gp100_init(struct nouveau_device *device)
+{
+    nvd0_therm_init(device);
+
+//    device->gpio_find = nouveau_gpio_find;
+//    device->gpio_get = nouveau_gpio_get;
+//    device->gpio_sense = nvd0_gpio_sense;
+    device->temp_get = nv84_temp_get;
+//    device->clocks_get = nve0_clock_read;
+//    //device->voltage_get = nouveau_voltage_get;
+//    device->pwm_get = gm107_fan_pwm_get;
+//    device->fan_pwm_get = nouveau_therm_fan_pwm_get;
+//    device->fan_rpm_get = nva3_therm_fan_sense;
+}
diff --git a/GPUSensors/NouveauSensors/gp100.h b/GPUSensors/NouveauSensors/gp100.h
@@ -0,0 +1,15 @@
+//
+//  gp100.h
+//  HWSensors
+//
+//  Created by Natan Zalkin on 17/12/2016.
+//
+//
+
+#ifndef HWSensors_gp100_hpp
+#define HWSensors_gp100_hpp
+
+bool gp100_identify(struct nouveau_device *device);
+void gp100_init(struct nouveau_device *device);
+
+#endif /* HWSensors_gp100_hpp */
diff --git a/GPUSensors/NouveauSensors/nouveau.cpp b/GPUSensors/NouveauSensors/nouveau.cpp
@@ -37,6 +37,7 @@
 #include "nvc0.h"
 #include "nve0.h"
 #include "gm100.h"
+#include "gp100.h"
 #include "nouveau_therm.h"
 #include "nouveau_volt.h"
 
@@ -67,6 +68,7 @@ bool nouveau_identify(struct nouveau_device *device)
             case 0x100: device->card_type = NV_E0; break;
             case 0x110:
             case 0x120: device->card_type = GM100; break;
+            case 0x130: device->card_type = GP100; break;
 			default:
 				break;
         }
@@ -81,6 +83,7 @@ bool nouveau_identify(struct nouveau_device *device)
 		case NV_D0: ret = nvc0_identify(device); break;
 		case NV_E0: ret = nve0_identify(device); break;
         case GM100: ret = gm100_identify(device); break;
+        case GP100: ret = gp100_identify(device); break;
         default: break;
     }
 
@@ -124,6 +127,7 @@ bool nouveau_init(struct nouveau_device *device)
 		case NV_D0: nvc0_init(device); break;
 		case NV_E0: nve0_init(device); break;
         case GM100: gm100_init(device); break;
+        case GP100: gp100_init(device); break;
         default: break;
     }
 
@@ -146,4 +150,4 @@ bool nouveau_init(struct nouveau_device *device)
     nouveau_therm_init(device);
 
     return true;
-}
+}
diff --git a/GPUSensors/NouveauSensors/nouveau.h b/GPUSensors/NouveauSensors/nouveau.h
@@ -50,6 +50,7 @@ enum nouveau_card_type {
     NV_D0    = 0x0d0,
     NV_E0    = 0x0e0,
     GM100    = 0x110,
+    GP100    = 0x130,
 };
 
 typedef struct _I2CDevRec *I2CDevPtr;

diff --git a/HWMonitor.xcodeproj/project.pbxproj b/HWMonitor.xcodeproj/project.pbxproj
@@ -50,6 +50,8 @@
 		7E48BC5A18EE8FAE00A6CA19 /* HWMonitorHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E48BC5918EE8FAE00A6CA19 /* HWMonitorHelper.m */; };
 		7E48BC6518EE977500A6CA19 /* SmcHelper+HWMonitorHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E48BC6418EE977500A6CA19 /* SmcHelper+HWMonitorHelper.m */; };
 		7E4959F218A640F200E05CF7 /* PopupFanController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E4959F118A640F200E05CF7 /* PopupFanController.m */; };
+		7E4A3C281E07038300A01B02 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E2FE40F18DCBA5400EAD6DB /* Sparkle.framework */; };
+		7E4A3C291E07038300A01B02 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7E2FE40F18DCBA5400EAD6DB /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		7E4C76AE18A559BA0050BEFD /* PopupAtaSmartReportController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E4C76AC18A559BA0050BEFD /* PopupAtaSmartReportController.m */; };
 		7E4C76AF18A559BA0050BEFD /* PopupAtaSmartReportController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E4C76AD18A559BA0050BEFD /* PopupAtaSmartReportController.xib */; };
 		7E4C76BA18A61C190050BEFD /* NSTableHeaderCell+PopupThemedHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E4C76B918A61C190050BEFD /* NSTableHeaderCell+PopupThemedHeader.m */; };
@@ -81,7 +83,6 @@
 		7EA248FF16D8E93A002231B2 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EA248FE16D8E93A002231B2 /* AppController.m */; };
 		7EA2494D16D8EB2D002231B2 /* StatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EA2494C16D8EB2D002231B2 /* StatusItemView.m */; };
 		7EA2494F16D8EBC1002231B2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA2494E16D8EBC0002231B2 /* IOKit.framework */; };
-		7EA50F0517F3771D00FDA3AA /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA50F0417F3771D00FDA3AA /* Sparkle.framework */; };
 		7EB139FA1B33641E00FBAA04 /* MMScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB139F71B33641E00FBAA04 /* MMScroller.m */; };
 		7EB139FB1B33641E00FBAA04 /* MMScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB139F91B33641E00FBAA04 /* MMScrollView.m */; };
 		7EB139FE1B33646400FBAA04 /* MMDrawingUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB139FD1B33646400FBAA04 /* MMDrawingUtils.m */; };
@@ -101,7 +102,6 @@
 		7EDA1ACB16D956EA0012A0DC /* GraphsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDA1ACA16D956EA0012A0DC /* GraphsView.m */; };
 		7EDA1AD116DA83AF0012A0DC /* GraphsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDA1AD016DA83AF0012A0DC /* GraphsController.m */; };
 		7EDDC87316FA5DA50072B15B /* Localizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDDC87216FA5DA50072B15B /* Localizer.m */; };
-		7EE5AFE61BC90D0000AB0EC1 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA50F0417F3771D00FDA3AA /* Sparkle.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		7EEC9F4418B8D08A00BDB9D7 /* HWMonitorHelper-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7EEC9F4218B8D08A00BDB9D7 /* HWMonitorHelper-Info.plist */; };
 		7EEC9F4518B8D08A00BDB9D7 /* HWMonitorHelper-Launchd.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7EEC9F4318B8D08A00BDB9D7 /* HWMonitorHelper-Launchd.plist */; };
 		7EEC9F4618B8D0F700BDB9D7 /* org.hwsensors.HWMonitorHelper in Copy Helper Binary */ = {isa = PBXBuildFile; fileRef = 7E3299CD18B8D0490022FB53 /* org.hwsensors.HWMonitorHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -164,20 +164,41 @@
 			remoteGlobalIDString = 55C14BB7136EEF1500649790;
 			remoteInfo = "Sparkle Updater";
 		};
-		7EEC9F4718B8D0FB00BDB9D7 /* PBXContainerItemProxy */ = {
+		7E4A3C261E0702D600A01B02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 7EA248E016D8E93A002231B2 /* Project object */;
+			containerPortal = 7E2FE40518DCB69600EAD6DB /* Sparkle.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 7E3299CC18B8D0490022FB53;
-			remoteInfo = org.hwsensors.HWMonitorHelper;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
 		};
-		7EF29D7B18DDAF9E005484A0 /* PBXContainerItemProxy */ = {
+		7E4A3C2A1E07038300A01B02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7E2FE40518DCB69600EAD6DB /* Sparkle.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = Sparkle;
 		};
+		7EC27DC01E0700E6000503C9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7E2FE40518DCB69600EAD6DB /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 726B2B5D1C645FC900388755;
+			remoteInfo = "UI Tests";
+		};
+		7EC27DC21E0700E6000503C9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7E2FE40518DCB69600EAD6DB /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 722954B41D04ADAF00ECF9CA;
+			remoteInfo = fileop;
+		};
+		7EEC9F4718B8D0FB00BDB9D7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7EA248E016D8E93A002231B2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7E3299CC18B8D0490022FB53;
+			remoteInfo = org.hwsensors.HWMonitorHelper;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -197,8 +218,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				7EE5AFE61BC90D0000AB0EC1 /* Sparkle.framework in Copy Frameworks */,
 				7E2789811876FB6E00B443BD /* Growl.framework in Copy Frameworks */,
+				7E4A3C291E07038300A01B02 /* Sparkle.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -373,7 +394,6 @@
 		7EA2494B16D8EB2D002231B2 /* StatusItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusItemView.h; sourceTree = "<group>"; };
 		7EA2494C16D8EB2D002231B2 /* StatusItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusItemView.m; sourceTree = "<group>"; };
 		7EA2494E16D8EBC0002231B2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		7EA50F0417F3771D00FDA3AA /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Sparkle/Binaries/Sparkle.framework; sourceTree = "<group>"; };
 		7EA68B8917341ECD00B5B998 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7EA68B8A17341ECD00B5B998 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		7EB139F61B33641E00FBAA04 /* MMScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMScroller.h; sourceTree = "<group>"; };
@@ -479,7 +499,7 @@
 				7E5134E6185C919F0069AD93 /* CoreData.framework in Frameworks */,
 				7ED40C29184A6D0F0068EBC9 /* WebKit.framework in Frameworks */,
 				7E2789801876FB6300B443BD /* Growl.framework in Frameworks */,
-				7EA50F0517F3771D00FDA3AA /* Sparkle.framework in Frameworks */,
+				7E4A3C281E07038300A01B02 /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -734,7 +754,6 @@
 			isa = PBXGroup;
 			children = (
 				7E27897F1876FB6300B443BD /* Growl.framework */,
-				7EA50F0417F3771D00FDA3AA /* Sparkle.framework */,
 			);
 			name = Other;
 			sourceTree = "<group>";
@@ -774,6 +793,8 @@
 				7E2FE41318DCBA5400EAD6DB /* Sparkle Unit Tests.xctest */,
 				7E2FE41518DCBA5400EAD6DB /* BinaryDelta */,
 				7E2FE41718DCBA5400EAD6DB /* Autoupdate.app */,
+				7EC27DC11E0700E6000503C9 /* UI Tests.xctest */,
+				7EC27DC31E0700E6000503C9 /* fileop */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1161,8 +1182,9 @@
 			buildRules = (
 			);
 			dependencies = (
-				7EF29D7C18DDAF9E005484A0 /* PBXTargetDependency */,
 				7EEC9F4818B8D0FB00BDB9D7 /* PBXTargetDependency */,
+				7E4A3C271E0702D600A01B02 /* PBXTargetDependency */,
+				7E4A3C2B1E07038300A01B02 /* PBXTargetDependency */,
 			);
 			name = HWMonitor;
 			productName = HWMonitor;
@@ -1259,6 +1281,20 @@
 			remoteRef = 7E2FE41618DCBA5400EAD6DB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		7EC27DC11E0700E6000503C9 /* UI Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "UI Tests.xctest";
+			remoteRef = 7EC27DC01E0700E6000503C9 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		7EC27DC31E0700E6000503C9 /* fileop */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = fileop;
+			remoteRef = 7EC27DC21E0700E6000503C9 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -1416,15 +1452,20 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		7EEC9F4818B8D0FB00BDB9D7 /* PBXTargetDependency */ = {
+		7E4A3C271E0702D600A01B02 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 7E3299CC18B8D0490022FB53 /* org.hwsensors.HWMonitorHelper */;
-			targetProxy = 7EEC9F4718B8D0FB00BDB9D7 /* PBXContainerItemProxy */;
+			name = Sparkle;
+			targetProxy = 7E4A3C261E0702D600A01B02 /* PBXContainerItemProxy */;
 		};
-		7EF29D7C18DDAF9E005484A0 /* PBXTargetDependency */ = {
+		7E4A3C2B1E07038300A01B02 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Sparkle;
-			targetProxy = 7EF29D7B18DDAF9E005484A0 /* PBXContainerItemProxy */;
+			targetProxy = 7E4A3C2A1E07038300A01B02 /* PBXContainerItemProxy */;
+		};
+		7EEC9F4818B8D0FB00BDB9D7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7E3299CC18B8D0490022FB53 /* org.hwsensors.HWMonitorHelper */;
+			targetProxy = 7EEC9F4718B8D0FB00BDB9D7 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -1625,11 +1666,12 @@
 					"$(SOURCE_ROOT)/HWMonitor",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Parse",
+					"$(PROJECT_DIR)/Sparkle/Binaries",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "HWMonitor/HWMonitor-Prefix.pch";
 				INFOPLIST_FILE = "HWMonitor/HWMonitor-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGET_DIR = HWMonitor;
@@ -1647,11 +1689,12 @@
 					"$(SOURCE_ROOT)/HWMonitor",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Parse",
+					"$(PROJECT_DIR)/Sparkle/Binaries",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "HWMonitor/HWMonitor-Prefix.pch";
 				INFOPLIST_FILE = "HWMonitor/HWMonitor-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGET_DIR = HWMonitor;

diff --git a/HWMonitor.xcodeproj/xcshareddata/xcschemes/org.hwsensors.HWMonitorHelper.xcscheme b/HWMonitor.xcodeproj/xcshareddata/xcschemes/org.hwsensors.HWMonitorHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,15 +38,18 @@
             ReferencedContainer = "container:HWMonitor.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -62,10 +65,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">