BaseTools/Capsule: Do not support -o with --dump-info

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

diff --git a/OptionRomPkg/UndiRuntimeDxe/Decode.c b/OptionRomPkg/UndiRuntimeDxe/Decode.c
index 0eabc2ad8fcd3f2df765dca8c10236c7a6ff5676..cff694269144bce2e8c5b3124dc3a85bb91ac516 100644 (file)
--- a/OptionRomPkg/UndiRuntimeDxe/Decode.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Decode.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides the basic UNID functions.\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, 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
@@ -1276,6 +1276,7 @@ UNDI_Receive (
 **/\r
 // TODO:    cdb - add argument and description to function comment\r
 VOID\r
+EFIAPI\r
 UNDI_APIEntry_new (\r
   IN  UINT64 cdb\r
   )\r
@@ -1290,7 +1291,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
@@ -1336,7 +1337,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
@@ -1436,24 +1437,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
@@ -1485,6 +1490,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