ArmPkg/ArmGicLib: use correct loop variable

[mirror_edk2.git] / OptionRomPkg / UndiRuntimeDxe / Decode.c

diff --git a/OptionRomPkg/UndiRuntimeDxe/Decode.c b/OptionRomPkg/UndiRuntimeDxe/Decode.c
index 670fa18d533dfe64ea6cd663aa6c1e9fc737cdbb..5f853479f550e1ebdf0b1fcf08603c9c14cc874f 100644 (file)
--- a/OptionRomPkg/UndiRuntimeDxe/Decode.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Decode.c
@@ -1,8 +1,8 @@
 /** @file\r
   Provides the basic UNID functions.\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -254,9 +254,9 @@ UNDI_GetInitInfo (
   DbPtr->MCastFilterCnt = MAX_MCAST_ADDRESS_CNT;\r
 \r
   DbPtr->TxBufCnt = TX_BUFFER_COUNT;\r
-  DbPtr->TxBufSize = sizeof (TxCB);\r
+  DbPtr->TxBufSize = (UINT16) sizeof (TxCB);\r
   DbPtr->RxBufCnt = RX_BUFFER_COUNT;\r
-  DbPtr->RxBufSize = sizeof (RxFD);\r
+  DbPtr->RxBufSize = (UINT16) sizeof (RxFD);\r
 \r
   DbPtr->IFtype = PXE_IFTYPE_ETHERNET;\r
   DbPtr->SupportedDuplexModes = PXE_DUPLEX_ENABLE_FULL_SUPPORTED |\r
@@ -264,7 +264,8 @@ UNDI_GetInitInfo (
   DbPtr->SupportedLoopBackModes = PXE_LOOPBACK_INTERNAL_SUPPORTED |\r
                     PXE_LOOPBACK_EXTERNAL_SUPPORTED;\r
 \r
-  CdbPtr->StatFlags |= PXE_STATFLAGS_CABLE_DETECT_SUPPORTED;\r
+  CdbPtr->StatFlags |= (PXE_STATFLAGS_CABLE_DETECT_SUPPORTED |\r
+                        PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED);\r
   return ;\r
 }\r
 \r
@@ -557,6 +558,8 @@ UNDI_RecFilter (
   UINT16                  copy_len;\r
   UINT8                   *ptr1;\r
   UINT8                   *ptr2;\r
+  BOOLEAN                 InvalidMacAddr;\r
+    \r
   OpFlags   = CdbPtr->OpFlags;\r
   NewFilter = (UINT16) (OpFlags & 0x1F);\r
 \r
@@ -609,8 +612,32 @@ UNDI_RecFilter (
       MacAddr   = (UINT8 *) ((UINTN) (CdbPtr->CPBaddr));\r
       MacCount  = CdbPtr->CPBsize / sizeof (PXE_MAC_ADDR);\r
 \r
+      //\r
+      // The format of Ethernet multicast address for IPv6 is defined in RFC2464,\r
+      // for IPv4 is defined in RFC1112. Check whether the address is valid.\r
+      //\r
+      InvalidMacAddr = FALSE;\r
+      \r
       for (; MacCount-- != 0; MacAddr += sizeof (PXE_MAC_ADDR)) {\r
-        if (MacAddr[0] != 0x01 || MacAddr[1] != 0x00 || MacAddr[2] != 0x5E || (MacAddr[3] & 0x80) != 0) {\r
+        if (MacAddr[0] == 0x01) {\r
+          //\r
+          // This multicast MAC address is mapped from IPv4 address.\r
+          //\r
+          if (MacAddr[1] != 0x00 || MacAddr[2] != 0x5E || (MacAddr[3] & 0x80) != 0) {\r
+            InvalidMacAddr = TRUE;\r
+          }          \r
+        } else if (MacAddr[0] == 0x33) {\r
+          //\r
+          // This multicast MAC address is mapped from IPv6 address.\r
+          //\r
+          if (MacAddr[1] != 0x33) {\r
+            InvalidMacAddr = TRUE;\r
+          }\r
+        } else {\r
+          InvalidMacAddr = TRUE;\r
+        }\r
+\r
+        if (InvalidMacAddr) {\r
           CdbPtr->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;\r
           CdbPtr->StatCode  = PXE_STATCODE_INVALID_CPB;\r
           return ;\r
@@ -1005,7 +1032,7 @@ UNDI_Status (
     //\r
     // We already filled in 2 UINT32s.\r
     //\r
-    CdbPtr->DBsize = sizeof (UINT32) * 2;\r
+    CdbPtr->DBsize = (UINT16) (sizeof (UINT32) * 2);\r
 \r
     //\r
     // will claim any hanging free CBs\r
@@ -1015,7 +1042,7 @@ UNDI_Status (
     if (AdapterInfo->xmit_done_head == AdapterInfo->xmit_done_tail) {\r
       CdbPtr->StatFlags |= PXE_STATFLAGS_GET_STATUS_TXBUF_QUEUE_EMPTY;\r
     } else {\r
-      for (Index = 0; NumEntries >= sizeof (UINT64); Index++, NumEntries -= sizeof (UINT64)) {\r
+      for (Index = 0; ((Index < MAX_XMIT_BUFFERS) && (NumEntries >= sizeof (UINT64))); Index++, NumEntries -= sizeof (UINT64)) {\r
         if (AdapterInfo->xmit_done_head != AdapterInfo->xmit_done_tail) {\r
           DbPtr->TxBuffer[Index]      = AdapterInfo->xmit_done[AdapterInfo->xmit_done_head];\r
           AdapterInfo->xmit_done_head = next (AdapterInfo->xmit_done_head);\r
@@ -1060,6 +1087,18 @@ UNDI_Status (
     }\r
   }\r
 \r
+  //\r
+  // Return current media status\r
+  //\r
+  if ((CdbPtr->OpFlags & PXE_OPFLAGS_GET_MEDIA_STATUS) != 0) {\r
+    AdapterInfo->PhyAddress = 0xFF;\r
+    AdapterInfo->CableDetect = 1;\r
+\r
+    if (!PhyDetect (AdapterInfo)) {\r
+      CdbPtr->StatFlags |= PXE_STATFLAGS_GET_STATUS_NO_MEDIA;\r
+    }\r
+  }\r
+\r
   return ;\r
 }\r
 \r
@@ -1251,7 +1290,7 @@ UNDI_APIEntry_new (
 \r
   CdbPtr = (PXE_CDB *) (UINTN) cdb;\r
 \r
-  if (CdbPtr->IFnum >= pxe_31->IFcnt) {\r
+  if (CdbPtr->IFnum >= (pxe_31->IFcnt | pxe_31->IFcntExt << 8) ) {\r
     CdbPtr->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;\r
     CdbPtr->StatCode  = PXE_STATCODE_INVALID_CDB;\r
     return ;\r
@@ -1297,7 +1336,7 @@ UNDI_APIEntry_Common (
   if ((CdbPtr->OpCode > PXE_OPCODE_LAST_VALID) ||\r
       (CdbPtr->StatCode != PXE_STATCODE_INITIALIZE) ||\r
       (CdbPtr->StatFlags != PXE_STATFLAGS_INITIALIZE) ||\r
-      (CdbPtr->IFnum >= pxe_31->IFcnt) ) {\r
+      (CdbPtr->IFnum >= (pxe_31->IFcnt |  pxe_31->IFcntExt << 8))) {\r
     goto badcdb;\r
 \r
   }\r
@@ -1397,24 +1436,28 @@ PxeUpdate (
   IN PXE_SW_UNDI        *PxePtr\r
   )\r
 {\r
+  UINT16 NicNum;\r
+  NicNum = (PxePtr->IFcnt | PxePtr->IFcntExt << 8);\r
+  \r
   if (NicPtr == NULL) {\r
-    if (PxePtr->IFcnt > 0) {\r
+    if (NicNum > 0) {\r
       //\r
       // number of NICs this undi supports\r
       //\r
-      PxePtr->IFcnt--;\r
+      NicNum --;\r
     }\r
-\r
-    PxePtr->Fudge = (UINT8) (PxePtr->Fudge - CalculateSum8 ((VOID *) PxePtr, PxePtr->Len));\r
-    return ;\r
+    goto done;\r
   }\r
 \r
   //\r
   // number of NICs this undi supports\r
   //\r
-  PxePtr->IFcnt++;\r
+  NicNum++;\r
+  \r
+done: \r
+  PxePtr->IFcnt = (UINT8)(NicNum & 0xFF);\r
+  PxePtr->IFcntExt = (UINT8) ((NicNum & 0xFF00) >> 8);\r
   PxePtr->Fudge = (UINT8) (PxePtr->Fudge - CalculateSum8 ((VOID *) PxePtr, PxePtr->Len));\r
-\r
   return ;\r
 }\r
 \r
@@ -1437,7 +1480,7 @@ PxeStructInit (
   // Initialize the !PXE structure\r
   //\r
   PxePtr->Signature = PXE_ROMID_SIGNATURE;\r
-  PxePtr->Len       = sizeof (PXE_SW_UNDI);\r
+  PxePtr->Len       = (UINT8) sizeof (PXE_SW_UNDI);\r
   //\r
   // cksum\r
   //\r
@@ -1446,6 +1489,7 @@ PxeStructInit (
   // number of NICs this undi supports\r
   //\r
   PxePtr->IFcnt = 0;\r
+  PxePtr->IFcntExt = 0;\r
   PxePtr->Rev       = PXE_ROMID_REV;\r
   PxePtr->MajorVer  = PXE_ROMID_MAJORVER;\r
   PxePtr->MinorVer  = PXE_ROMID_MINORVER;\r