[edk2,1/2] MdeModulePkg|EmulatorPkg: add definition for PcdDefaultTerminalType

Message ID 1436870180-18841-2-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel July 14, 2015, 10:36 a.m.
Since PcdDefaultTerminalType may now assume values that are not
defined in MdePkg (i.e., TTYTERM), introduce a new version in
MdeModulePkg instead. Also add TTYTERM as #4.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 EmulatorPkg/EmulatorPkg.dsc                                |  4 ++--
 MdeModulePkg/MdeModulePkg.dec                              | 10 ++++++++++
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

Comments

Roy Franz July 14, 2015, 3:42 p.m. | #1
On Tue, Jul 14, 2015 at 3:36 AM, Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
> Since PcdDefaultTerminalType may now assume values that are not
> defined in MdePkg (i.e., TTYTERM), introduce a new version in
> MdeModulePkg instead. Also add TTYTERM as #4.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  EmulatorPkg/EmulatorPkg.dsc                                |  4 ++--
>  MdeModulePkg/MdeModulePkg.dec                              | 10 ++++++++++
>  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf |  2 +-
>  3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
> index e0c616144df6..c8e9877b85dc 100644
> --- a/EmulatorPkg/EmulatorPkg.dsc
> +++ b/EmulatorPkg/EmulatorPkg.dsc
> @@ -228,8 +228,8 @@ [PcdsFixedAtBuild]
>    gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"
>    gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"
>
> -  #  0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
> -  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1
> +  #  0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType|1
>
>  [PcdsDynamicDefault.common.DEFAULT]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
> diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
> index 623b07f9c6a2..76c92d725380 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -1333,6 +1333,16 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
>    # @Prompt Default Creator Revision for ACPI table creation.
>    gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision|0x01000013|UINT32|0x30001038
>
> +  ## Indicates the usable type of terminal.<BR><BR>
> +  #  0 - PCANSI<BR>
> +  #  1 - VT100<BR>
> +  #  2 - VT100+<BR>
> +  #  3 - UTF8<BR>
> +  #  4 - TTYTERM<BR>
> +  # @Prompt Default Terminal Type.
> +  # @ValidRange 0x80000001 | 0 - 4
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x0000006f
> +
>  [PcdsPatchableInModule]
>    ## Specify memory size with page number for PEI code when
>    #  Loading Module at Fixed Address feature is enabled.
> diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> index 078029679823..c1ad5779ac29 100644
> --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> @@ -86,7 +86,7 @@ [Protocols]
>    gEfiSimpleTextOutProtocolGuid                 ## BY_START
>
>  [Pcd]
> -  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType           ## SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType     ## SOMETIMES_CONSUMES
>    gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable    ## CONSUMES
>
>  # [Event]
> --
> 1.9.1
>


Reviewed-by: Roy Franz <roy.franz@linaro.org>

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/

Patch hide | download patch | download mbox

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index e0c616144df6..c8e9877b85dc 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -228,8 +228,8 @@  [PcdsFixedAtBuild]
   gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"
   gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"
 
-  #  0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8
-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1
+  #  0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType|1
 
 [PcdsDynamicDefault.common.DEFAULT]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 623b07f9c6a2..76c92d725380 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1333,6 +1333,16 @@  [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   # @Prompt Default Creator Revision for ACPI table creation.
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision|0x01000013|UINT32|0x30001038
 
+  ## Indicates the usable type of terminal.<BR><BR>
+  #  0 - PCANSI<BR>
+  #  1 - VT100<BR>
+  #  2 - VT100+<BR>
+  #  3 - UTF8<BR>
+  #  4 - TTYTERM<BR>
+  # @Prompt Default Terminal Type.
+  # @ValidRange 0x80000001 | 0 - 4
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x0000006f
+
 [PcdsPatchableInModule]
   ## Specify memory size with page number for PEI code when
   #  Loading Module at Fixed Address feature is enabled.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index 078029679823..c1ad5779ac29 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -86,7 +86,7 @@  [Protocols]
   gEfiSimpleTextOutProtocolGuid                 ## BY_START
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType           ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultTerminalType     ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable    ## CONSUMES
 
 # [Event]