Further check-in to smooth Intel IPF compiler building.

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

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c
index 9eef0537d0e36fb5fd17df7e9e6056fd198a50b0..24a4616a2339cce3a488662117f577fd6aef26aa 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c
@@ -388,7 +388,7 @@ Returns:
       for (Index = StartBytePos, Index2 = StartBitPos, Count = 0; Count < (RealAllocSize / MEM_UNIT_SIZE); Count++) {\r
         ASSERT ((TempHeaderPtr->BitArrayPtr[Index] & bit (Index2) )== bit (Index2));\r
 \r
-        TempHeaderPtr->BitArrayPtr[Index] ^= (UINT8) (bit (Index2));\r
+        TempHeaderPtr->BitArrayPtr[Index] = (UINT8) (TempHeaderPtr->BitArrayPtr[Index] ^ (bit (Index2)));\r
         Index2++;\r
         if (Index2 == 8) {\r
           Index += 1;\r
@@ -516,7 +516,7 @@ Returns:
     //\r
     // right shift the byte\r
     //\r
-    ByteValue = ByteValue >> 1;\r
+    ByteValue = (UINT8) (ByteValue >> 1);\r
 \r
     if (BitValue == 0) {\r
       //\r
@@ -604,7 +604,7 @@ Returns:
   for (TempBytePos = FoundBytePos, Index = FoundBitPos, Count = 0; Count < NumberOfMemoryUnit; Count++) {\r
 \r
     ASSERT ((MemoryHeader->BitArrayPtr[TempBytePos] & bit (Index) )== 0);\r
-    MemoryHeader->BitArrayPtr[TempBytePos] |= bit (Index);\r
+    MemoryHeader->BitArrayPtr[TempBytePos] = (UINT8) (MemoryHeader->BitArrayPtr[TempBytePos] | bit (Index));\r
     Index++;\r
     if (Index == 8) {\r
       TempBytePos += 1;\r

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c
index 34e31a896fed5fc57f92c52fee20d20a21374201..448fe206d33322b160078ab8faf59bfe76a27e9f 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c
@@ -21,7 +21,7 @@ Revision History
 \r
 #include "Ehci.h"\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 SetAndWaitDoorBell (\r
   IN  USB2_HC_DEV     *HcDev,\r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
index f851b9b961c78d0bc95083f5345bd2327e8c1747..90c6713666c39c860eff343b4817f8b53142ef56 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
@@ -89,7 +89,7 @@ Returns:
 \r
 --*/\r
 {\r
-  CdbPtr->StatFlags |= AdapterInfo->State;\r
+  CdbPtr->StatFlags = (PXE_STATFLAGS) (CdbPtr->StatFlags | AdapterInfo->State);\r
   return ;\r
 }\r
 \r
@@ -377,7 +377,6 @@ Returns:
 --*/\r
 {\r
   PXE_CPB_INITIALIZE  *CpbPtr;\r
-  PXE_DB_INITIALIZE   *DbPtr;\r
 \r
   if ((CdbPtr->OpFlags != PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) &&\r
       (CdbPtr->OpFlags != PXE_OPFLAGS_INITIALIZE_DO_NOT_DETECT_CABLE)) {\r
@@ -396,7 +395,6 @@ Returns:
   }\r
 \r
   CpbPtr  = (PXE_CPB_INITIALIZE *) (UINTN) CdbPtr->CPBaddr;\r
-  DbPtr   = (PXE_DB_INITIALIZE *) (UINTN) CdbPtr->DBaddr;\r
 \r
   if (CpbPtr->MemoryLength < (UINT32) MEMORY_NEEDED) {\r
     CdbPtr->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;\r
@@ -553,7 +551,7 @@ Returns:
 \r
   case PXE_OPFLAGS_INTERRUPT_DISABLE:\r
     if (IntMask != 0) {\r
-      AdapterInfo->int_mask &= ~(IntMask);\r
+      AdapterInfo->int_mask = (UINT16) (AdapterInfo->int_mask & ~(IntMask));\r
       E100bSetInterruptState (AdapterInfo);\r
       break;\r
     }\r
@@ -633,7 +631,7 @@ Returns:
 \r
     }\r
 \r
-    NewFilter |= AdapterInfo->Rx_Filter;\r
+    NewFilter = (UINT16) (NewFilter | AdapterInfo->Rx_Filter);\r
     //\r
     // all other flags are ignored except mcast_reset\r
     //\r
@@ -695,7 +693,7 @@ Returns:
     // if you want to enable anything, you got to have unicast\r
     // and you have what you already enabled!\r
     //\r
-    NewFilter |= (PXE_OPFLAGS_RECEIVE_FILTER_UNICAST | AdapterInfo->Rx_Filter);\r
+    NewFilter = (UINT16) (NewFilter | (PXE_OPFLAGS_RECEIVE_FILTER_UNICAST | AdapterInfo->Rx_Filter));\r
 \r
     break;\r
 \r
@@ -754,7 +752,7 @@ JustRead:
   // give the stat flags here\r
   //\r
   if (AdapterInfo->Receive_Started) {\r
-    CdbPtr->StatFlags |= AdapterInfo->Rx_Filter;\r
+    CdbPtr->StatFlags = (PXE_STATFLAGS) (CdbPtr->StatFlags | AdapterInfo->Rx_Filter);\r
 \r
   }\r
 \r
@@ -1112,7 +1110,7 @@ Returns:
   if ((CdbPtr->OpFlags & PXE_OPFLAGS_GET_INTERRUPT_STATUS) != 0) {\r
 \r
     Status = InWord (AdapterInfo, AdapterInfo->ioaddr + SCBStatus);\r
-    AdapterInfo->Int_Status |= Status;\r
+    AdapterInfo->Int_Status = (UINT16) (AdapterInfo->Int_Status | Status);\r
 \r
     //\r
     // acknoledge the interrupts\r
@@ -1282,7 +1280,6 @@ Returns:
 \r
 --*/\r
 {\r
-  PXE_CPB_RECEIVE *cpbptr;\r
 \r
   //\r
   // check if RU has started...\r
@@ -1293,7 +1290,6 @@ Returns:
     return ;\r
   }\r
 \r
-  cpbptr            = (PXE_CPB_RECEIVE *) (UINTN) CdbPtr->CPBaddr;\r
 \r
   CdbPtr->StatCode  = (UINT16) E100bReceive (AdapterInfo, CdbPtr->CPBaddr, CdbPtr->DBaddr);\r
   if (CdbPtr->StatCode != PXE_STATCODE_SUCCESS) {\r
@@ -1513,6 +1509,7 @@ badcdb:
   return ;\r
 }\r
 \r
+STATIC\r
 UINT8\r
 ChkSum (\r
   IN  VOID   *Buffer,\r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
index 5b69a46ac4ad73faf63210e25562a01d784893de..ed396fd3423c48473d0a359e375e9b1cb6082d18 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.c
@@ -43,10 +43,10 @@ static UINT8 basic_config_cmd[22] = {
 //\r
 #define wait_for_cmd_done(cmd_ioaddr) \\r
 {                      \\r
-  INT16 wait = 2000;              \\r
-  while ((InByte (AdapterInfo, cmd_ioaddr) != 0) && --wait >= 0)  \\r
+  INT16 wait_count = 2000;              \\r
+  while ((InByte (AdapterInfo, cmd_ioaddr) != 0) && --wait_count >= 0)  \\r
     DelayIt (AdapterInfo, 10);  \\r
-  if (wait == 0) \\r
+  if (wait_count == 0) \\r
     DelayIt (AdapterInfo, 50);    \\r
 }\r
 \r
@@ -269,6 +269,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 UINTN\r
 MapIt (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -337,6 +338,7 @@ Returns:
   return PXE_STATCODE_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 UnMapIt (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -384,6 +386,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 VOID\r
 DelayIt (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -409,6 +412,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 BlockIt (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -434,6 +438,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 UINT8\r
 Load_Base_Regs (\r
   NIC_DATA_INSTANCE *AdapterInfo\r
@@ -483,6 +488,7 @@ Returns:
   return 0;\r
 }\r
 \r
+STATIC\r
 UINT8\r
 IssueCB (\r
   NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -549,6 +555,7 @@ Returns:
   return 0;\r
 }\r
 \r
+STATIC\r
 UINT8\r
 Configure (\r
   NIC_DATA_INSTANCE *AdapterInfo\r
@@ -588,9 +595,9 @@ Returns:
   }\r
 \r
   my_filter = (UINT8) ((AdapterInfo->Rx_Filter & PXE_OPFLAGS_RECEIVE_FILTER_PROMISCUOUS) ? 1 : 0);\r
-  my_filter |= (AdapterInfo->Rx_Filter & PXE_OPFLAGS_RECEIVE_FILTER_BROADCAST) ? 0 : 2;\r
+  my_filter = (UINT8) ((my_filter | (AdapterInfo->Rx_Filter & PXE_OPFLAGS_RECEIVE_FILTER_BROADCAST) ? 0 : 2));\r
 \r
-  data_ptr[15] |= my_filter;\r
+  data_ptr[15]  = (UINT8) (data_ptr[15] | my_filter);\r
   data_ptr[19]  = (UINT8) (AdapterInfo->Duplex ? 0xC0 : 0x80);\r
   data_ptr[21]  = (UINT8) ((AdapterInfo->Rx_Filter & PXE_OPFLAGS_RECEIVE_FILTER_ALL_MULTICAST) ? 0x0D : 0x05);\r
 \r
@@ -686,6 +693,7 @@ Returns:
   return 0;\r
 }\r
 \r
+STATIC\r
 VOID\r
 StopRU (\r
   IN NIC_DATA_INSTANCE *AdapterInfo\r
@@ -721,6 +729,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 INT8\r
 StartRU (\r
   NIC_DATA_INSTANCE *AdapterInfo\r
@@ -1049,7 +1058,7 @@ Returns:
     //\r
     // enable unicast and start the RU\r
     //\r
-    AdapterInfo->Rx_Filter |= (new_filter | PXE_OPFLAGS_RECEIVE_FILTER_UNICAST);\r
+    AdapterInfo->Rx_Filter = (UINT8) (AdapterInfo->Rx_Filter | (new_filter | PXE_OPFLAGS_RECEIVE_FILTER_UNICAST));\r
     StartRU (AdapterInfo);\r
   } else {\r
     //\r
@@ -1290,7 +1299,7 @@ Returns:
   ret_code  = PXE_STATCODE_NO_DATA;\r
   pkt_type  = PXE_FRAME_TYPE_NONE;\r
   status    = InWord (AdapterInfo, AdapterInfo->ioaddr + SCBStatus);\r
-  AdapterInfo->Int_Status |= status;\r
+  AdapterInfo->Int_Status = (UINT16) (AdapterInfo->Int_Status | status);\r
   //\r
   // acknoledge the interrupts\r
   //\r
@@ -1774,7 +1783,6 @@ Returns:
 --*/\r
 {\r
   RxFD    *rx_ptr;\r
-  RxFD    *head_ptr;\r
   RxFD    *tail_ptr;\r
   UINT16  Index;\r
 \r
@@ -1804,7 +1812,6 @@ Returns:
     }\r
   }\r
 \r
-  head_ptr                    = (&AdapterInfo->rx_ring[0]);\r
   tail_ptr                    = (&AdapterInfo->rx_ring[AdapterInfo->RxBufCnt - 1]);\r
   tail_ptr->cb_header.link    = (UINT32) AdapterInfo->rx_phy_addr;\r
 \r
@@ -1890,6 +1897,7 @@ Returns:
 #define EE_READ_CMD   6 // 110b\r
 #define EE_ERASE_CMD  (7 << 6)\r
 \r
+STATIC\r
 VOID\r
 shift_bits_out (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
@@ -1932,7 +1940,7 @@ Returns:
     // mask off the data_in bit\r
     //\r
     Tmp = (UINT8) (InByte (AdapterInfo, EEAddr) &~EE_DI);\r
-    Tmp |= dataval;\r
+    Tmp = (UINT8) (Tmp | dataval);\r
     OutByte (AdapterInfo, Tmp, EEAddr);\r
     eeprom_delay (100);\r
     //\r
@@ -1948,6 +1956,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 UINT16\r
 shift_bits_in (\r
   IN NIC_DATA_INSTANCE *AdapterInfo\r
@@ -1999,6 +2008,7 @@ Returns:
   return retval;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 E100bSetEepromLockOut (\r
   IN NIC_DATA_INSTANCE  *AdapterInfo\r
@@ -2047,6 +2057,7 @@ Returns:
   return TRUE;\r
 }\r
 \r
+STATIC\r
 VOID\r
 E100bReSetEepromLockOut (\r
   IN NIC_DATA_INSTANCE  *AdapterInfo\r
@@ -3199,17 +3210,6 @@ Returns:
 \r
     MdiMiscReg |= (NSC_TX_CONG_TXREADY | NSC_TX_CONG_F_CONNECT);\r
 \r
-#if CONGESTION_CONTROL\r
-    //\r
-    // If we are configured to do congestion control, then enable the\r
-    // congestion control bit in the National Phy\r
-    //\r
-    if (AdapterInfo->Congest) {\r
-      MdiMiscReg |= NSC_TX_CONG_ENABLE;\r
-    } else {\r
-      MdiMiscReg &= ~NSC_TX_CONG_ENABLE;\r
-    }\r
-#endif\r
     MdiWrite (\r
       AdapterInfo,\r
       NSC_CONG_CONTROL_REG,\r
@@ -3226,21 +3226,6 @@ Returns:
   // to attempt a software workaround to the PHY_100 A/B step problem.\r
   //\r
 \r
-#if DO_PHY_100B_SOFTWARE_FIX\r
-  //\r
-  // Handle the Intel PHY_100 (A and B steps)\r
-  //\r
-  if ((PhyId == PHY_100_A) && (AdapterInfo->LinkSpeed == 100)) {\r
-    //\r
-    // The PHY_100 is very sensitive to collisions at 100mb, so increase\r
-    // the Adaptive IFS value with the intention of reducing the number of\r
-    // collisions that the adapter generates.\r
-    //\r
-    AdapterInfo->CurrentIFSValue  = 0x18;\r
-    AdapterInfo->AdaptiveIFS      = 0;\r
-  }\r
-#endif\r
-\r
   return (TRUE);\r
 }\r
 \r
@@ -3395,7 +3380,7 @@ Returns:
     // AND the two advertisement registers together, and get rid of any\r
     // extraneous bits.\r
     //\r
-    MdiOwnAdReg &= (MdiLinkPartnerAdReg & NWAY_LP_ABILITY);\r
+    MdiOwnAdReg = (UINT16) (MdiOwnAdReg & (MdiLinkPartnerAdReg & NWAY_LP_ABILITY));\r
 \r
     //\r
     // Get speed setting\r
@@ -3540,6 +3525,7 @@ Returns:
   return 0;\r
 }\r
 \r
+STATIC\r
 INT8\r
 SoftwareReset (\r
   NIC_DATA_INSTANCE *AdapterInfo\r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.h b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.h
index 3a4127c4e56ef6ec94095a0029cda0e1c3e03455..e832cb250fc473deac10169aaf6c0069ef0493ab 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.h
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/E100b.h
@@ -124,7 +124,7 @@ enum speedo_offsets {
   SCBEarlyRx = 20,               // Early receive byte count. \r
   SCBEarlyRxInt = 24, SCBFlowCtrlReg = 25, SCBPmdr = 27,\r
   // offsets for general control registers (GCRs)\r
-  SCBGenCtrl = 28, SCBGenStatus = 29, SCBGenCtrl2 = 30, SCBRsvd = 31,\r
+  SCBGenCtrl = 28, SCBGenStatus = 29, SCBGenCtrl2 = 30, SCBRsvd = 31\r
 };\r
 \r
 #define GCR2_EEPROM_ACCESS_SEMAPHORE 0x80 // bit offset into the gcr2\r
@@ -137,7 +137,7 @@ enum commands {
   CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7,\r
   CmdSuspend = 0x4000,    /* Suspend after completion. */\r
   CmdIntr = 0x2000,      /* Interrupt after completion. */\r
-  CmdTxFlex = 0x0008,      /* Use "Flexible mode" for CmdTx command. */\r
+  CmdTxFlex = 0x0008      /* Use "Flexible mode" for CmdTx command. */\r
 };\r
 \r
 //-------------------------------------------------------------------------\r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
index a5692f4dbd3da7809b62a4f25e08b7eeb4f41e63..ad91d75726cb4c56fbe205f775efba99bc348e83 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c
@@ -864,19 +864,19 @@ Returns:
   EFI_PCI_IO_PROTOCOL_WIDTH Width;\r
   NIC_DATA_INSTANCE         *AdapterInfo;\r
 \r
-  Width       = 0;\r
+  Width       = (EFI_PCI_IO_PROTOCOL_WIDTH) 0;\r
   AdapterInfo = (NIC_DATA_INSTANCE *) (UINTN) UnqId;\r
   switch (Len) {\r
   case 2:\r
-    Width = 1;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 1;\r
     break;\r
 \r
   case 4:\r
-    Width = 2;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 2;\r
     break;\r
 \r
   case 8:\r
-    Width = 3;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 3;\r
     break;\r
   }\r
 \r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi32.h b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi32.h
index 0262ad78af3eb7fb05de0e9ee8a9c9140ad04915..d4ad6b65c1e7ef437583e5a0ef535969e9f15903 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi32.h
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi32.h
@@ -176,24 +176,113 @@ TmpMemIo (
 //\r
 // functions defined in decode.c\r
 //\r
-VOID UNDI_GetState();\r
-VOID UNDI_Start();\r
-VOID UNDI_Stop();\r
-VOID UNDI_GetInitInfo();\r
-VOID UNDI_GetConfigInfo();\r
-VOID UNDI_Initialize();\r
-VOID UNDI_Reset();\r
-VOID UNDI_Shutdown();\r
-VOID UNDI_Interrupt();\r
-VOID UNDI_RecFilter();\r
-VOID UNDI_StnAddr();\r
-VOID UNDI_Statistics();\r
-VOID UNDI_ip2mac();\r
-VOID UNDI_NVData();\r
-VOID UNDI_Status();\r
-VOID UNDI_FillHeader();\r
-VOID UNDI_Transmit();\r
-VOID UNDI_Receive();\r
+VOID\r
+UNDI_GetState (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Start (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Stop (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_GetInitInfo (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_GetConfigInfo (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Initialize (\r
+  IN  PXE_CDB       *CdbPtr,\r
+  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Reset (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Shutdown (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Interrupt (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_RecFilter (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_StnAddr (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Statistics (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_ip2mac (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_NVData (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Status (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_FillHeader (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Transmit (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
+\r
+VOID\r
+UNDI_Receive (\r
+  IN  PXE_CDB           *CdbPtr,\r
+  IN  NIC_DATA_INSTANCE *AdapterInfo\r
+  );\r
 \r
 VOID UNDI_APIEntry_new(UINT64);\r
 VOID UNDI_APIEntry_old(UINT64);\r

diff --git a/EdkModulePkg/Include/EdkPeiCore.h b/EdkModulePkg/Include/EdkPeiCore.h
index 6cd6f664e806e58d85a6160b6e188e7b951b5fef..4e07efb01b2cb9e1ba765c45badc388d26b9cd9e 100644 (file)
--- a/EdkModulePkg/Include/EdkPeiCore.h
+++ b/EdkModulePkg/Include/EdkPeiCore.h
@@ -39,12 +39,4 @@ Abstract:
 //\r
 #include <Guid/PeiPerformanceHob.h>\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-PeiCore (\r
-  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r
-  IN VOID                        *Data\r
-  )\r
-;\r
-\r
 #endif\r

diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index 268a6a04f24b445a33098040489710fba4c40cb7..bd4b5adcecdce25dbad749dfdb945001d042f99d 100644 (file)
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -144,6 +144,7 @@ PERFORMANCE_PROTOCOL mPerformanceInterface = {
   @retval The index of gauge entry in the array.\r
 \r
 **/\r
+STATIC\r
 UINT32\r
 InternalSearchForGaugeEntry (\r
   IN CONST VOID                 *Handle,  OPTIONAL\r
@@ -363,6 +364,7 @@ GetGauge (
   to DXE performance data structures.\r
 \r
 **/\r
+STATIC\r
 VOID\r
 InternalGetPeiPerformance (\r
   VOID\r
@@ -625,5 +627,5 @@ PerformanceMeasurementEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
 }\r

diff --git a/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
index 45fbcf477761480d6807cdcf8965e99a6135b9a3..cf3ac787bd5da75e6e8739e4f9dfb0845313645c 100644 (file)
--- a/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
+++ b/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
@@ -65,7 +65,7 @@ DebugPrint (
   //\r
   // Send the print string to a Serial Port \r
   //\r
-  SerialPortWrite (Buffer, AsciiStrLen(Buffer));\r
+  SerialPortWrite ((UINT8 *) Buffer, AsciiStrLen(Buffer));\r
 }\r
 \r
 \r
@@ -110,7 +110,7 @@ DebugAssert (
   //\r
   // Send the print string to the Console Output device\r
   //\r
-  SerialPortWrite (Buffer, AsciiStrLen(Buffer));\r
+  SerialPortWrite ((UINT8 *) Buffer, AsciiStrLen(Buffer));\r
 \r
   //\r
   // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings\r
@@ -176,7 +176,7 @@ DebugAssertEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -197,7 +197,7 @@ DebugPrintEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -218,7 +218,7 @@ DebugCodeEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -239,5 +239,5 @@ DebugClearMemoryEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
 }\r

diff --git a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index 74d71c54d96afde54feb5ff61e227263b14b74af..d143039828405e6a8c57979f170307a300c2b73a 100644 (file)
--- a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -31,6 +31,7 @@ STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;
   @retval Other           Performance protocol is not located to log performance.  \r
 \r
 **/\r
+STATIC\r
 EFI_STATUS\r
 GetPerformanceProtocol (\r
   VOID\r
@@ -245,5 +246,5 @@ PerformanceMeasurementEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
 }\r

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 199b14becc3896b55c34d567577b63dbd8b43606..2b4d2972213d6e8562cbc9ffa001605979609c04 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -22,6 +22,7 @@ Abstract:
 EXTENDED_SAL_BOOT_SERVICE_PROTOCOL  *mEsalBootService = NULL;\r
 EFI_PLABEL                          mPlabel;\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 DxeSalLibInitialize (\r
@@ -43,7 +44,7 @@ DxeSalLibInitialize (
   // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it\r
   // away. We cache it in a module global, so we can register the vitrual version.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);\r
+  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, (VOID **) &mEsalBootService);\r
   if (EFI_ERROR (Status)) {\r
     mEsalBootService = NULL;\r
     return EFI_SUCCESS;\r
@@ -58,6 +59,7 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 DxeSalVirtualNotifyEvent (\r

diff --git a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index dcb360c5e70379b0b22fc4d813bdc9e4136065bd..c71f1e7167e0da29dde4cb892e82da0254afa8de 100644 (file)
--- a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -36,6 +36,7 @@ Abstract:
   @retval The index of log entry in the array.\r
 \r
 **/\r
+STATIC\r
 PEI_PERFORMANCE_LOG_HEADER *\r
 InternalGetPerformanceHobLog (\r
   VOID\r
@@ -83,6 +84,7 @@ InternalGetPerformanceHobLog (
   @retval The index of log entry in the array.\r
 \r
 **/\r
+STATIC\r
 UINT32\r
 InternalSearchForLogEntry (\r
   IN PEI_PERFORMANCE_LOG_HEADER *PeiPerformanceLog,\r
@@ -326,5 +328,5 @@ PerformanceMeasurementEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
 }\r

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c
index 3c3f22f760153e0e9f9466fed0219f6d42bcd915..f6af017f779643b0504aa0116aff8ca32905f074 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c
@@ -31,6 +31,7 @@ Abstract:
 \r
 \r
 #include "Common/FirmwareFileSystem.h"\r
+#include "GuidedSection.h"\r
 \r
 EFI_STATUS\r
 GuidedSectionExtractionProtocolConstructor (\r