X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FLibrary%2FQemuFwCfgLib%2FQemuFwCfgLib.c;h=8e8f54ba3facfe558520b9835603337269e0a6fd;hb=ac0a286f4d74;hp=4ef78b7a8b651009e4ccd1e24e315419de74e2d0;hpb=d1050b9dff1cace252aff86630bfdb59dff5f507;p=mirror_edk2.git

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 4ef78b7a8b..8e8f54ba3f 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -19,7 +19,6 @@
 
 #include "QemuFwCfgLibInternal.h"
 
-
 /**
   Selects a firmware configuration item for reading.
 
@@ -32,11 +31,11 @@
 VOID
 EFIAPI
 QemuFwCfgSelectItem (
-  IN FIRMWARE_CONFIG_ITEM   QemuFwCfgItem
+  IN FIRMWARE_CONFIG_ITEM  QemuFwCfgItem
   )
 {
-  DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem));
-  IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN) QemuFwCfgItem);
+  DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN)QemuFwCfgItem));
+  IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN)QemuFwCfgItem);
 }
 
 /**
@@ -49,18 +48,18 @@ QemuFwCfgSelectItem (
 VOID
 EFIAPI
 InternalQemuFwCfgReadBytes (
-  IN UINTN                  Size,
-  IN VOID                   *Buffer  OPTIONAL
+  IN UINTN  Size,
+  IN VOID   *Buffer  OPTIONAL
   )
 {
-  if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {
+  if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {
     InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_READ);
     return;
   }
+
   IoReadFifo8 (FW_CFG_IO_DATA, Size, Buffer);
 }
 
-
 /**
   Reads firmware configuration bytes into a buffer
 
@@ -75,8 +74,8 @@ InternalQemuFwCfgReadBytes (
 VOID
 EFIAPI
 QemuFwCfgReadBytes (
-  IN UINTN                  Size,
-  IN VOID                   *Buffer
+  IN UINTN  Size,
+  IN VOID   *Buffer
   )
 {
   if (InternalQemuFwCfgIsAvailable ()) {
@@ -100,20 +99,20 @@ QemuFwCfgReadBytes (
 VOID
 EFIAPI
 QemuFwCfgWriteBytes (
-  IN UINTN                  Size,
-  IN VOID                   *Buffer
+  IN UINTN  Size,
+  IN VOID   *Buffer
   )
 {
   if (InternalQemuFwCfgIsAvailable ()) {
-    if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {
+    if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {
       InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_WRITE);
       return;
     }
+
     IoWriteFifo8 (FW_CFG_IO_DATA, Size, Buffer);
   }
 }
 
-
 /**
   Skip bytes in the firmware configuration item.
 
@@ -126,17 +125,17 @@ QemuFwCfgWriteBytes (
 VOID
 EFIAPI
 QemuFwCfgSkipBytes (
-  IN UINTN                  Size
+  IN UINTN  Size
   )
 {
-  UINTN ChunkSize;
-  UINT8 SkipBuffer[256];
+  UINTN  ChunkSize;
+  UINT8  SkipBuffer[256];
 
   if (!InternalQemuFwCfgIsAvailable ()) {
     return;
   }
 
-  if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {
+  if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {
     InternalQemuFwCfgDmaBytes ((UINT32)Size, NULL, FW_CFG_DMA_CTL_SKIP);
     return;
   }
@@ -157,7 +156,6 @@ QemuFwCfgSkipBytes (
   }
 }
 
-
 /**
   Reads a UINT8 firmware configuration value
 
@@ -170,14 +168,13 @@ QemuFwCfgRead8 (
   VOID
   )
 {
-  UINT8 Result;
+  UINT8  Result;
 
   QemuFwCfgReadBytes (sizeof (Result), &Result);
 
   return Result;
 }
 
-
 /**
   Reads a UINT16 firmware configuration value
 
@@ -190,14 +187,13 @@ QemuFwCfgRead16 (
   VOID
   )
 {
-  UINT16 Result;
+  UINT16  Result;
 
   QemuFwCfgReadBytes (sizeof (Result), &Result);
 
   return Result;
 }
 
-
 /**
   Reads a UINT32 firmware configuration value
 
@@ -210,14 +206,13 @@ QemuFwCfgRead32 (
   VOID
   )
 {
-  UINT32 Result;
+  UINT32  Result;
 
   QemuFwCfgReadBytes (sizeof (Result), &Result);
 
   return Result;
 }
 
-
 /**
   Reads a UINT64 firmware configuration value
 
@@ -230,14 +225,13 @@ QemuFwCfgRead64 (
   VOID
   )
 {
-  UINT64 Result;
+  UINT64  Result;
 
   QemuFwCfgReadBytes (sizeof (Result), &Result);
 
   return Result;
 }
 
-
 /**
   Find the configuration item corresponding to the firmware configuration file.
 
@@ -259,8 +253,8 @@ QemuFwCfgFindFile (
   OUT  UINTN                 *Size
   )
 {
-  UINT32 Count;
-  UINT32 Idx;
+  UINT32  Count;
+  UINT32  Idx;
 
   if (!InternalQemuFwCfgIsAvailable ()) {
     return RETURN_UNSUPPORTED;
@@ -270,15 +264,15 @@ QemuFwCfgFindFile (
   Count = SwapBytes32 (QemuFwCfgRead32 ());
 
   for (Idx = 0; Idx < Count; ++Idx) {
-    UINT32 FileSize;
-    UINT16 FileSelect;
-    UINT16 FileReserved;
-    CHAR8  FName[QEMU_FW_CFG_FNAME_SIZE];
+    UINT32  FileSize;
+    UINT16  FileSelect;
+    UINT16  FileReserved;
+    CHAR8   FName[QEMU_FW_CFG_FNAME_SIZE];
 
     FileSize     = QemuFwCfgRead32 ();
     FileSelect   = QemuFwCfgRead16 ();
     FileReserved = QemuFwCfgRead16 ();
-    (VOID) FileReserved; /* Force a do-nothing reference. */
+    (VOID)FileReserved;  /* Force a do-nothing reference. */
     InternalQemuFwCfgReadBytes (sizeof (FName), FName);
 
     if (AsciiStrCmp (Name, FName) == 0) {