MdeModulePkg CapsuleApp: Prompt info for -C option

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 93bf4252bac6db97e0f60734e28544d753c7ca3b..2967b0d1dd18a6dca6747577cada975e3977c1c4 100644 (file)
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -70,7 +70,7 @@ DumpCapsule (
   @retval EFI_UNSUPPORTED        Input parameter is not valid.\r
 **/\r
 EFI_STATUS\r
-DmpCapsuleStatusVariable (\r
+DumpCapsuleStatusVariable (\r
   VOID\r
   );\r
 \r
@@ -466,11 +466,13 @@ ClearCapsuleStatusVariable (
   UINT32                              Index;\r
   CHAR16                              CapsuleVarName[20];\r
   CHAR16                              *TempVarName;\r
+  BOOLEAN                             Found;\r
 \r
   StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CapsuleVarName[0]), L"Capsule");\r
   TempVarName = CapsuleVarName + StrLen (CapsuleVarName);\r
   Index = 0;\r
 \r
+  Found = FALSE;\r
   while (TRUE) {\r
     UnicodeSPrint (TempVarName, 5 * sizeof(CHAR16), L"%04x", Index);\r
 \r
@@ -481,12 +483,15 @@ ClearCapsuleStatusVariable (
                     0,\r
                     (VOID *)NULL\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (Status == EFI_NOT_FOUND) {\r
       //\r
-      // There is no capsule variables, quit\r
+      // There is no more capsule variables, quit\r
       //\r
       break;\r
     }\r
+    Found = TRUE;\r
+\r
+    Print (L"Clear %s %r\n", CapsuleVarName, Status);\r
 \r
     Index++;\r
     if (Index > 0xFFFF) {\r
@@ -494,6 +499,10 @@ ClearCapsuleStatusVariable (
     }\r
   }\r
 \r
+  if (!Found) {\r
+    Print (L"No any Capsule#### variable found\n");\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -850,7 +859,7 @@ UefiMain (
     return Status;\r
   }\r
   if (StrCmp(Argv[1], L"-S") == 0) {\r
-    Status = DmpCapsuleStatusVariable();\r
+    Status = DumpCapsuleStatusVariable();\r
     return EFI_SUCCESS;\r
   }\r
   if (StrCmp(Argv[1], L"-C") == 0) {\r

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
index 4c85e8c23dffff058bf118434617be8d4f0e603f..11bf2e1d4530ae23627f5a007962b552b6f59bd6 100644 (file)
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
@@ -283,7 +283,7 @@ Done:
   @retval EFI_UNSUPPORTED        Input parameter is not valid.\r
 **/\r
 EFI_STATUS\r
-DmpCapsuleStatusVariable (\r
+DumpCapsuleStatusVariable (\r
   VOID\r
   )\r
 {\r