Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h

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)
• OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h

@@ -32 +32 @@
 #include <IndustryStandard/Pci.h>
 
-#define GRAPHICS_OUTPUT_INVALID_MODE_NUMBER 0xffff
+#define GRAPHICS_OUTPUT_INVALID_MODE_NUMBER  0xffff
 
 typedef struct {
-  UINT32                     HorizontalResolution;
-  UINT32                     VerticalResolution;
-  UINT32                     ColorDepth;
-  UINT32                     RefreshRate;
+  UINT32    HorizontalResolution;
+  UINT32    VerticalResolution;
+  UINT32    ColorDepth;
+  UINT32    RefreshRate;
 } GOP_MODE_DATA;
 
-#define PIXEL_RED_SHIFT   0
-#define PIXEL_GREEN_SHIFT 3
-#define PIXEL_BLUE_SHIFT  6
+#define PIXEL_RED_SHIFT    0
+#define PIXEL_GREEN_SHIFT  3
+#define PIXEL_BLUE_SHIFT   6
 
 #define PIXEL_RED_MASK    (BIT7 | BIT6 | BIT5)
@@ -49 +49 @@
 #define PIXEL_BLUE_MASK   (BIT1 | BIT0)
 
-#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift) ((UINT8) ((pixel & mask) << shift))
-#define PIXEL_TO_RED_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)
-#define PIXEL_TO_GREEN_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)
-#define PIXEL_TO_BLUE_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)
+#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift)  ((UINT8) ((pixel & mask) << shift))
+#define PIXEL_TO_RED_BYTE(pixel)                 PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)
+#define PIXEL_TO_GREEN_BYTE(pixel)               PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)
+#define PIXEL_TO_BLUE_BYTE(pixel)                PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)
 
 #define RGB_BYTES_TO_PIXEL(Red, Green, Blue) \
@@ -63 +63 @@
 #define PIXEL24_BLUE_MASK   0x000000ff
 
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;
+extern EFI_DRIVER_BINDING_PROTOCOL  gEmuGopDriverBinding;
+extern EFI_COMPONENT_NAME_PROTOCOL  gEmuGopComponentName;
 
-#define EMU_UGA_CLASS_NAME       L"EmuGopWindow"
+#define EMU_UGA_CLASS_NAME  L"EmuGopWindow"
 
 #define GOP_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('G', 'o', 'p', 'N')
 typedef struct {
-  UINT64                            Signature;
+  UINT64                          Signature;
 
-  EFI_HANDLE                        Handle;
-  EFI_PCI_IO_PROTOCOL               *PciIo;
-  EFI_GRAPHICS_OUTPUT_PROTOCOL      GraphicsOutput;
-  EFI_DEVICE_PATH_PROTOCOL          *GopDevicePath;
+  EFI_HANDLE                      Handle;
+  EFI_PCI_IO_PROTOCOL             *PciIo;
+  EFI_GRAPHICS_OUTPUT_PROTOCOL    GraphicsOutput;
+  EFI_DEVICE_PATH_PROTOCOL        *GopDevicePath;
 
-  EFI_UNICODE_STRING_TABLE          *ControllerNameTable;
+  EFI_UNICODE_STRING_TABLE        *ControllerNameTable;
 
   //
   // GOP Private Data for QueryMode ()
   //
-  GOP_MODE_DATA                     *ModeData;
+  GOP_MODE_DATA                   *ModeData;
 
-  UINT64                            FbAddr;
-  UINT32                            FbSize;
+  UINT64                          FbAddr;
+  UINT32                          FbSize;
 } GOP_PRIVATE_DATA;
-
 
 #define GOP_PRIVATE_DATA_FROM_THIS(a)  \
@@ -93 +92 @@
 
 typedef struct {
-  UINT32            FbSize;
-  UINT16            Width;
-  UINT16            Height;
-  UINT16            Depth;
-  UINT16            RefreshRate;
+  UINT32    FbSize;
+  UINT16    Width;
+  UINT16    Height;
+  UINT16    Depth;
+  UINT16    RefreshRate;
 } BHYVE_FBUF_MEMREGS;
 
@@ -103 +102 @@
 // Global Protocol Variables
 //
-extern EFI_DRIVER_BINDING_PROTOCOL  gEmuGopDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL  gEmuGopComponentName;
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2;
+extern EFI_DRIVER_BINDING_PROTOCOL   gEmuGopDriverBinding;
+extern EFI_COMPONENT_NAME_PROTOCOL   gEmuGopComponentName;
+extern EFI_COMPONENT_NAME2_PROTOCOL  gEmuGopComponentName2;
 
 //
@@ -112 +111 @@
 EFI_STATUS
 EmuGopConstructor (
-  IN  GOP_PRIVATE_DATA    *Private
+  IN  GOP_PRIVATE_DATA  *Private
   );
 
 EFI_STATUS
 EmuGopDestructor (
-  IN  GOP_PRIVATE_DATA    *Private
+  IN  GOP_PRIVATE_DATA  *Private
   );
 
@@ -130 +129 @@
 BhyveSetGraphicsMode (
   GOP_PRIVATE_DATA  *Private,
-  UINT16             Width,
-  UINT16             Height,
-  UINT16             Depth
+  UINT16            Width,
+  UINT16            Height,
+  UINT16            Depth
   );
 
 VOID
 BhyveGetMemregs (
-  GOP_PRIVATE_DATA  *Private,
-  BHYVE_FBUF_MEMREGS *Memregs
+  GOP_PRIVATE_DATA    *Private,
+  BHYVE_FBUF_MEMREGS  *Memregs
   );
 
 VOID
 InstallVbeShim (
-  IN CONST CHAR16         *CardName,
-  IN EFI_PHYSICAL_ADDRESS FrameBufferBase
+  IN CONST CHAR16          *CardName,
+  IN EFI_PHYSICAL_ADDRESS  FrameBufferBase
   );