From: qhuang8 Date: Mon, 23 Feb 2009 03:05:23 +0000 (+0000) Subject: Split the Print functionality from SetupBrowserDxe. Platform should use PrintDxe... X-Git-Tag: edk2-stable201903~18678 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=bb9153a122077f1799d2d8a8f3aba67b06e5b31c Split the Print functionality from SetupBrowserDxe. Platform should use PrintDxe to produces Print2 Protocol and PrintThunk for Edk Print protocol. 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 83feb0f9fe..fa992bd381 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -22,14 +22,6 @@ SETUP_DRIVER_PRIVATE_DATA mPrivateData = { { SendForm, BrowserCallback - }, - { - UnicodeVSPrint, - UnicodeVSPrintAsciiFormat, - UnicodeValueToString, - AsciiVSPrint, - AsciiVSPrintUnicodeFormat, - AsciiValueToString } }; @@ -604,29 +596,6 @@ InitializeSetup ( ); ASSERT_EFI_ERROR (Status); - // - // Install Print protocol - // - Status = gBS->InstallProtocolInterface ( - &mPrivateData.Handle, - &gEfiPrint2ProtocolGuid, - EFI_NATIVE_INTERFACE, - &mPrivateData.Print - ); - - // - // Install Ecp Print protocol, which is defined in - // Edk\Foundation\Protocol\Print\Print.h with protocol - // GUID of { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0 }} - // This is support previous module that written to consume this protocol. - // - Status = gBS->InstallProtocolInterface ( - &mPrivateData.Handle, - &gEfiPrintProtocolGuid, - EFI_NATIVE_INTERFACE, - &mPrivateData.Print - ); - return Status; } diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index b4aef47567..b3912b7862 100644 --- 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. #include -#include -#include #include #include #include @@ -173,7 +171,6 @@ typedef struct { // Produced protocol // EFI_FORM_BROWSER2_PROTOCOL FormBrowser2; - EFI_PRINT2_PROTOCOL Print; } SETUP_DRIVER_PRIVATE_DATA; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 962847e3f9..f808d66800 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -64,8 +64,6 @@ ExtendedHiiLib [Protocols] - gEfiPrintProtocolGuid ## PRODUCES - gEfiPrint2ProtocolGuid ## PRODUCES gEfiHiiConfigAccessProtocolGuid ## CONSUMES gEfiHiiStringProtocolGuid ## CONSUMES gEfiFormBrowser2ProtocolGuid ## PRODUCES