From patchwork Tue Jul 14 10:36:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 51099 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CA62F22A24 for ; Tue, 14 Jul 2015 10:36:55 +0000 (UTC) Received: by wizo10 with SMTP id o10sf3611318wiz.0 for ; Tue, 14 Jul 2015 03:36:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=UIiYuHEOI39OtuiAyogRCob/0axhqeydxAfQ1lHudn0=; b=DhwhwZ2/huWaBJHD3sp/36K5FVbZ2ij6WwD3hgAuwlx5yETY6ZLypDlGzkLiCq9KeM 5GG6CHPASwwUUagRFXva8zZ6H52SeASur8JF51iAqabD604RoIhfQXms9kcgl3AqHW4q GBwLNNW4QyrtkcIfi559uMMq/wsBPx5QNIw3sB2f6cTTLU4uKYLSLBjUepod5b4nCbjP GvTFK+a81OyIkJ9GYV7fA/RGVC5NBhtv6ihE7lsTI83IajCRXE11pEiqj+C3hQu1MsAc YZAe3LAlUiyQs4+JJEAH3bhYNW8ENLdepp4sjuwi/HrzXCJUNykrS10adOdizTj4lUYF 3zXQ== X-Gm-Message-State: ALoCoQkVd+3IPWhPVioH8CjW29XX58J6sehB1MEdnN4+H7Fu4Ue18lDp5+JIsfmj/6D0AqSWADZU X-Received: by 10.180.106.10 with SMTP id gq10mr9735647wib.0.1436870215161; Tue, 14 Jul 2015 03:36:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.69 with SMTP id k5ls28255lam.107.gmail; Tue, 14 Jul 2015 03:36:55 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr36974555lbc.19.1436870214990; Tue, 14 Jul 2015 03:36:54 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id xr5si542542lbb.76.2015.07.14.03.36.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 03:36:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lblf12 with SMTP id f12so3525633lbl.2 for ; Tue, 14 Jul 2015 03:36:54 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr36110884lac.41.1436870214892; Tue, 14 Jul 2015 03:36:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2290625lbb; Tue, 14 Jul 2015 03:36:53 -0700 (PDT) X-Received: by 10.50.61.195 with SMTP id s3mr17504322igr.62.1436870211901; Tue, 14 Jul 2015 03:36:51 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id f16si7809363igo.41.2015.07.14.03.36.51 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 14 Jul 2015 03:36:51 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZExZp-0002HC-Of; Tue, 14 Jul 2015 10:36:41 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZExZp-0002H7-Gj for edk2-devel@lists.sourceforge.net; Tue, 14 Jul 2015 10:36:41 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.169 as permitted sender) client-ip=209.85.212.169; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f169.google.com; Received: from mail-wi0-f169.google.com ([209.85.212.169]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZExZo-0005DI-Ky for edk2-devel@lists.sourceforge.net; Tue, 14 Jul 2015 10:36:41 +0000 Received: by wiga1 with SMTP id a1so95229970wig.0 for ; Tue, 14 Jul 2015 03:36:34 -0700 (PDT) X-Received: by 10.180.79.133 with SMTP id j5mr32132986wix.38.1436870194579; Tue, 14 Jul 2015 03:36:34 -0700 (PDT) Received: from localhost.localdomain ([185.13.106.92]) by smtp.gmail.com with ESMTPSA id e2sm1228800wjw.12.2015.07.14.03.36.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jul 2015 03:36:33 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, heyi.guo@linaro.org, lersek@redhat.com, feng.tian@intel.com, liming.gao@intel.com Date: Tue, 14 Jul 2015 12:36:19 +0200 Message-Id: <1436870180-18841-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436870180-18841-1-git-send-email-ard.biesheuvel@linaro.org> References: <1436870180-18841-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ZExZo-0005DI-Ky Subject: [edk2] [PATCH 1/2] MdeModulePkg|EmulatorPkg: add definition for PcdDefaultTerminalType X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Reviewed-by: Roy Franz --- 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.

+ # 0 - PCANSI
+ # 1 - VT100
+ # 2 - VT100+
+ # 3 - UTF8
+ # 4 - TTYTERM
+ # @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]