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

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / DeviceMngr / DeviceManager.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 40d93c5ae007c43a6482d451257607f98f249cf6..1857ffa0a1c93789eb3120db9f983e3a30e01f5e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -141,37 +141,36 @@ DeviceManagerCallback (
   )\r
 {\r
   UINTN CurIndex;\r
+\r
+  if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+    if ((Value == NULL) || (ActionRequest == NULL)) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+\r
+    gCallbackKey = QuestionId;\r
+    if ((QuestionId < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET) && (QuestionId >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {\r
+      //\r
+      // If user select the mac address, need to record mac address string to support next form show.\r
+      //\r
+      for (CurIndex = 0; CurIndex < mMacDeviceList.CurListLen; CurIndex ++) {\r
+        if (mMacDeviceList.NodeList[CurIndex].QuestionId == QuestionId) {\r
+           mSelectedMacAddrString = HiiGetString (gDeviceManagerPrivate.HiiHandle, mMacDeviceList.NodeList[CurIndex].PromptId, NULL);\r
+        }\r
+      }\r
+    }\r
   \r
-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
     //\r
-    // Do nothing for UEFI OPEN/CLOSE Action\r
+    // Request to exit SendForm(), so as to switch to selected form\r
     //\r
-    return EFI_SUCCESS;\r
-  }\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
 \r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
+    return EFI_SUCCESS;\r
   }\r
 \r
-  gCallbackKey = QuestionId;\r
-\r
-  if ((QuestionId < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET) && (QuestionId >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {\r
-    //\r
-    // If user select the mac address, need to record mac address string to support next form show.\r
-    //\r
-    for (CurIndex = 0; CurIndex < mMacDeviceList.CurListLen; CurIndex ++) {\r
-      if (mMacDeviceList.NodeList[CurIndex].QuestionId == QuestionId) {\r
-         mSelectedMacAddrString = HiiGetString (gDeviceManagerPrivate.HiiHandle, mMacDeviceList.NodeList[CurIndex].PromptId, NULL);\r
-      }\r
-    }\r
-  }\r
-  \r
   //\r
-  // Request to exit SendForm(), so as to switch to selected form\r
+  // All other action return unsupported.\r
   //\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r
@@ -1109,25 +1108,25 @@ DriverHealthCallback (
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   )\r
 {\r
-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
+  if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+    if ((Value == NULL) || (ActionRequest == NULL)) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+\r
+    gCallbackKey = QuestionId;\r
+\r
     //\r
-    // Do nothing for UEFI OPEN/CLOSE Action\r
+    // Request to exit SendForm(), so as to switch to selected form\r
     //\r
-    return EFI_SUCCESS;\r
-  }\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
 \r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
+    return EFI_SUCCESS;\r
   }\r
 \r
-  gCallbackKey = QuestionId;\r
-\r
   //\r
-  // Request to exit SendForm(), so as to switch to selected form\r
+  // All other action return unsupported.\r
   //\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r