Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...

[mirror_edk2.git] / EdkModulePkg / Universal / Console / Terminal / Dxe / ComponentName.c

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
index cc925b13c907f73a1cc34cca72968ba21a98b3bb..bdc6df471dc0107213853f634948e65cf2899557 100644 (file)
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c
@@ -20,27 +20,6 @@ Abstract:
 \r
 #include "Terminal.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-TerminalComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -162,12 +141,34 @@ TerminalComponentNameGetControllerName (
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *SimpleTextOutput;\r
   TERMINAL_DEV                  *TerminalDevice;\r
 \r
+  //\r
+  // Make sure this driver is currently managing ControllHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gTerminalDriverBinding.DriverBindingHandle,\r
+             &gEfiSerialIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // This is a bus driver, so ChildHandle can not be NULL.\r
   //\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
+  Status = EfiTestChildHandle (\r
+             ControllerHandle,\r
+             ChildHandle,\r
+             &gEfiSerialIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // Get our context back\r
   //\r