diff options
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
6 files changed, 40 insertions, 38 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h index 998ad1ff33..52f8ec5f66 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h @@ -20,6 +20,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "BootMngr/BootManager.h"
#include "String.h"
+
+//
+// These are the VFR compiler generated data representing our VFR data.
+//
+extern UINT8 FrontPageVfrBin[];
+
+extern EFI_HII_DATABASE_PROTOCOL *gHiiDatabase;
+extern EFI_HII_STRING_PROTOCOL *gHiiString;
+extern EFI_FORM_BROWSER2_PROTOCOL *gFormBrowser2;
+extern EFI_HII_CONFIG_ROUTING_PROTOCOL *gHiiConfigRouting;
+
+extern UINTN gCallbackKey;
+extern BOOLEAN gConnectAllHappened;
+
+
#define ONE_SECOND 10000000
///
@@ -77,19 +92,6 @@ typedef struct { FRONT_PAGE_CALLBACK_DATA_SIGNATURE \
)
-//
-// These are the VFR compiler generated data representing our VFR data.
-//
-extern UINT8 FrontPageVfrBin[];
-
-extern EFI_HII_DATABASE_PROTOCOL *gHiiDatabase;
-extern EFI_HII_STRING_PROTOCOL *gHiiString;
-extern EFI_FORM_BROWSER2_PROTOCOL *gFormBrowser2;
-extern EFI_HII_CONFIG_ROUTING_PROTOCOL *gHiiConfigRouting;
-
-extern UINTN gCallbackKey;
-extern BOOLEAN gConnectAllHappened;
-
/**
This function allows a caller to extract the current configuration for one
or more named elements from the target driver.
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c index ea66006b4c..ae64c7252b 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c @@ -15,6 +15,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Language.h"
#include "FrontPage.h"
+EFI_GUID mFontPackageGuid = {
+ 0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}
+};
+
//
// Lookup table of ISO639-2 3 character language codes to ISO 639-1 2 character language codes
// Each entry is 5 CHAR8 values long. The first 3 CHAR8 values are the ISO 639-2 code.
@@ -162,10 +166,6 @@ zulzu\ #define NARROW_GLYPH_NUMBER 8
#define WIDE_GLYPH_NUMBER 75
-EFI_GUID mFontPackageGuid = {
- 0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}
-};
-
typedef struct {
///
/// This 4-bytes total array length is required by HiiAddPackages()
diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h index 27c32ef531..7284f90684 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h @@ -34,6 +34,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <IndustryStandard/Pci22.h>
//
+// Global Variables
+//
+extern EFI_DRIVER_BINDING_PROTOCOL gVgaClassDriverBinding;
+extern EFI_COMPONENT_NAME_PROTOCOL gVgaClassComponentName;
+extern EFI_COMPONENT_NAME2_PROTOCOL gVgaClassComponentName2;
+
+
+//
// Structure for tuple containing mapping among uniocde, PC Ansi and ASCII code.
//
typedef struct {
@@ -71,13 +79,6 @@ typedef struct { #define VGA_CLASS_DEV_FROM_THIS(a) CR (a, VGA_CLASS_DEV, SimpleTextOut, VGA_CLASS_DEV_SIGNATURE)
//
-// Global Variables
-//
-extern EFI_DRIVER_BINDING_PROTOCOL gVgaClassDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL gVgaClassComponentName;
-extern EFI_COMPONENT_NAME2_PROTOCOL gVgaClassComponentName2;
-
-//
// Driver Binding Protocol functions
//
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c index af68644e9c..b58de9db6f 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c @@ -27,6 +27,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. CONST EFI_GUID gZeroGuid = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
//
+// Module Global:
+// Since this driver will only ever produce one instance of the Logging Hub
+// protocol you are not required to dynamically allocate the PrivateData.
+//
+DATA_HUB_INSTANCE mPrivateData;
+
+//
// Worker functions private to this file
//
DATA_HUB_FILTER_DRIVER *
@@ -531,12 +538,6 @@ GetNextDataRecord ( return Record;
}
-//
-// Module Global:
-// Since this driver will only ever produce one instance of the Logging Hub
-// protocol you are not required to dynamically allocate the PrivateData.
-//
-DATA_HUB_INSTANCE mPrivateData;
/**
diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h index 5c8bd8a368..8aa6289b1f 100644 --- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h +++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h @@ -29,6 +29,12 @@ #include <IndustryStandard/Pci.h>
+//
+// Global Variables
+//
+extern EFI_PEI_PCI_CFG_PPI gPciCfgPpi;
+extern EFI_PEI_PPI_DESCRIPTOR gPciCfgPpiList;
+
/**
Convert EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS to PCI_LIB_ADDRESS.
@@ -228,11 +234,4 @@ PciCfgModify ( IN UINTN ClearBits
);
-//
-// Global Variables
-//
-extern EFI_PEI_PCI_CFG_PPI gPciCfgPpi;
-extern EFI_PEI_PPI_DESCRIPTOR gPciCfgPpiList;
-
-
#endif
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h index fdac8730fa..4004deb484 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h @@ -272,5 +272,4 @@ DxeStatusCodeDriverEntry ( // declaration of DXE status code controller.
//
extern DXE_STATUS_CODE_CONTROLLER gDxeStatusCode;
-
#endif
|