Further improvements

WOA-Project · Oct 5, 2024 · ccc3e53 · ccc3e53
1 parent 6dd87ff
commit ccc3e53
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Img2Ffu.Library/Reader/Data/ImageFlash.cs b/Img2Ffu.Library/Reader/Data/ImageFlash.cs
@@ -53,7 +53,7 @@ public ImageFlash(Stream stream)
 
             if (ImageHeader.Size == 28u)
             {
-                byte[] DeviceTargetingInfoCountBuffer = new byte[4];
+                Span<byte> DeviceTargetingInfoCountBuffer = new byte[4];
                 _ = stream.Read(DeviceTargetingInfoCountBuffer);
 
                 DeviceTargetingInfoCount = BitConverter.ToUInt32(DeviceTargetingInfoCountBuffer);
@@ -62,7 +62,7 @@ public ImageFlash(Stream stream)
             // Account for FFUs with Device Target Info Count and Device Target Infos and potentially other things...
             _ = stream.Seek(InitialStreamPosition + ImageHeader.Size, SeekOrigin.Begin);
 
-            byte[] manifestDataBuffer = new byte[ImageHeader.ManifestLength];
+            Span<byte> manifestDataBuffer = new byte[ImageHeader.ManifestLength];
             _ = stream.Read(manifestDataBuffer);
             ASCIIEncoding asciiEncoding = new();
             ManifestData = asciiEncoding.GetString(manifestDataBuffer);
@@ -102,14 +102,14 @@ public ulong GetImageBlockCount()
             return imageBlockCount + storeBlockCount;
         }
 
-        public byte[] GetImageBlock(Stream Stream, ulong dataBlockIndex)
+        public Span<byte> GetImageBlock(Stream Stream, ulong dataBlockIndex)
         {
             ulong imageBlockCount = (ulong)(DataBlocksPosition - InitialStreamPosition) / (ImageHeader.ChunkSize * 1024);
 
             // The data block is within the image headers
             if (dataBlockIndex < imageBlockCount)
             {
-                byte[] dataBlock = new byte[(ImageHeader.ChunkSize * 1024)];
+                Span<byte> dataBlock = new byte[(ImageHeader.ChunkSize * 1024)];
                 ulong dataBlockPosition = (ulong)InitialStreamPosition + (dataBlockIndex * (ImageHeader.ChunkSize * 1024));
 
                 _ = Stream.Seek((long)dataBlockPosition, SeekOrigin.Begin);
@@ -130,12 +130,12 @@ public ulong GetDataBlockCount()
             ulong dataBlockCount = 0;
             foreach (Store store in Stores)
             {
-                dataBlockCount += (ulong)store.WriteDescriptors.LongCount();
+                dataBlockCount += (ulong)store.WriteDescriptors.Count;
             }
             return dataBlockCount;
         }
 
-        public byte[] GetDataBlock(Stream Stream, ulong dataBlockIndex)
+        public Span<byte> GetDataBlock(Stream Stream, ulong dataBlockIndex)
         {
             ulong dataBlockIndexOffset = 0;
             for (ulong storeIndex = 0; storeIndex < (ulong)Stores.Count; storeIndex++)
@@ -155,7 +155,7 @@ public byte[] GetDataBlock(Stream Stream, ulong dataBlockIndex)
 
         public ulong GetStoreDataBlockCount(ulong storeIndex)
         {
-            return (ulong)Stores[(int)storeIndex].WriteDescriptors.LongCount();
+            return (ulong)Stores[(int)storeIndex].WriteDescriptors.Count;
         }
 
         public byte[] GetStoreDataBlock(Stream Stream, ulong storeIndex, ulong dataBlockIndex)

diff --git a/Img2Ffu.Library/Reader/Data/SignedImage.cs b/Img2Ffu.Library/Reader/Data/SignedImage.cs
@@ -114,7 +114,7 @@ public void VerifyFFU()
 
                 if (SecurityHeader.AlgorithmId == 0x0000800c) // SHA256 Algorithm ID
                 {
-                    byte[] block = Image.GetImageBlock(Stream, i);
+                    Span<byte> block = Image.GetImageBlock(Stream, i);
                     byte[] hash = SHA256.HashData(block);
                     byte[] hashTableHash = BlockHashes.ElementAt((int)i);
 

diff --git a/Img2Ffu.Library/Reader/Data/Store.cs b/Img2Ffu.Library/Reader/Data/Store.cs
@@ -65,7 +65,7 @@ public Store(Stream stream)
                 case FFUVersion.V2:
                     {
                         StoreHeaderV2 = stream.ReadStructure<StoreHeaderV2>();
-                        byte[] stringBytes = new byte[StoreHeaderV2.DevicePathLength * 2];
+                        Span<byte> stringBytes = new byte[StoreHeaderV2.DevicePathLength * 2];
                         _ = stream.Read(stringBytes);
                         UnicodeEncoding unicodeEncoding = new();
                         DevicePath = unicodeEncoding.GetString(stringBytes);

diff --git a/Img2Ffu.Library/Reader/FullFlashUpdateReaderStream.cs b/Img2Ffu.Library/Reader/FullFlashUpdateReaderStream.cs
@@ -389,7 +389,7 @@ public void CopyTo(Stream DestinationStream, Action<ulong, ulong> ProgressCallBa
 
                     _ = DestinationStream.Seek(OriginalDestinationStreamPosition + virtualPosition, SeekOrigin.Begin);
 
-                    byte[] buffer = image.GetStoreDataBlock(Stream, storeIndex, (ulong)physicalDiskBlockNumber);
+                    Span<byte> buffer = image.GetStoreDataBlock(Stream, storeIndex, (ulong)physicalDiskBlockNumber);
                     currentWrittenBytes += (ulong)blockSize;
                     ProgressCallBack?.Invoke(currentWrittenBytes, totalBytes);