Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/FatPkg/EnhancedFatDxe/ReadWrite.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• FatPkg/EnhancedFatDxe/ReadWrite.c (modified) (26 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/FatPkg/EnhancedFatDxe/ReadWrite.c

@@ -26 +26 @@
 EFIAPI
 FatGetPosition (
-  IN  EFI_FILE_PROTOCOL *FHand,
-  OUT UINT64            *Position
-  )
-{
-  FAT_IFILE *IFile;
-  FAT_OFILE *OFile;
+  IN  EFI_FILE_PROTOCOL  *FHand,
+  OUT UINT64             *Position
+  )
+{
+  FAT_IFILE  *IFile;
+  FAT_OFILE  *OFile;
 
   IFile = IFILE_FROM_FHAND (FHand);
@@ -67 +67 @@
   )
 {
-  FAT_IFILE *IFile;
-  FAT_OFILE *OFile;
+  FAT_IFILE  *IFile;
+  FAT_OFILE  *OFile;
 
   IFile = IFILE_FROM_FHAND (FHand);
@@ -92 +92 @@
     FatResetODirCursor (OFile);
   }
+
   //
   // Set the position
@@ -98 +99 @@
     Position = OFile->FileSize;
   }
+
   //
   // Set the position
@@ -119 +121 @@
 EFI_STATUS
 FatIFileReadDir (
-  IN     FAT_IFILE              *IFile,
-  IN OUT UINTN                  *BufferSize,
-     OUT VOID                   *Buffer
+  IN     FAT_IFILE  *IFile,
+  IN OUT UINTN      *BufferSize,
+  OUT VOID          *Buffer
   )
 {
@@ -130 +132 @@
   UINT32      CurrentPos;
 
-  OFile       = IFile->OFile;
-  ODir        = OFile->ODir;
-  CurrentPos  = ((UINT32) IFile->Position) / sizeof (FAT_DIRECTORY_ENTRY);
+  OFile      = IFile->OFile;
+  ODir       = OFile->ODir;
+  CurrentPos = ((UINT32)IFile->Position) / sizeof (FAT_DIRECTORY_ENTRY);
 
   //
@@ -143 +145 @@
     FatResetODirCursor (OFile);
   }
+
   //
   // We seek the next directory entry's position
@@ -148 +151 @@
   do {
     Status = FatGetNextDirEnt (OFile, &DirEnt);
-    if (EFI_ERROR (Status) || DirEnt == NULL) {
+    if (EFI_ERROR (Status) || (DirEnt == NULL)) {
       //
       // Something error occurred or reach the end of directory,
@@ -157 +160 @@
     }
   } while (ODir->CurrentPos <= CurrentPos);
+
   Status = FatGetDirEntInfo (OFile->Volume, DirEnt, BufferSize, Buffer);
 
@@ -194 +198 @@
 EFI_STATUS
 FatIFileAccess (
-  IN     EFI_FILE_PROTOCOL     *FHand,
-  IN     IO_MODE               IoMode,
-  IN OUT UINTN                 *BufferSize,
-  IN OUT VOID                  *Buffer,
-  IN     EFI_FILE_IO_TOKEN     *Token
+  IN     EFI_FILE_PROTOCOL  *FHand,
+  IN     IO_MODE            IoMode,
+  IN OUT UINTN              *BufferSize,
+  IN OUT VOID               *Buffer,
+  IN     EFI_FILE_IO_TOKEN  *Token
   )
 {
@@ -254 +258 @@
       return EFI_UNSUPPORTED;
     }
+
     Task = FatCreateTask (IFile, Token);
     if (Task == NULL) {
@@ -270 +275 @@
       ASSERT (IoMode == ReadData);
       Status = FatIFileReadDir (IFile, BufferSize, Buffer);
-      OFile = NULL;
+      OFile  = NULL;
     } else {
       //
@@ -284 +289 @@
           // Adjust the actual size read
           //
-          *BufferSize -= (UINTN) EndPosition - OFile->FileSize;
+          *BufferSize -= (UINTN)EndPosition - OFile->FileSize;
         } else {
           //
@@ -305 +310 @@
       }
 
-      Status = FatAccessOFile (OFile, IoMode, (UINTN) IFile->Position, BufferSize, Buffer, Task);
+      Status           = FatAccessOFile (OFile, IoMode, (UINTN)IFile->Position, BufferSize, Buffer, Task);
       IFile->Position += *BufferSize;
     }
