Remove needed arguments for GetFFUFileName

WOA-Project · Feb 27, 2024 · 313a00c · 313a00c
1 parent 7284792
commit 313a00c
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
@@ -9,7 +9,7 @@ public class EpsilonHalfSplit128GB : IDeviceProfile
 
         public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo.1930", "OEMB1.*.OEMB1 Product.*", "OEMEP.*.OEMEP Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMEP_128GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/EpsilonHalfSplit256GB.cs b/FirmwareGen/DeviceProfiles/EpsilonHalfSplit256GB.cs
@@ -9,7 +9,7 @@ internal class EpsilonHalfSplit256GB : IDeviceProfile
 
         public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo.1930", "OEMB1.*.OEMB1 Product.*", "OEMEP.*.OEMEP Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_256GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMEP_256GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/EpsilonMaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/EpsilonMaximizedForWindows.cs
@@ -9,7 +9,7 @@ internal class EpsilonMaximizedForWindows : IDeviceProfile
 
         public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo.1930", "OEMB1.*.OEMB1 Product.*", "OEMEP.*.OEMEP Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMEP_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMEP_128GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\epsilon.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/MTP8150MaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/MTP8150MaximizedForWindows.cs
@@ -9,7 +9,7 @@ internal class MTP8150MaximizedForWindows : IDeviceProfile
 
         public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.MTP.SM8150"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"QCOM_MTP_8150_MaximizedForWindows_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"QCOM_MTP_8150_MaximizedForWindows.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\mtp855.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit128GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit128GB.cs
@@ -12,7 +12,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
                 "OEMC1.*.OEMC1 Product.*",
                 "OEMZE.*.OEMZE Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_128GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMZE_128GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit256GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit256GB.cs
@@ -12,7 +12,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
                 "OEMC1.*.OEMC1 Product.*",
                 "OEMZE.*.OEMZE Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_256GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMZE_256GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaHalfSplit512GB.cs b/FirmwareGen/DeviceProfiles/ZetaHalfSplit512GB.cs
@@ -12,7 +12,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
                 "OEMC1.*.OEMC1 Product.*",
                 "OEMZE.*.OEMZE Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_512GB_HalfSplit_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMZE_512GB_HalfSplit.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 

diff --git a/FirmwareGen/DeviceProfiles/ZetaMaximizedForWindows.cs b/FirmwareGen/DeviceProfiles/ZetaMaximizedForWindows.cs
@@ -12,7 +12,7 @@ public string[] GetPlatformIDs() => ["Microsoft Corporation.Surface.Surface Duo
                 "OEMC1.*.OEMC1 Product.*",
                 "OEMZE.*.OEMZE Product.*"];
 
-        public string GetFFUFileName(string OSVersion, string Language, string Sku) => $"OEMZE_MaximizedForWindows_{OSVersion}_CLIENT{Sku}_a64fre_{Language}_unsigned.ffu";
+        public string GetFFUFileName() => $"OEMZE_MaximizedForWindows.ffu";
 
         public string GetDriverDefinitionPath() => $@"\definitions\Desktop\ARM64\Internal\zeta.xml";
 

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

diff --git a/FirmwareGen/MainLogic.cs b/FirmwareGen/MainLogic.cs
@@ -89,7 +89,7 @@ public static void GenerateWindowsFFU(GenerateWindowsFFUOptions options)
                     version = string.Join(".", version.Split(".").Skip(2));
                 }
 
-                VolumeUtils.RunProgram(Img2Ffu, $@"-i {TmpVHD} -f ""{options.Output}\{deviceProfile.GetFFUFileName(version, "en-us", "PROFESSIONAL")}"" -c {deviceProfile.GetDiskSectorSize() * 4} -s {deviceProfile.GetDiskSectorSize()} -p ""{string.Join(";", deviceProfile.GetPlatformIDs())}"" -o {options.WindowsVer} -b 4000");
+                VolumeUtils.RunProgram(Img2Ffu, $@"-i {TmpVHD} -f ""{options.Output}\{deviceProfile.GetFFUFileName()}"" -c {deviceProfile.GetDiskSectorSize() * 4} -s {deviceProfile.GetDiskSectorSize()} -p ""{string.Join(";", deviceProfile.GetPlatformIDs())}"" -o {options.WindowsVer} -b 4000");
 
                 Logging.Log("Deleting Temp VHD");
                 File.Delete(TmpVHD);