Refine some call back function to return EFI_UNSUPPORTED for all unsupported call back type.

Signed-off-by:  ydong10
Reviewed-by: lgao4


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

1 files changed, 55 insertions, 55 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index b0aee5f..d57605e 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -1,7 +1,7 @@
 /** @file

   Helper functions for configuring or getting the parameters relating to Ip4.

 

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -692,76 +692,76 @@ Ip4FormCallback (
   EFI_STATUS                Status;

   EFI_INPUT_KEY             Key;

 

-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {

+  if (Action == EFI_BROWSER_ACTION_CHANGING) {

+    Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This);

+

+    IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));

+    if (IfrFormNvData == NULL) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+

     //

-    // Do nothing for UEFI OPEN/CLOSE Action

+    // Retrive uncommitted data from Browser

     //

-    return EFI_SUCCESS;

-  }

+    if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {

+      FreePool (IfrFormNvData);

+      return EFI_NOT_FOUND;

+    }

 

-  Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This);

+    Status = EFI_SUCCESS;

 

-  IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));

-  if (IfrFormNvData == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

+    switch (QuestionId) {

+    case KEY_LOCAL_IP:

+      Status = Ip4StrToIp (IfrFormNvData->StationAddress, &HostIp.v4);

+      if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {

+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);

+        Status = EFI_INVALID_PARAMETER;

+      } else {

+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.LocalIp, &HostIp.v4, sizeof (HostIp.v4));

+      }

 

-  //

-  // Retrive uncommitted data from Browser

-  //

-  if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {

-    FreePool (IfrFormNvData);

-    return EFI_NOT_FOUND;

-  }

+      break;

 

-  Status = EFI_SUCCESS;

+    case KEY_SUBNET_MASK:

+      Status = Ip4StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);

+      if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {

+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);

+        Status = EFI_INVALID_PARAMETER;

+      } else {

+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));

+      }

 

-  switch (QuestionId) {

-  case KEY_LOCAL_IP:

-    Status = Ip4StrToIp (IfrFormNvData->StationAddress, &HostIp.v4);

-    if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {

-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);

-      Status = EFI_INVALID_PARAMETER;

-    } else {

-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.LocalIp, &HostIp.v4, sizeof (HostIp.v4));

-    }

+      break;

 

-    break;

+    case KEY_GATE_WAY:

+      Status = Ip4StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);

+      if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {

+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);

+        Status = EFI_INVALID_PARAMETER;

+      } else {

+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, &Gateway.v4, sizeof (Gateway.v4));

+      }

 

-  case KEY_SUBNET_MASK:

-    Status = Ip4StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);

-    if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {

-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);

-      Status = EFI_INVALID_PARAMETER;

-    } else {

-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));

-    }

+      break;

 

-    break;

+    case KEY_SAVE_CHANGES:

+      Status = Ip4ConfigConvertIfrNvDataToDeviceConfigData (IfrFormNvData, Ip4ConfigInstance);

+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;

+      break;

 

-  case KEY_GATE_WAY:

-    Status = Ip4StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);

-    if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {

-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);

-      Status = EFI_INVALID_PARAMETER;

-    } else {

-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, &Gateway.v4, sizeof (Gateway.v4));

+    default:

+      break;

     }

 

-    break;

-

-  case KEY_SAVE_CHANGES:

-    Status = Ip4ConfigConvertIfrNvDataToDeviceConfigData (IfrFormNvData, Ip4ConfigInstance);

-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;

-    break;

+    FreePool (IfrFormNvData);

 

-  default:

-    break;

+    return Status;

   }

 

-  FreePool (IfrFormNvData);

-

-  return Status;

+  //

+  // All other action return unsupported.

+  //

+  return EFI_UNSUPPORTED;

 }

 

 /**