@@ -356 +361 @@
   IN     EFI_FILE_PROTOCOL  *FHand,
   IN OUT UINTN              *BufferSize,
-     OUT VOID               *Buffer
+  OUT VOID                  *Buffer
   )
 {
@@ -454 +459 @@
 EFI_STATUS
 FatAccessOFile (
-  IN     FAT_OFILE      *OFile,
-  IN     IO_MODE        IoMode,
-  IN     UINTN          Position,
-  IN OUT UINTN          *DataBufferSize,
-  IN OUT UINT8          *UserBuffer,
-  IN FAT_TASK           *Task
+  IN     FAT_OFILE  *OFile,
+  IN     IO_MODE    IoMode,
+  IN     UINTN      Position,
+  IN OUT UINTN      *DataBufferSize,
+  IN OUT UINT8      *UserBuffer,
+  IN FAT_TASK       *Task
   )
 {
@@ -467 +472 @@
   UINTN       BufferSize;
 
-  BufferSize  = *DataBufferSize;
-  Volume      = OFile->Volume;
+  BufferSize = *DataBufferSize;
+  Volume     = OFile->Volume;
   ASSERT_VOLUME_LOCKED (Volume);
 
@@ -480 +485 @@
       break;
     }
+
     //
     // Clip length to block run
@@ -492 +498 @@
       break;
     }
+
     //
     // Data was successfully accessed
@@ -499 +506 @@
     BufferSize -= Len;
     if (IoMode == WriteData) {
-      OFile->Dirty    = TRUE;
-      OFile->Archive  = TRUE;
-    }
+      OFile->Dirty   = TRUE;
+      OFile->Archive = TRUE;
+    }
+
     //
     // Make sure no outbound occurred
@@ -507 +515 @@
     ASSERT (Position <= OFile->FileSize);
   }
+
   //
   // Update the number of bytes accessed
@@ -527 +536 @@
 EFI_STATUS
 FatExpandOFile (
-  IN FAT_OFILE          *OFile,
-  IN UINT64             ExpandedSize
+  IN FAT_OFILE  *OFile,
+  IN UINT64     ExpandedSize
   )
 {
@@ -534 +543 @@
   UINTN       WritePos;
 
-  WritePos  = OFile->FileSize;
-  Status    = FatGrowEof (OFile, ExpandedSize);
+  WritePos = OFile->FileSize;
+  Status   = FatGrowEof (OFile, ExpandedSize);
   if (!EFI_ERROR (Status)) {
     Status = FatWriteZeroPool (OFile, WritePos);
@@ -567 +576 @@
   UINTN       WriteSize;
 
-  AppendedSize  = OFile->FileSize - WritePos;
-  BufferSize    = AppendedSize;
+  AppendedSize = OFile->FileSize - WritePos;
+  BufferSize   = AppendedSize;
   if (AppendedSize > FAT_MAX_ALLOCATE_SIZE) {
     //
@@ -585 +594 @@
 
   do {
-    WriteSize     = AppendedSize > BufferSize ? BufferSize : (UINTN) AppendedSize;
+    WriteSize     = AppendedSize > BufferSize ? BufferSize : (UINTN)AppendedSize;
     AppendedSize -= WriteSize;
-    Status = FatAccessOFile (OFile, WriteData, WritePos, &WriteSize, ZeroBuffer, NULL);
+    Status        = FatAccessOFile (OFile, WriteData, WritePos, &WriteSize, ZeroBuffer, NULL);
     if (EFI_ERROR (Status)) {
       break;
@@ -612 +621 @@
 EFI_STATUS
 FatTruncateOFile (
-  IN FAT_OFILE          *OFile,
-  IN UINTN              TruncatedSize
+  IN FAT_OFILE  *OFile,
+  IN UINTN      TruncatedSize
   )
 {