Split the Print functionality from SetupBrowserDxe. Platform should use PrintDxe...

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 83feb0f9fef5ef66ae70ec08d3696df55f562ded..fa992bd3810265c98ce9dd67c941da1addf3230d 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -22,14 +22,6 @@ SETUP_DRIVER_PRIVATE_DATA  mPrivateData = {
   {\r
     SendForm,\r
     BrowserCallback\r
-  },\r
-  {\r
-    UnicodeVSPrint,\r
-    UnicodeVSPrintAsciiFormat,\r
-    UnicodeValueToString,                         \r
-    AsciiVSPrint,          \r
-    AsciiVSPrintUnicodeFormat,\r
-    AsciiValueToString\r
   }\r
 };\r
 \r
@@ -604,29 +596,6 @@ InitializeSetup (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  //\r
-  // Install Print protocol\r
-  //\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &mPrivateData.Handle,\r
-                  &gEfiPrint2ProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &mPrivateData.Print\r
-                  );\r
-\r
-  //\r
-  // Install Ecp Print protocol, which is defined in\r
-  // Edk\Foundation\Protocol\Print\Print.h with protocol\r
-  // GUID of { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0 }}\r
-  // This is support previous module that written to consume this protocol.\r
-  // \r
-  Status = gBS->InstallProtocolInterface (\r
-                  &mPrivateData.Handle,\r
-                  &gEfiPrintProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &mPrivateData.Print\r
-                  );\r
-\r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index b4aef47567865ccc0134e41e643f0537e8098514..b3912b7862440b5755f9da90d83d0f47c3dc06b7 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -19,8 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <PiDxe.h>\r
 \r
-#include <Protocol/Print.h>\r
-#include <Protocol/Print2.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/FormBrowser2.h>\r
@@ -173,7 +171,6 @@ typedef struct {
   // Produced protocol\r
   //\r
   EFI_FORM_BROWSER2_PROTOCOL         FormBrowser2;\r
-  EFI_PRINT2_PROTOCOL                Print;\r
 \r
 } SETUP_DRIVER_PRIVATE_DATA;\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 962847e3f98c3623fba7fb5575c212937eb6471d..f808d668000b59eb370c63a65ebe72528edc12f9 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -64,8 +64,6 @@
   ExtendedHiiLib\r
 \r
 [Protocols]\r
-  gEfiPrintProtocolGuid                         ## PRODUCES\r
-  gEfiPrint2ProtocolGuid                        ## PRODUCES\r
   gEfiHiiConfigAccessProtocolGuid               ## CONSUMES\r
   gEfiHiiStringProtocolGuid                     ## CONSUMES\r
   gEfiFormBrowser2ProtocolGuid                  ## PRODUCES\r