Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6300 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
index f3288eb4ecaeb248dbb1401278583172011885c2..8e18910379b43e0d4075c64362ae1c12f6d95741 100644 (file)
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
@@ -13,12 +13,12 @@
 #include "AtapiPassThru.h"\r
 \r
 \r
-static SCSI_COMMAND_SET     gEndTable = { 0xff, (DATA_DIRECTION) 0xff };\r
+SCSI_COMMAND_SET     gEndTable = { 0xff, (DATA_DIRECTION) 0xff };\r
 \r
 ///\r
 /// This table contains all the supported ATAPI commands.\r
 ///\r
-static SCSI_COMMAND_SET     gSupportedATAPICommands[] = {\r
+SCSI_COMMAND_SET     gSupportedATAPICommands[] = {\r
   { OP_INQUIRY,                     DataIn  },\r
   { OP_LOAD_UNLOAD_CD,              NoData  },\r
   { OP_MECHANISM_STATUS,            DataIn  },\r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
index 1507b55ee7b6a2906248693016c0572dc2bfc472..b3a0f7d00eb8322a01a242f1eb02454a5f510dc4 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
@@ -718,7 +718,6 @@ SetDefaultPalette (
   TODO: add return values\r
 \r
 **/\r
-STATIC\r
 VOID\r
 ClearScreen (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
index 4ef733b5092a6b0dbfb6d6f092c15c5156b4952f..76a74ccf5ec996794c14109c4c4a5486da245494 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
@@ -105,7 +105,6 @@ EDID_TIMING mVbeEstablishedEdidTiming[] = {
   @retval EFI_SUCCESS\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ReadEdidData (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA     *Private,\r
@@ -164,7 +163,6 @@ ReadEdidData (
   @return The 32 bit unique key for search.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 CalculateEdidKey (\r
   EDID_TIMING       *EdidTiming\r
@@ -189,7 +187,6 @@ CalculateEdidKey (
   @retval FALSE                  Not found.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 SearchEdidTiming (\r
   VALID_EDID_TIMING *ValidEdidTiming,\r
@@ -220,7 +217,6 @@ SearchEdidTiming (
   @retval FALSE                  The EDID data is invalid.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 ParseEdidData (\r
   UINT8                         *EdidBuffer,\r

diff --git a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
index 2a693cef5a407791259f80d8061cc935d5cefc16..4d1a583e49500c476851d58cb9bde3a7b2822760 100644 (file)
--- a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
+++ b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
@@ -37,9 +37,8 @@
   @param  Data         The date to write.\r
 \r
 **/\r
-STATIC\r
 VOID\r
-outb (\r
+I2cOutb (\r
   EFI_PCI_IO_PROTOCOL    *PciIo,\r
   UINTN                  Address,\r
   UINT8                  Data\r
@@ -63,9 +62,8 @@ outb (
   return byte value read from PCI I/O space.\r
 \r
 **/\r
-STATIC\r
 UINT8\r
-inb (\r
+I2cInb (\r
   EFI_PCI_IO_PROTOCOL    *PciIo,\r
   UINTN                  Address\r
   )\r
@@ -93,15 +91,14 @@ inb (
   @retval 1            High on I2C Data or I2C Clock Pin.\r
 \r
 **/\r
-STATIC\r
 UINT8\r
 I2cPinRead (\r
   EFI_PCI_IO_PROTOCOL    *PciIo,\r
   UINT8                  Bit\r
   )\r
 {\r
-  outb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
-  return (UINT8) ((inb (PciIo, SEQ_DATA_REGISTER) >> Bit ) & 0xfe);\r
+  I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
+  return (UINT8) ((I2cInb (PciIo, SEQ_DATA_REGISTER) >> Bit ) & 0xfe);\r
 }\r
 \r
 \r
@@ -113,7 +110,6 @@ I2cPinRead (
   @param  Value              1 or 0 stands for Set or Clear I2C Data and I2C Clock Pins.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cPinWrite (\r
   EFI_PCI_IO_PROTOCOL    *PciIo,\r
@@ -122,10 +118,10 @@ I2cPinWrite (
   )\r
 {\r
   UINT8        Byte;\r
-  outb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
-  Byte = (UINT8) (inb (PciIo, SEQ_DATA_REGISTER) & (UINT8) ~(1 << Bit)) ;\r
+  I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
+  Byte = (UINT8) (I2cInb (PciIo, SEQ_DATA_REGISTER) & (UINT8) ~(1 << Bit)) ;\r
   Byte = (UINT8) (Byte | ((Value & 0x01) << Bit));\r
-  outb (PciIo, SEQ_DATA_REGISTER, (UINT8) (Byte | 0x40));\r
+  I2cOutb (PciIo, SEQ_DATA_REGISTER, (UINT8) (Byte | 0x40));\r
   return;\r
 }\r
 \r
@@ -133,7 +129,6 @@ I2cPinWrite (
   Read/write delay acoording to I2C Bus Speed.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cDelay (\r
   VOID\r
@@ -149,7 +144,6 @@ I2cDelay (
   @param  Data               The byte data to write.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cSendByte (\r
   EFI_PCI_IO_PROTOCOL    *PciIo,\r
@@ -175,7 +169,6 @@ I2cSendByte (
 \r
   Return the byte data read from I2C Data Pin.\r
 **/\r
-STATIC\r
 UINT8\r
 I2cReceiveByte (\r
   EFI_PCI_IO_PROTOCOL    *PciIo\r
@@ -205,7 +198,6 @@ I2cReceiveByte (
   @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 I2cWaitAck (\r
   EFI_PCI_IO_PROTOCOL    *PciIo\r
@@ -231,7 +223,6 @@ I2cWaitAck (
   @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cSendAck (\r
   EFI_PCI_IO_PROTOCOL    *PciIo\r
@@ -249,7 +240,6 @@ I2cSendAck (
   @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cStart (\r
   EFI_PCI_IO_PROTOCOL    *PciIo\r
@@ -273,7 +263,6 @@ I2cStart (
   @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 I2cStop (\r
   EFI_PCI_IO_PROTOCOL    *PciIo\r