Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ConsoleLogger.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)
• ShellPkg/Application/Shell/ConsoleLogger.h (modified) (12 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Application/Shell/ConsoleLogger.h

@@ -13 +13 @@
 #define CONSOLE_LOGGER_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('c', 'o', 'P', 'D')
 
-typedef struct _CONSOLE_LOGGER_PRIVATE_DATA{
-  UINTN                             Signature;
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   OurConOut;        ///< the protocol we installed onto the system table
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *OldConOut;       ///< old protocol to reinstall upon exiting
-  EFI_HANDLE                        OldConHandle;     ///< old protocol handle
-  UINTN                             ScreenCount;      ///< How many screens worth of data to save
-  CHAR16                            *Buffer;          ///< Buffer to save data
-  UINTN                             BufferSize;       ///< size of buffer in bytes
-
-                                                      //  start row is the top of the screen
-  UINTN                             OriginalStartRow; ///< What the originally visible start row was
-  UINTN                             CurrentStartRow;  ///< what the currently visible start row is
-
-  UINTN                             RowsPerScreen;    ///< how many rows the screen can display
-  UINTN                             ColsPerScreen;    ///< how many columns the screen can display
-
-  INT32                             *Attributes;      ///< Buffer for Attribute to be saved for each character
-  UINTN                             AttribSize;       ///< Size of Attributes in bytes
-
-  EFI_SIMPLE_TEXT_OUTPUT_MODE       HistoryMode;      ///< mode of the history log
-  BOOLEAN                           Enabled;          ///< Set to FALSE when a break is requested.
-  UINTN                             RowCounter;       ///< Initial row of each print job.
+typedef struct _CONSOLE_LOGGER_PRIVATE_DATA {
+  UINTN                              Signature;
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    OurConOut;       ///< the protocol we installed onto the system table
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *OldConOut;      ///< old protocol to reinstall upon exiting
+  EFI_HANDLE                         OldConHandle;    ///< old protocol handle
+  UINTN                              ScreenCount;     ///< How many screens worth of data to save
+  CHAR16                             *Buffer;         ///< Buffer to save data
+  UINTN                              BufferSize;      ///< size of buffer in bytes
+
+  //  start row is the top of the screen
+  UINTN                              OriginalStartRow; ///< What the originally visible start row was
+  UINTN                              CurrentStartRow;  ///< what the currently visible start row is
+
+  UINTN                              RowsPerScreen;   ///< how many rows the screen can display
+  UINTN                              ColsPerScreen;   ///< how many columns the screen can display
+
+  INT32                              *Attributes;     ///< Buffer for Attribute to be saved for each character
+  UINTN                              AttribSize;      ///< Size of Attributes in bytes
+
+  EFI_SIMPLE_TEXT_OUTPUT_MODE        HistoryMode;     ///< mode of the history log
+  BOOLEAN                            Enabled;         ///< Set to FALSE when a break is requested.
+  UINTN                              RowCounter;      ///< Initial row of each print job.
 } CONSOLE_LOGGER_PRIVATE_DATA;
 
-#define CONSOLE_LOGGER_PRIVATE_DATA_FROM_THIS(a) CR (a, CONSOLE_LOGGER_PRIVATE_DATA, OurConOut, CONSOLE_LOGGER_PRIVATE_DATA_SIGNATURE)
+#define CONSOLE_LOGGER_PRIVATE_DATA_FROM_THIS(a)  CR (a, CONSOLE_LOGGER_PRIVATE_DATA, OurConOut, CONSOLE_LOGGER_PRIVATE_DATA_SIGNATURE)
 
 /**
@@ -53 +53 @@
 **/
 EFI_STATUS
-ConsoleLoggerInstall(
-  IN CONST UINTN ScreensToSave,
-  OUT CONSOLE_LOGGER_PRIVATE_DATA **ConsoleInfo
+ConsoleLoggerInstall (
+  IN CONST UINTN                   ScreensToSave,
+  OUT CONSOLE_LOGGER_PRIVATE_DATA  **ConsoleInfo
   );
 
@@ -68 +68 @@
 **/
 EFI_STATUS
-ConsoleLoggerUninstall(
-  IN OUT CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
+ConsoleLoggerUninstall (
+  IN OUT CONSOLE_LOGGER_PRIVATE_DATA  *ConsoleInfo
   );
 
@@ -85 +85 @@
 **/
 EFI_STATUS
-ConsoleLoggerDisplayHistory(
-  IN CONST BOOLEAN  Forward,
-  IN CONST UINTN    Rows,
-  IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
+ConsoleLoggerDisplayHistory (
+  IN CONST BOOLEAN                Forward,
+  IN CONST UINTN                  Rows,
+  IN CONSOLE_LOGGER_PRIVATE_DATA  *ConsoleInfo
   );
 
@@ -101 +101 @@
 **/
 EFI_STATUS
-ConsoleLoggerStopHistory(
-  IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
+ConsoleLoggerStopHistory (
+  IN CONSOLE_LOGGER_PRIVATE_DATA  *ConsoleInfo
   );
 
@@ -113 +113 @@
 **/
 EFI_STATUS
-UpdateDisplayFromHistory(
-  IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
+UpdateDisplayFromHistory (
+  IN CONSOLE_LOGGER_PRIVATE_DATA  *ConsoleInfo
   );
 
@@ -130 +130 @@
 EFIAPI
 ConsoleLoggerReset (
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
-  IN  BOOLEAN                         ExtendedVerification
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,
+  IN  BOOLEAN                          ExtendedVerification
   );
 
@@ -152 +152 @@
 EFI_STATUS
 EFIAPI
-ConsoleLoggerOutputString(
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
-  IN  CHAR16                          *WString
+ConsoleLoggerOutputString (
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,
+  IN  CHAR16                           *WString
   );
 
@@ -174 +174 @@
 EFIAPI
 ConsoleLoggerTestString (
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
-  IN  CHAR16                          *WString
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,
+  IN  CHAR16                           *WString
   );
 
@@ -238 +238 @@
 EFIAPI
 ConsoleLoggerSetAttribute (
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
-  IN  UINTN                           Attribute
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,
+  IN  UINTN                            Attribute
   );
 
@@ -276 +276 @@
 ConsoleLoggerSetCursorPosition (
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,
-  IN  UINTN                         Column,
-  IN  UINTN                         Row
+  IN  UINTN                            Column,
+  IN  UINTN                            Row
   );
 
@@ -310 +310 @@
 **/
 EFI_STATUS
-ConsoleLoggerResetBuffers(
-  IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
+ConsoleLoggerResetBuffers (
+  IN CONSOLE_LOGGER_PRIVATE_DATA  *ConsoleInfo
   );
 
 #endif //_CONSOLE_LOGGER_HEADER_
-