From 9f6531d14d145918079d03926ff827f6c1a274a4 Mon Sep 17 00:00:00 2001 From: gikidy Date: Fri, 24 Apr 2009 07:30:54 +0000 Subject: Adjust the code so that global variable placed at beginning of file. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8172 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Isa/IsaBusDxe/InternalIsaBus.h | 15 ++- .../Bus/Isa/IsaSerialDxe/Serial.h | 4 - .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c | 116 ++++++++++----------- .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h | 15 ++- .../Ps2MouseAbsolutePointer.h | 14 +-- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.h | 14 +-- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h | 14 +-- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 13 ++- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 32 +++--- .../Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h | 14 +-- .../ReportStatusCodeLibInternal.h | 3 +- .../ReportStatusCodeLibInternal.h | 4 +- .../Universal/BdsDxe/FrontPage.h | 28 ++--- .../Universal/BdsDxe/Language.c | 8 +- .../Universal/Console/VgaClassDxe/VgaClass.h | 15 +-- .../Universal/DataHubDxe/DataHub.c | 13 +-- .../PcatSingleSegmentPciCfgPei/PciCfgInternal.h | 13 ++- .../Universal/StatusCode/Dxe/DxeStatusCode.h | 1 - 18 files changed, 170 insertions(+), 166 deletions(-) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h index 66bd00ad86..9bfd065b1a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h @@ -40,6 +40,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "ComponentName.h" +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver; + +extern EFI_ISA_IO_PROTOCOL IsaIoInterface; + // // 8237 DMA registers // @@ -106,9 +113,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define R_8237_DMA_WRMSK_CH0_3 0x0f #define R_8237_DMA_WRMSK_CH4_7 0xde - -extern EFI_ISA_IO_PROTOCOL IsaIoInterface; - typedef enum { IsaAccessTypeUnknown, IsaAccessTypeIo, @@ -146,11 +150,6 @@ typedef struct { #define ISA_IO_DEVICE_FROM_ISA_IO_THIS(a) CR (a, ISA_IO_DEVICE, IsaIo, ISA_IO_DEVICE_SIGNATURE) -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gIsaBusControllerDriver; - // // Mapping structure for performing ISA DMA to a buffer above 16 MB // diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h index 2d3f71c136..af4428a996 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h @@ -114,10 +114,6 @@ typedef struct { #define SERIAL_DEV_FROM_THIS(a) CR (a, SERIAL_DEV, SerialIo, SERIAL_DEV_SIGNATURE) -// -// Globale Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gSerialControllerDriver; // // Serial Driver Defaults diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c index 973cf24afb..3662340149 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c @@ -15,64 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Ps2Keyboard.h" -// -// Function declarations -// -UINT8 -KeyReadDataRegister ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn - ); - -VOID -KeyWriteDataRegister ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT8 Data - ); - -VOID -KeyWriteCommandRegister ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT8 Data - ); - -VOID -KeyboardError ( - IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn, - IN CHAR16 *ErrMsg // should be a unicode string - ); - -EFI_STATUS -GetScancodeBufHead ( - KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT32 Count, - OUT UINT8 *Buf - ); - -EFI_STATUS -PopScancodeBufHead ( - KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT32 Count, - OUT UINT8 *Buf - ); - -EFI_STATUS -KeyboardWrite ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT8 Data - ); - -EFI_STATUS -KeyboardCommand ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT8 Data - ); - -EFI_STATUS -KeyboardWaitForValue ( - IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, - IN UINT8 Value - ); - struct { UINT8 ScanCode; UINT16 EfiScanCode; @@ -625,6 +567,64 @@ UINTN mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT; BOOLEAN mEnableMouseInterface; +// +// Function declarations +// +UINT8 +KeyReadDataRegister ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn + ); + +VOID +KeyWriteDataRegister ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT8 Data + ); + +VOID +KeyWriteCommandRegister ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT8 Data + ); + +VOID +KeyboardError ( + IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn, + IN CHAR16 *ErrMsg // should be a unicode string + ); + +EFI_STATUS +GetScancodeBufHead ( + KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT32 Count, + OUT UINT8 *Buf + ); + +EFI_STATUS +PopScancodeBufHead ( + KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT32 Count, + OUT UINT8 *Buf + ); + +EFI_STATUS +KeyboardWrite ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT8 Data + ); + +EFI_STATUS +KeyboardCommand ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT8 Data + ); + +EFI_STATUS +KeyboardWaitForValue ( + IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn, + IN UINT8 Value + ); + /** Read data register diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h index a029ef910f..cbfbbda768 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h @@ -34,6 +34,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gKeyboardControllerDriver; +extern EFI_COMPONENT_NAME_PROTOCOL gPs2KeyboardComponentName; +extern EFI_COMPONENT_NAME2_PROTOCOL gPs2KeyboardComponentName2; + // // Driver Private Data // @@ -119,14 +126,6 @@ typedef struct { #define TABLE_END 0x0 -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gKeyboardControllerDriver; -extern EFI_COMPONENT_NAME_PROTOCOL gPs2KeyboardComponentName; -extern EFI_COMPONENT_NAME2_PROTOCOL gPs2KeyboardComponentName2; - - // // Driver entry point // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h index d7041a40ae..8f6c43591a 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h @@ -30,6 +30,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gPS2MouseAbsolutePointerDriver; +extern EFI_COMPONENT_NAME_PROTOCOL gPs2MouseAbsolutePointerComponentName; +extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseAbsolutePointerComponentName2; + // // PS/2 mouse sample rate // @@ -95,13 +102,6 @@ typedef struct { #define PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS(a) CR (a, PS2_MOUSE_ABSOLUTE_POINTER_DEV, AbsolutePointerProtocol, PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE) -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gPS2MouseAbsolutePointerDriver; -extern EFI_COMPONENT_NAME_PROTOCOL gPs2MouseAbsolutePointerComponentName; -extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseAbsolutePointerComponentName2; - // // Function prototypes // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h index 5102d34307..b4454b1842 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h @@ -30,6 +30,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gPS2MouseDriver; +extern EFI_COMPONENT_NAME_PROTOCOL gPs2MouseComponentName; +extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseComponentName2; + // // PS/2 mouse sample rate // @@ -95,13 +102,6 @@ typedef struct { #define PS2_MOUSE_DEV_FROM_THIS(a) CR (a, PS2_MOUSE_DEV, SimplePointerProtocol, PS2_MOUSE_DEV_SIGNATURE) -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gPS2MouseDriver; -extern EFI_COMPONENT_NAME_PROTOCOL gPs2MouseComponentName; -extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseComponentName2; - // // Function prototypes // diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h index d0a7e0ab88..1c5b559bd8 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h @@ -42,6 +42,13 @@ #include #include "IdeData.h" +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gIDEBusDriverBinding; +extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL gIDEBusDriverDiagnostics; +extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiagnostics2; + // // Extra Definition to porting // @@ -110,13 +117,6 @@ typedef struct { #define IDE_BLOCK_IO_DEV_FROM_THIS(a) CR (a, IDE_BLK_IO_DEV, BlkIo, IDE_BLK_IO_DEV_SIGNATURE) #define IDE_BLOCK_IO_DEV_FROM_DISK_INFO_THIS(a) CR (a, IDE_BLK_IO_DEV, DiskInfo, IDE_BLK_IO_DEV_SIGNATURE) -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gIDEBusDriverBinding; -extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL gIDEBusDriverDiagnostics; -extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiagnostics2; - #include "Ide.h" // diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h index 5b0428bec4..8e4a222dc5 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -53,6 +53,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include "ComponentName.h" + +// +// Global Variables +// +extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport; +extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gPciBusComponentName; +extern EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2; + // // Driver Produced Protocol Prototypes // @@ -238,10 +247,6 @@ typedef struct _PCI_IO_DEVICE { // // Global Variables // -extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport; -extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gPciBusComponentName; -extern EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2; extern LIST_ENTRY gPciDevicePool; extern BOOLEAN gFullEnumeration; extern UINTN gPciHostBridgeNumber; diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c index f92a5beeca..7975505328 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c @@ -18,22 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // // Internal use only // -/** - report a error Status code of PCI bus driver controller. - - @param PciIoDevice Pci device instance. - @param Code status code. -**/ -EFI_STATUS -ReportErrorStatusCode ( - IN PCI_IO_DEVICE *PciIoDevice, - IN EFI_STATUS_CODE_VALUE Code - ); -// -// PCI I/O Support Function Prototypes -// -// // // Pci Io Protocol Interface // @@ -66,6 +51,23 @@ EFI_PCI_IO_PROTOCOL PciIoInterface = { NULL }; +/** + report a error Status code of PCI bus driver controller. + + @param PciIoDevice Pci device instance. + @param Code status code. +**/ +EFI_STATUS +ReportErrorStatusCode ( + IN PCI_IO_DEVICE *PciIoDevice, + IN EFI_STATUS_CODE_VALUE Code + ); + +// +// PCI I/O Support Function Prototypes +// +// + /** report a error Status code of PCI bus driver controller. diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h index a1100a27cf..ef5b8a4c9c 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h +++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h @@ -37,6 +37,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include +// +// Global Variables +// +extern EFI_DRIVER_BINDING_PROTOCOL gPciVgaMiniPortDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gPciVgaMiniPortComponentName; +extern EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2; + // // PCI VGA MiniPort Device Structure // @@ -51,13 +58,6 @@ typedef struct { #define PCI_VGA_MINI_PORT_DEV_FROM_THIS(a) CR(a, PCI_VGA_MINI_PORT_DEV, VgaMiniPort, PCI_VGA_MINI_PORT_DEV_SIGNATURE) -// -// Global Variables -// -extern EFI_DRIVER_BINDING_PROTOCOL gPciVgaMiniPortDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gPciVgaMiniPortComponentName; -extern EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2; - // // Driver Binding Protocol functions // diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h index 25262bc0b3..5229061ff2 100644 --- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h +++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h @@ -32,6 +32,7 @@ #include #include +extern EFI_REPORT_STATUS_CODE mReportStatusCode; /** Locate he report status code service. @@ -129,7 +130,5 @@ InternalReportStatusCodeEx ( IN UINTN ExtendedDataSize ); -extern EFI_REPORT_STATUS_CODE mReportStatusCode; - #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h index 2bc73ba190..35d5faedd1 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h @@ -33,6 +33,8 @@ #include #include +extern EFI_REPORT_STATUS_CODE mReportStatusCode; + /** Locatet he report status code service. @@ -129,7 +131,7 @@ InternalReportStatusCodeEx ( IN UINTN ExtendedDataSize ); -extern EFI_REPORT_STATUS_CODE mReportStatusCode; + #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H 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 @@ -33,6 +33,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include +// +// 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. // @@ -70,13 +78,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 @@ -26,6 +26,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 // @@ -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 +// +// 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 -- cgit v1.2.3