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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigNv.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index b0aee5f4367a579e8e4c1b58dac2f585795dd216..d57605e02dc752ba40b7aeb7c985e2f09803b4c3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -1,7 +1,7 @@
 /** @file\r
   Helper functions for configuring or getting the parameters relating to Ip4.\r
 \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, 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
@@ -692,76 +692,76 @@ Ip4FormCallback (
   EFI_STATUS                Status;\r
   EFI_INPUT_KEY             Key;\r
 \r
-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
+  if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+    Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This);\r
+\r
+    IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));\r
+    if (IfrFormNvData == NULL) {\r
+      return EFI_OUT_OF_RESOURCES;\r
+    }\r
+\r
     //\r
-    // Do nothing for UEFI OPEN/CLOSE Action\r
+    // Retrive uncommitted data from Browser\r
     //\r
-    return EFI_SUCCESS;\r
-  }\r
+    if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
+      FreePool (IfrFormNvData);\r
+      return EFI_NOT_FOUND;\r
+    }\r
 \r
-  Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This);\r
+    Status = EFI_SUCCESS;\r
 \r
-  IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));\r
-  if (IfrFormNvData == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
+    switch (QuestionId) {\r
+    case KEY_LOCAL_IP:\r
+      Status = Ip4StrToIp (IfrFormNvData->StationAddress, &HostIp.v4);\r
+      if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
+        Status = EFI_INVALID_PARAMETER;\r
+      } else {\r
+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+      }\r
 \r
-  //\r
-  // Retrive uncommitted data from Browser\r
-  //\r
-  if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
-    FreePool (IfrFormNvData);\r
-    return EFI_NOT_FOUND;\r
-  }\r
+      break;\r
 \r
-  Status = EFI_SUCCESS;\r
+    case KEY_SUBNET_MASK:\r
+      Status = Ip4StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
+      if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
+        Status = EFI_INVALID_PARAMETER;\r
+      } else {\r
+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+      }\r
 \r
-  switch (QuestionId) {\r
-  case KEY_LOCAL_IP:\r
-    Status = Ip4StrToIp (IfrFormNvData->StationAddress, &HostIp.v4);\r
-    if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
-      Status = EFI_INVALID_PARAMETER;\r
-    } else {\r
-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
-    }\r
+      break;\r
 \r
-    break;\r
+    case KEY_GATE_WAY:\r
+      Status = Ip4StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
+      if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {\r
+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
+        Status = EFI_INVALID_PARAMETER;\r
+      } else {\r
+        CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+      }\r
 \r
-  case KEY_SUBNET_MASK:\r
-    Status = Ip4StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
-    if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
-      Status = EFI_INVALID_PARAMETER;\r
-    } else {\r
-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
-    }\r
+      break;\r
 \r
-    break;\r
+    case KEY_SAVE_CHANGES:\r
+      Status = Ip4ConfigConvertIfrNvDataToDeviceConfigData (IfrFormNvData, Ip4ConfigInstance);\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      break;\r
 \r
-  case KEY_GATE_WAY:\r
-    Status = Ip4StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
-    if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {\r
-      CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
-      Status = EFI_INVALID_PARAMETER;\r
-    } else {\r
-      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+    default:\r
+      break;\r
     }\r
 \r
-    break;\r
-\r
-  case KEY_SAVE_CHANGES:\r
-    Status = Ip4ConfigConvertIfrNvDataToDeviceConfigData (IfrFormNvData, Ip4ConfigInstance);\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
-    break;\r
+    FreePool (IfrFormNvData);\r
 \r
-  default:\r
-    break;\r
+    return Status;\r
   }\r
 \r
-  FreePool (IfrFormNvData);\r
-\r
-  return Status;\r
+  //\r
+  // All other action return unsupported.\r
+  //\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r