Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly.

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

6 files changed, 7 insertions, 23 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 4c42a56..b70e401 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -42,7 +42,6 @@ LIST_ENTRY      mIScsiConfigFormList = {
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiIpToStr (

   IN  EFI_IPv4_ADDRESS  *Ip,

@@ -218,7 +217,6 @@ IScsiUpdateDeviceList (
   @retval The iSCSI configuration form entry found.

 

 **/

-STATIC

 ISCSI_CONFIG_FORM_ENTRY *

 IScsiGetConfigFormEntryByIndex (

   IN UINT32 Index

@@ -253,7 +251,6 @@ IScsiGetConfigFormEntryByIndex (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiConvertDeviceConfigDataToIfrNvData (

   IN ISCSI_CONFIG_FORM_ENTRY  *ConfigFormEntry,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 6b7e83d..ec8d4b2 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -40,7 +40,6 @@ Abstract:
   @retval EFI_INVALID_PARAMETER The RootPath is mal-formatted.

 

 **/

-STATIC

 EFI_STATUS

 IScsiDhcpExtractRootPath (

   IN CHAR8                        *RootPath,

@@ -204,7 +203,6 @@ ON_EXIT:
                            in the Dhcp4Event.

 

 **/

-STATIC

 EFI_STATUS

 IScsiDhcpSelectOffer (

   IN  EFI_DHCP4_PROTOCOL  * This,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 3c8dac3..78a1e07 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
@@ -30,7 +30,6 @@ Abstract:
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiInitIbfTableHeader (

   IN EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Header

@@ -61,7 +60,6 @@ IScsiInitIbfTableHeader (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiInitControlSection (

   IN EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,

@@ -106,7 +104,6 @@ IScsiInitControlSection (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiAddHeapItem (

   IN OUT UINT8  **Heap,

@@ -135,7 +132,6 @@ IScsiAddHeapItem (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiFillInitiatorSection (

   IN     EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,

@@ -197,7 +193,6 @@ IScsiFillInitiatorSection (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiMapV4ToV6Addr (

   IN  EFI_IPv4_ADDRESS *V4,

@@ -225,7 +220,6 @@ IScsiMapV4ToV6Addr (
   @retval UINT16          The composited representation of the NIC PCI location.

 

 **/

-STATIC

 UINT16

 IScsiGetNICPciLocation (

   IN EFI_HANDLE  Controller

@@ -279,7 +273,6 @@ IScsiGetNICPciLocation (
   @retval EFI_MAC_ADDRESS * The mac address.

 

 **/

-STATIC

 EFI_MAC_ADDRESS *

 IScsiGetMacAddress (

   IN EFI_HANDLE  Controller

@@ -312,7 +305,6 @@ IScsiGetMacAddress (
   @retval None.

 

 **/

-STATIC

 VOID

 IScsiFillNICAndTargetSections (

   IN     EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 4bd72ae..53de070 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -22,7 +22,7 @@ Abstract:
 

 #include "IScsiImpl.h"

 

-STATIC CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";

+CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";

 

 /**

   Removes (trims) specified leading and trailing characters from a string.

@@ -35,7 +35,6 @@ STATIC CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";
   @retval NONE.

 

 **/

-static

 VOID

 StrTrim (

   IN OUT CHAR16   *str,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index b88ea1c..7db5750 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -21,7 +21,7 @@ Abstract:
 

 #include "IScsiImpl.h"

 

-static UINT32 mDataSegPad = 0;

+UINT32 mDataSegPad = 0;

 

 /**

   Attach the iSCSI connection to the iSCSI session. 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
index b1aa888..ee69a98 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
@@ -22,21 +22,21 @@ Abstract:
 

 #include "Md5.h"

 

-STATIC CONST UINT32  MD5_K[][2] = {

+CONST UINT32  MD5_K[][2] = {

   { 0, 1 },

   { 1, 5 },

   { 5, 3 },

   { 0, 7 }

 };

 

-STATIC CONST UINT32  MD5_S[][4] = {

+CONST UINT32  MD5_S[][4] = {

   { 7, 22, 17, 12 },

   { 5, 20, 14, 9 },

   { 4, 23, 16 ,11 },

   { 6, 21, 15, 10 },

 };

 

-STATIC CONST UINT32  MD5_T[] = {

+CONST UINT32  MD5_T[] = {

   0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE,

   0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501,

   0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE,

@@ -55,7 +55,7 @@ STATIC CONST UINT32  MD5_T[] = {
   0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391

 };

 

-STATIC CONST UINT8 Md5HashPadding[] =

+CONST UINT8 Md5HashPadding[] =

 {

   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

@@ -116,7 +116,7 @@ UINT32
   IN UINT32  C

   );

 

-STATIC CONST MD5_TRANSFORM_FUNC MD5_F[] = {

+CONST MD5_TRANSFORM_FUNC MD5_F[] = {

   TF1,

   TF2,

   TF3,

@@ -131,7 +131,6 @@ STATIC CONST MD5_TRANSFORM_FUNC MD5_F[] = {
   @retval NONE.

 

 **/

-STATIC

 VOID

 MD5Transform (

   IN MD5_CTX  *Md5Ctx

@@ -188,7 +187,6 @@ MD5Transform (
 

   @retval NONE.

 **/

-STATIC

 VOID

 MD5UpdateBlock (

   IN MD5_CTX      *Md5Ctx,