Further check-in to smooth Intel IPF compiler building.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / Undi / RuntimeDxe / E100b.c

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