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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index 66bd00ad864e1d27eafb350b2e90d69f9cc0cf56..9bfd065b1a2bbf31b78a17d420b6d82f498c9f81 100644 (file)
--- 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.
 \r
 #include "ComponentName.h"\r
 \r
 \r
 #include "ComponentName.h"\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL  gIsaBusControllerDriver;\r
+\r
+extern EFI_ISA_IO_PROTOCOL          IsaIoInterface;\r
+\r

 //\r
 // 8237 DMA registers\r
 //\r
 //\r
 // 8237 DMA registers\r
 //\r


@@ -106,9 +113,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define R_8237_DMA_WRMSK_CH0_3                    0x0f\r
 #define R_8237_DMA_WRMSK_CH4_7                    0xde\r
 \r
 #define R_8237_DMA_WRMSK_CH0_3                    0x0f\r
 #define R_8237_DMA_WRMSK_CH4_7                    0xde\r
 \r

-\r
-extern EFI_ISA_IO_PROTOCOL    IsaIoInterface;\r
-\r

 typedef enum {\r
   IsaAccessTypeUnknown,\r
   IsaAccessTypeIo,\r
 typedef enum {\r
   IsaAccessTypeUnknown,\r
   IsaAccessTypeIo,\r


@@ -146,11 +150,6 @@ typedef struct {
 \r
 #define ISA_IO_DEVICE_FROM_ISA_IO_THIS(a) CR (a, ISA_IO_DEVICE, IsaIo, ISA_IO_DEVICE_SIGNATURE)\r
 \r
 \r
 #define ISA_IO_DEVICE_FROM_ISA_IO_THIS(a) CR (a, ISA_IO_DEVICE, IsaIo, ISA_IO_DEVICE_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gIsaBusControllerDriver;\r
-\r

 //\r
 // Mapping structure for performing ISA DMA to a buffer above 16 MB\r
 //\r
 //\r
 // Mapping structure for performing ISA DMA to a buffer above 16 MB\r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index 2d3f71c13617b6e9af865738e9a808a2cd3ad291..af4428a99622cea3625e271102bd4b4ea19b082a 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
@@ -114,10 +114,6 @@ typedef struct {
 \r
 #define SERIAL_DEV_FROM_THIS(a) CR (a, SERIAL_DEV, SerialIo, SERIAL_DEV_SIGNATURE)\r
 \r
 \r
 #define SERIAL_DEV_FROM_THIS(a) CR (a, SERIAL_DEV, SerialIo, SERIAL_DEV_SIGNATURE)\r
 \r

-//\r
-// Globale Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gSerialControllerDriver;\r

 \r
 //\r
 // Serial Driver Defaults\r
 \r
 //\r
 // Serial Driver Defaults\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 973cf24afb8f5748da49ad2e25d0b6a6a0a435ec..36623401491cab65ec4302fd980546240eee04b2 100644 (file)
--- 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.
 \r
 #include "Ps2Keyboard.h"\r
 \r
 \r
 #include "Ps2Keyboard.h"\r
 \r

-//\r
-// Function declarations\r
-//\r
-UINT8\r
-KeyReadDataRegister (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
-  );\r
-\r
-VOID\r
-KeyWriteDataRegister (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
-  IN UINT8                   Data\r
-  );\r
-\r
-VOID\r
-KeyWriteCommandRegister (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
-  IN UINT8                   Data\r
-  );\r
-\r
-VOID\r
-KeyboardError (\r
-  IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,\r
-  IN CHAR16                 *ErrMsg // should be a unicode string\r
-  );\r
-\r
-EFI_STATUS\r
-GetScancodeBufHead (\r
-  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
-  IN UINT32                Count,\r
-  OUT UINT8                *Buf\r
-  );\r
-\r
-EFI_STATUS\r
-PopScancodeBufHead (\r
-  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
-  IN UINT32                Count,\r
-  OUT UINT8                *Buf\r
-  );\r
-\r
-EFI_STATUS\r
-KeyboardWrite (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
-  IN UINT8                   Data\r
-  );\r
-\r
-EFI_STATUS\r
-KeyboardCommand (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
-  IN UINT8                   Data\r
-  );\r
-\r
-EFI_STATUS\r
-KeyboardWaitForValue (\r
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
-  IN UINT8                   Value\r
-  );\r
-\r

 struct {\r
   UINT8  ScanCode;\r
   UINT16  EfiScanCode;\r
 struct {\r
   UINT8  ScanCode;\r
   UINT16  EfiScanCode;\r


@@ -625,6 +567,64 @@ UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;
 \r
 BOOLEAN          mEnableMouseInterface;\r
 \r
 \r
 BOOLEAN          mEnableMouseInterface;\r
 \r

+//\r
+// Function declarations\r
+//\r
+UINT8\r
+KeyReadDataRegister (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
+  );\r
+\r
+VOID\r
+KeyWriteDataRegister (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+  IN UINT8                   Data\r
+  );\r
+\r
+VOID\r
+KeyWriteCommandRegister (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+  IN UINT8                   Data\r
+  );\r
+\r
+VOID\r
+KeyboardError (\r
+  IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,\r
+  IN CHAR16                 *ErrMsg // should be a unicode string\r
+  );\r
+\r
+EFI_STATUS\r
+GetScancodeBufHead (\r
+  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
+  IN UINT32                Count,\r
+  OUT UINT8                *Buf\r
+  );\r
+\r
+EFI_STATUS\r
+PopScancodeBufHead (\r
+  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
+  IN UINT32                Count,\r
+  OUT UINT8                *Buf\r
+  );\r
+\r
+EFI_STATUS\r
+KeyboardWrite (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+  IN UINT8                   Data\r
+  );\r
+\r
+EFI_STATUS\r
+KeyboardCommand (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+  IN UINT8                   Data\r
+  );\r
+\r
+EFI_STATUS\r
+KeyboardWaitForValue (\r
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+  IN UINT8                   Value\r
+  );\r
+\r

 /**\r
   Read data register \r
 \r
 /**\r
   Read data register \r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index a029ef910ff7c5d79d298d961b2dcecc3b04e39f..cbfbbda768a650ac652a0873e34e209c75287627 100644 (file)
--- 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 <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gKeyboardControllerDriver;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gPs2KeyboardComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2KeyboardComponentName2;\r
+\r

 //\r
 // Driver Private Data\r
 //\r
 //\r
 // Driver Private Data\r
 //\r


@@ -119,14 +126,6 @@ typedef struct {
 \r
 #define TABLE_END 0x0\r
 \r
 \r
 #define TABLE_END 0x0\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gKeyboardControllerDriver;\r
-extern EFI_COMPONENT_NAME_PROTOCOL   gPs2KeyboardComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2KeyboardComponentName2;\r
-\r
-\r

 //\r
 // Driver entry point\r
 //\r
 //\r
 // Driver entry point\r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
index d7041a40aefa61c73fc2fdbfced9365a2d79b685..8f6c43591ac4a2383a10cff0f74cf75c5ff99b1b 100644 (file)
--- 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 <Library/UefiBootServicesTableLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 \r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseAbsolutePointerDriver;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseAbsolutePointerComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseAbsolutePointerComponentName2;\r
+\r

 //\r
 // PS/2 mouse sample rate\r
 //\r
 //\r
 // PS/2 mouse sample rate\r
 //\r


@@ -95,13 +102,6 @@ typedef struct {
 \r
 #define PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_ABSOLUTE_POINTER_DEV, AbsolutePointerProtocol, PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE)\r
 \r
 \r
 #define PS2_MOUSE_ABSOLUTE_POINTER_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_ABSOLUTE_POINTER_DEV, AbsolutePointerProtocol, PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseAbsolutePointerDriver;\r
-extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseAbsolutePointerComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseAbsolutePointerComponentName2;\r
-\r

 //\r
 // Function prototypes\r
 //\r
 //\r
 // Function prototypes\r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index 5102d34307f8cc453c8a2d548a5b3232459f4ac4..b4454b18426ca1ace8998a341ef17467f02a6280 100644 (file)
--- 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 <Library/UefiBootServicesTableLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 \r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseDriver;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseComponentName2;\r
+\r

 //\r
 // PS/2 mouse sample rate\r
 //\r
 //\r
 // PS/2 mouse sample rate\r
 //\r


@@ -95,13 +102,6 @@ typedef struct {
 \r
 #define PS2_MOUSE_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_DEV, SimplePointerProtocol, PS2_MOUSE_DEV_SIGNATURE)\r
 \r
 \r
 #define PS2_MOUSE_DEV_FROM_THIS(a)  CR (a, PS2_MOUSE_DEV, SimplePointerProtocol, PS2_MOUSE_DEV_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gPS2MouseDriver;\r
-extern EFI_COMPONENT_NAME_PROTOCOL   gPs2MouseComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2MouseComponentName2;\r
-\r

 //\r
 // Function prototypes\r
 //\r
 //\r
 // Function prototypes\r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
index d0a7e0ab88d227c0768920481af24e0e30176cb1..1c5b559bd802e34fcfda5f94787b7160c5cbe5e3 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@@ -42,6 +42,13 @@
 #include <IndustryStandard/Pci22.h>\r
 #include "IdeData.h"\r
 \r
 #include <IndustryStandard/Pci22.h>\r
 #include "IdeData.h"\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL      gIDEBusDriverBinding;\r
+extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL  gIDEBusDriverDiagnostics;\r
+extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiagnostics2;\r
+\r

 //\r
 // Extra Definition to porting\r
 //\r
 //\r
 // Extra Definition to porting\r
 //\r


@@ -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)\r
 #define IDE_BLOCK_IO_DEV_FROM_DISK_INFO_THIS(a) CR (a, IDE_BLK_IO_DEV, DiskInfo, IDE_BLK_IO_DEV_SIGNATURE)\r
 \r
 #define IDE_BLOCK_IO_DEV_FROM_THIS(a)           CR (a, IDE_BLK_IO_DEV, BlkIo, IDE_BLK_IO_DEV_SIGNATURE)\r
 #define IDE_BLOCK_IO_DEV_FROM_DISK_INFO_THIS(a) CR (a, IDE_BLK_IO_DEV, DiskInfo, IDE_BLK_IO_DEV_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL      gIDEBusDriverBinding;\r
-extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL  gIDEBusDriverDiagnostics;\r
-extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiagnostics2;\r
-\r

 #include "Ide.h"\r
 \r
 //\r
 #include "Ide.h"\r
 \r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 5b0428bec4f811ed606c9e5b3f8a7605a3af4774..8e4a222dc57f8c653b53cc6b26a20cd778c30f4d 100644 (file)
--- 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 <IndustryStandard/Acpi.h>\r
 #include "ComponentName.h"\r
 \r
 #include <IndustryStandard/Acpi.h>\r
 #include "ComponentName.h"\r
 \r

+\r
+//\r
+// Global Variables\r
+//\r
+extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;\r
+extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;\r
+\r

 //\r
 // Driver Produced Protocol Prototypes\r
 //\r
 //\r
 // Driver Produced Protocol Prototypes\r
 //\r


@@ -238,10 +247,6 @@ typedef struct _PCI_IO_DEVICE {
 //\r
 // Global Variables\r
 //\r
 //\r
 // Global Variables\r
 //\r

-extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;\r
-extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;\r

 extern LIST_ENTRY                                   gPciDevicePool;\r
 extern BOOLEAN                                      gFullEnumeration;\r
 extern UINTN                                        gPciHostBridgeNumber;\r
 extern LIST_ENTRY                                   gPciDevicePool;\r
 extern BOOLEAN                                      gFullEnumeration;\r
 extern UINTN                                        gPciHostBridgeNumber;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index f92a5beeca42a749085f948595ac2f932ba7d086..79755053282a75712789c61681e8c2cb54bdb09f 100644 (file)
--- 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.
 //\r
 // Internal use only\r
 //\r
 //\r
 // Internal use only\r
 //\r

-/**\r
-  report a error Status code of PCI bus driver controller.\r
-  \r
-  @param PciIoDevice Pci device instance.\r
-  @param Code        status code.\r
-**/\r
-EFI_STATUS\r
-ReportErrorStatusCode (\r
-  IN PCI_IO_DEVICE               *PciIoDevice,\r
-  IN EFI_STATUS_CODE_VALUE       Code\r
-  );\r

 \r
 \r

-//\r
-// PCI I/O Support Function Prototypes\r
-//\r
-//\r

 //\r
 // Pci Io Protocol Interface\r
 //\r
 //\r
 // Pci Io Protocol Interface\r
 //\r


@@ -66,6 +51,23 @@ EFI_PCI_IO_PROTOCOL  PciIoInterface = {
   NULL\r
 };\r
 \r
   NULL\r
 };\r
 \r

+/**\r
+  report a error Status code of PCI bus driver controller.\r
+  \r
+  @param PciIoDevice Pci device instance.\r
+  @param Code        status code.\r
+**/\r
+EFI_STATUS\r
+ReportErrorStatusCode (\r
+  IN PCI_IO_DEVICE               *PciIoDevice,\r
+  IN EFI_STATUS_CODE_VALUE       Code\r
+  );\r
+\r
+//\r
+// PCI I/O Support Function Prototypes\r
+//\r
+//\r
+\r

 /**\r
   report a error Status code of PCI bus driver controller.\r
   \r
 /**\r
   report a error Status code of PCI bus driver controller.\r
   \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.h
index a1100a27cf96d58952ef2c304418001adf421427..ef5b8a4c9c6dbc5993d8390a97908d2a05241049 100644 (file)
--- 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.
 \r
 #include <IndustryStandard/Pci22.h>\r
 \r
 \r
 #include <IndustryStandard/Pci22.h>\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL  gPciVgaMiniPortDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL  gPciVgaMiniPortComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2;\r
+\r

 //\r
 // PCI VGA MiniPort Device Structure\r
 //\r
 //\r
 // PCI VGA MiniPort Device Structure\r
 //\r


@@ -51,13 +58,6 @@ typedef struct {
 \r
 #define PCI_VGA_MINI_PORT_DEV_FROM_THIS(a) CR(a, PCI_VGA_MINI_PORT_DEV, VgaMiniPort, PCI_VGA_MINI_PORT_DEV_SIGNATURE)\r
 \r
 \r
 #define PCI_VGA_MINI_PORT_DEV_FROM_THIS(a) CR(a, PCI_VGA_MINI_PORT_DEV, VgaMiniPort, PCI_VGA_MINI_PORT_DEV_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gPciVgaMiniPortDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gPciVgaMiniPortComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2;\r
-\r

 //\r
 // Driver Binding Protocol functions\r
 //\r
 //\r
 // Driver Binding Protocol functions\r
 //\r

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 25262bc0b3ddf32b36c546b4a6f75fe9d97ad6b2..5229061ff2a6b0e7e2b99aca36bca351effc6fec 100644 (file)
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -32,6 +32,7 @@
 #include <FrameworkModuleBase.h>\r
 #include <DebugInfo.h>\r
 \r
 #include <FrameworkModuleBase.h>\r
 #include <DebugInfo.h>\r
 \r

+extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r

 \r
 /**\r
   Locate he report status code service.\r
 \r
 /**\r
   Locate he report status code service.\r


@@ -129,7 +130,5 @@ InternalReportStatusCodeEx (
   IN UINTN                  ExtendedDataSize\r
   );\r
 \r
   IN UINTN                  ExtendedDataSize\r
   );\r
 \r

-extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
-\r

 #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H\r
 \r
 #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 2bc73ba19068652970c60f2b95eff832887471d1..35d5faedd13c473e040478f494acabe08ac05a54 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -33,6 +33,8 @@
 #include <FrameworkModuleBase.h>\r
 #include <DebugInfo.h>\r
 \r
 #include <FrameworkModuleBase.h>\r
 #include <DebugInfo.h>\r
 \r

+extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
+\r

 /**\r
   Locatet he report status code service.\r
 \r
 /**\r
   Locatet he report status code service.\r
 \r


@@ -129,7 +131,7 @@ InternalReportStatusCodeEx (
   IN UINTN                  ExtendedDataSize\r
   );\r
 \r
   IN UINTN                  ExtendedDataSize\r
   );\r
 \r

-extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
+\r

 \r
 #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H\r
 \r
 \r
 #endif // __REPORT_STATUS_CODE_LIB_INTERNAL__H\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
index 998ad1ff33bdec88b20d36227a14712602d26491..52f8ec5f66b364f1b66c775bd2c0f975dd00a2dd 100644 (file)
--- 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"\r
 #include "String.h"\r
 \r
 #include "BootMngr/BootManager.h"\r
 #include "String.h"\r
 \r

+\r
+//\r
+// These are the VFR compiler generated data representing our VFR data.\r
+//\r
+extern UINT8  FrontPageVfrBin[];\r
+\r
+extern EFI_HII_DATABASE_PROTOCOL       *gHiiDatabase;\r
+extern EFI_HII_STRING_PROTOCOL         *gHiiString;\r
+extern EFI_FORM_BROWSER2_PROTOCOL      *gFormBrowser2;\r
+extern EFI_HII_CONFIG_ROUTING_PROTOCOL *gHiiConfigRouting;\r
+\r
+extern UINTN    gCallbackKey;\r
+extern BOOLEAN  gConnectAllHappened;\r
+\r
+\r

 #define ONE_SECOND  10000000\r
 \r
 ///\r
 #define ONE_SECOND  10000000\r
 \r
 ///\r


@@ -77,19 +92,6 @@ typedef struct {
       FRONT_PAGE_CALLBACK_DATA_SIGNATURE \\r
       )\r
 \r
       FRONT_PAGE_CALLBACK_DATA_SIGNATURE \\r
       )\r
 \r

-//\r
-// These are the VFR compiler generated data representing our VFR data.\r
-//\r
-extern UINT8  FrontPageVfrBin[];\r
-\r
-extern EFI_HII_DATABASE_PROTOCOL       *gHiiDatabase;\r
-extern EFI_HII_STRING_PROTOCOL         *gHiiString;\r
-extern EFI_FORM_BROWSER2_PROTOCOL      *gFormBrowser2;\r
-extern EFI_HII_CONFIG_ROUTING_PROTOCOL *gHiiConfigRouting;\r
-\r
-extern UINTN    gCallbackKey;\r
-extern BOOLEAN  gConnectAllHappened;\r
-\r

 /**\r
   This function allows a caller to extract the current configuration for one\r
   or more named elements from the target driver.\r
 /**\r
   This function allows a caller to extract the current configuration for one\r
   or more named elements from the target driver.\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index ea66006b4cb65e81543cee751134a11da268824a..ae64c7252b9e587ce596fd9c1ba965ed2a6dadd8 100644 (file)
--- 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"\r
 #include "FrontPage.h"\r
 \r
 #include "Language.h"\r
 #include "FrontPage.h"\r
 \r

+EFI_GUID  mFontPackageGuid = {\r
+  0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}\r
+};\r
+\r

 //\r
 // Lookup table of ISO639-2 3 character language codes to ISO 639-1 2 character language codes\r
 // Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.\r
 //\r
 // Lookup table of ISO639-2 3 character language codes to ISO 639-1 2 character language codes\r
 // Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.\r


@@ -162,10 +166,6 @@ zulzu\
 #define NARROW_GLYPH_NUMBER 8\r
 #define WIDE_GLYPH_NUMBER   75\r
 \r
 #define NARROW_GLYPH_NUMBER 8\r
 #define WIDE_GLYPH_NUMBER   75\r
 \r

-EFI_GUID  mFontPackageGuid = {\r
-  0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}\r
-};\r
-\r

 typedef struct {\r
   ///\r
   /// This 4-bytes total array length is required by HiiAddPackages()\r
 typedef struct {\r
   ///\r
   /// This 4-bytes total array length is required by HiiAddPackages()\r

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
index 27c32ef531ba0e215ebb2d7834361e7ea6a0b854..7284f906848bd89c33ed05f8692eec3c3e295887 100644 (file)
--- 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.
 \r
 #include <IndustryStandard/Pci22.h>\r
 \r
 \r
 #include <IndustryStandard/Pci22.h>\r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gVgaClassDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gVgaClassComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gVgaClassComponentName2;\r
+\r
+\r

 //\r
 // Structure for tuple containing mapping among uniocde, PC Ansi and ASCII code.\r
 //\r
 //\r
 // Structure for tuple containing mapping among uniocde, PC Ansi and ASCII code.\r
 //\r


@@ -70,13 +78,6 @@ typedef struct {
 \r
 #define VGA_CLASS_DEV_FROM_THIS(a)  CR (a, VGA_CLASS_DEV, SimpleTextOut, VGA_CLASS_DEV_SIGNATURE)\r
 \r
 \r
 #define VGA_CLASS_DEV_FROM_THIS(a)  CR (a, VGA_CLASS_DEV, SimpleTextOut, VGA_CLASS_DEV_SIGNATURE)\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL   gVgaClassDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL   gVgaClassComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL  gVgaClassComponentName2;\r
-\r

 //\r
 // Driver Binding Protocol functions\r
 //\r
 //\r
 // Driver Binding Protocol functions\r
 //\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index af68644e9c02c94033679ebc4229a5fb345c0775..b58de9db6fe8275ac65e85fbef3f9223f252418c 100644 (file)
--- 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.
 \r
 CONST EFI_GUID gZeroGuid  = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };\r
 \r
 \r
 CONST EFI_GUID gZeroGuid  = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };\r
 \r

+//\r
+// Module Global:\r
+//  Since this driver will only ever produce one instance of the Logging Hub\r
+//  protocol you are not required to dynamically allocate the PrivateData.\r
+//\r
+DATA_HUB_INSTANCE mPrivateData;\r
+\r

 //\r
 // Worker functions private to this file\r
 //\r
 //\r
 // Worker functions private to this file\r
 //\r


@@ -531,12 +538,6 @@ GetNextDataRecord (
 \r
   return Record;\r
 }\r
 \r
   return Record;\r
 }\r

-//\r
-// Module Global:\r
-//  Since this driver will only ever produce one instance of the Logging Hub\r
-//  protocol you are not required to dynamically allocate the PrivateData.\r
-//\r
-DATA_HUB_INSTANCE mPrivateData;\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h
index 5c8bd8a368f3fd6706d960e119ce1c3aa4d8d270..8aa6289b1f6c075c203fbd77fe844e80b87eaaab 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h
@@ -29,6 +29,12 @@
 #include <IndustryStandard/Pci.h>\r
 \r
 \r
 #include <IndustryStandard/Pci.h>\r
 \r
 \r

+//\r
+// Global Variables\r
+//\r
+extern EFI_PEI_PCI_CFG_PPI    gPciCfgPpi;\r
+extern EFI_PEI_PPI_DESCRIPTOR gPciCfgPpiList;\r
+\r

 /**\r
    Convert EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS to PCI_LIB_ADDRESS.\r
 \r
 /**\r
    Convert EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS to PCI_LIB_ADDRESS.\r
 \r


@@ -228,11 +234,4 @@ PciCfgModify (
   IN UINTN                        ClearBits\r
   );\r
 \r
   IN UINTN                        ClearBits\r
   );\r
 \r

-//\r
-// Global Variables\r
-//\r
-extern EFI_PEI_PCI_CFG_PPI    gPciCfgPpi;\r
-extern EFI_PEI_PPI_DESCRIPTOR gPciCfgPpiList;\r
-\r
-\r

 #endif\r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index fdac8730fa0d0d768d12fb32b948822ebfc1d8d3..4004deb484c8386b36aeb4467675c699a0707d86 100644 (file)
--- 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.\r
 //\r
 extern DXE_STATUS_CODE_CONTROLLER gDxeStatusCode;\r
 // declaration of DXE status code controller.\r
 //\r
 extern DXE_STATUS_CODE_CONTROLLER gDxeStatusCode;\r

-\r

 #endif\r
 #endif\r