Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

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

103761

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c (modified) (5 diffs)
• MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h (modified) (2 diffs)
• MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c

@@ -2 +2 @@
   Serial I/O status code reporting worker.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
@@ -47 +47 @@
   CHAR8           *Description;
   CHAR8           *Format;
-  CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
+  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];
   UINT32          ErrorLevel;
   UINT32          LineNumber;
@@ -86 +86 @@
                   Buffer, 
                   sizeof (Buffer), 
-                  "ERROR: C%x:V%x I%x", 
+                  "ERROR: C%08x:V%08x I%x", 
                   CodeType, 
                   Value, 
@@ -123 +123 @@
                   Buffer, 
                   sizeof (Buffer), 
-                  "PROGRESS CODE: V%x I%x\n\r", 
+                  "PROGRESS CODE: V%08x I%x\n\r", 
                   Value, 
                   Instance
@@ -146 +146 @@
                   Buffer, 
                   sizeof (Buffer), 
-                  "Undefined: C%x:V%x I%x\n\r", 
+                  "Undefined: C%08x:V%08x I%x\n\r", 
                   CodeType, 
                   Value, 

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h

@@ -2 +2 @@
   Internal include file for Status Code Handler Driver.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -32 +32 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/BaseMemoryLib.h>
+
+//
+// Define the maximum message length
+//
+#define MAX_DEBUG_MESSAGE_LENGTH 0x100
 
 //

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf

@@ -1 +1 @@
 ## @file
-#  Status Code Handler Driver which produces general handlers and hook them
-#  onto the SMM status code router.
+#  Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.
 #
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -18 +17 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = StatusCodeHandlerSmm
+  MODULE_UNI_FILE                = StatusCodeHandlerSmm.uni
   FILE_GUID                      = 79CD78D8-6EDC-4978-BD02-3299C387AB17
   MODULE_TYPE                    = DXE_SMM_DRIVER
@@ -48 +48 @@
   ReportStatusCodeLib
   DebugLib
-  SynchronizationLib
   MemoryAllocationLib
   BaseMemoryLib
   
 [Guids]
-  gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
-  gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
+  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
 
 [Protocols]
@@ -60 +58 @@
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiSmmRscHandlerProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  StatusCodeHandlerSmmExtra.uni