Remove needed argument for GetDriverDefinitionPath

WOA-Project · Feb 27, 2024 · 7284792 · 7284792
1 parent f87eb09
commit 7284792
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/FirmwareGen/DeviceProfiles/EpsilonHalfSplit128GB.cs b/FirmwareGen/DeviceProfiles/EpsilonHalfSplit128GB.cs
@@ -11,7 +11,7 @@ public class EpsilonHalfSplit128GB : IDeviceProfile
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\epsilon.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 
         public ulong GetDiskTotalSize() =>
             //return 239_683_502_080; // 256GB (Bigger variant);

diff --git a/FirmwareGen/DeviceProfiles/EpsilonHalfSplit256GB.cs b/FirmwareGen/DeviceProfiles/EpsilonHalfSplit256GB.cs
@@ -11,7 +11,7 @@ internal class EpsilonHalfSplit256GB : IDeviceProfile
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_256GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\epsilon.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 
         public ulong GetDiskTotalSize() =>
             //return 239_683_502_080; // 256GB (Bigger variant);

diff --git a/FirmwareGen/DeviceProfiles/EpsilonMaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/EpsilonMaximizedForWindows.cs
@@ -11,7 +11,7 @@ internal class EpsilonMaximizedForWindows : IDeviceProfile
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\epsilon.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 
         public ulong GetDiskTotalSize() =>
             //return 239_683_502_080; // 256GB (Bigger variant);

diff --git a/FirmwareGen/DeviceProfiles/MTP8150MaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/MTP8150MaximizedForWindows.cs
@@ -11,7 +11,7 @@ internal class MTP8150MaximizedForWindows : IDeviceProfile
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"QCOM_MTP_8150_MaximizedForWindows_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\mtp855.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\mtp855.xml";
 
         public ulong GetDiskTotalSize() => 123_371_257_856; // 128GB;
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit128GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit128GB.cs
@@ -14,7 +14,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\zeta.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 
         public ulong GetDiskTotalSize() => 110_394_081_280; // 128GB;
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit256GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit256GB.cs
@@ -14,7 +14,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_256GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\zeta.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 
         public ulong GetDiskTotalSize() => 238_353_907_712; // 256GB;
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit512GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit512GB.cs
@@ -14,7 +14,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_512GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\zeta.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 
         public ulong GetDiskTotalSize() => throw new NotImplementedException();
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaMaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/ZetaMaximizedForWindows.cs
@@ -14,7 +14,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
 
         public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_MaximizedForWindows_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
 
-        public string GetDriverDefinitionPath(string DriverFolder) => $@"{DriverFolder}\definitions\Desktop\ARM64\Internal\zeta.xml";
+        public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 
         public ulong GetDiskTotalSize() => 110_394_081_280; // 128GB;
 

diff --git a/FirmwareGen/IDeviceProfile.cs b/FirmwareGen/IDeviceProfile.cs
@@ -8,7 +8,7 @@ public interface IDeviceProfile
         string[] GetSupplementaryBCDCommands();
         string[] GetPlatformIDs();
         string GetFFUFileName(string OSVersion, string Language, string Sku);
-        string GetDriverDefinitionPath(string DriverFolder);
+        string GetDriverDefinitionPath();
         ulong GetDiskTotalSize();
         uint GetDiskSectorSize();
         GPTPartition[] GetPartitionLayout();

diff --git a/FirmwareGen/MainLogic.cs b/FirmwareGen/MainLogic.cs
@@ -78,7 +78,7 @@ public static void GenerateWindowsFFU(GenerateWindowsFFUOptions options)
                 }
 
                 Logging.Log("Adding drivers");
-                VolumeUtils.RunProgram(DriverUpdater, $@"-d ""{deviceProfile.GetDriverDefinitionPath(options.DriverPack)}"" -r ""{options.DriverPack}"" -p ""{VHDLetter}""");
+                VolumeUtils.RunProgram(DriverUpdater, $@"-d ""{options.DriverPack}{deviceProfile.GetDriverDefinitionPath()}"" -r ""{options.DriverPack}"" -p ""{VHDLetter}""");
 
                 VolumeUtils.DismountVirtualHardDisk(TmpVHD);