Fix component name bugs when input Controller Name is invalid

Fix the driver binding version for platform/OEM specific drivers 




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

EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c

@@ -217,7 +217,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConInDriverBinding = {
   ConSplitterConInDriverBindingSupported,
   ConSplitterConInDriverBindingStart,
   ConSplitterConInDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };
@@ -226,7 +226,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterSimplePointerDriverBinding = {
   ConSplitterSimplePointerDriverBindingSupported,
   ConSplitterSimplePointerDriverBindingStart,
   ConSplitterSimplePointerDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };
@@ -235,7 +235,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConOutDriverBinding = {
   ConSplitterConOutDriverBindingSupported,
   ConSplitterConOutDriverBindingStart,
   ConSplitterConOutDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };
@@ -244,7 +244,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterStdErrDriverBinding = {
   ConSplitterStdErrDriverBindingSupported,
   ConSplitterStdErrDriverBindingStart,
   ConSplitterStdErrDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };

EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c

@@ -144,7 +144,7 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = {
   GraphicsConsoleControllerDriverSupported,
   GraphicsConsoleControllerDriverStart,
   GraphicsConsoleControllerDriverStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };

EdkModulePkg/Universal/Console/Terminal/Dxe/ComponentName.c

@@ -162,12 +162,34 @@ TerminalComponentNameGetControllerName (
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *SimpleTextOutput;
   TERMINAL_DEV                  *TerminalDevice;
 
+  //
+  // Make sure this driver is currently managing ControllHandle
+  //
+  Status = EfiTestManagedDevice (
+             ControllerHandle,
+             gTerminalDriverBinding.DriverBindingHandle,
+             &gEfiSerialIoProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
   //
   // This is a bus driver, so ChildHandle can not be NULL.
   //
   if (ChildHandle == NULL) {
     return EFI_UNSUPPORTED;
   }
+
+  Status = EfiTestChildHandle (
+             ControllerHandle,
+             ChildHandle,
+             &gEfiSerialIoProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
   //
   // Get our context back
   //

EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c

@@ -57,7 +57,7 @@ EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding = {
   TerminalDriverBindingSupported,
   TerminalDriverBindingStart,
   TerminalDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };