From: Tomas Pilar <quic_tpilar@quicinc.com>

Create PcdShellDefaultDelay to configure the default
delay the shell provides for the user at the start time
if the user wishes to cancel the execution of a potential
startup script.

The shell application already allows the user to override
the delay default value by specifying the -delay cmdline
argument. This however cannot be used when loading the
shell application using direct boot or when integrating
the shell into the platform firmware build.

Thus, a PCD can be easily configurerd by the developer
either at build time, or even at runtime.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Tomas Pilar <tomas@quicinc.com>
---
 ShellPkg/Application/Shell/Shell.c   | 2 +-
 ShellPkg/Application/Shell/Shell.inf | 1 +
 ShellPkg/ShellPkg.dec                | 4 ++++
 ShellPkg/ShellPkg.dsc                | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index df00adfdfa..0ae6e14a34 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -990,7 +990,7 @@ ProcessCommandLine (
   ShellInfoObject.ShellInitSettings.BitUnion.Bits.Delay        = FALSE;

   ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit         = FALSE;

   ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest       = FALSE;

-  ShellInfoObject.ShellInitSettings.Delay                      = 5;

+  ShellInfoObject.ShellInitSettings.Delay                      = PcdGet32 (PcdShellDefaultDelay);

 

   //

   // Start LoopVar at 0 to parse only optional arguments at Argv[0]

diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
index 4c32960a96..f1e41de133 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -103,3 +103,4 @@
   gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole           ## CONSUMES

   gEfiShellPkgTokenSpaceGuid.PcdShellSupplier               ## CONSUMES

   gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellDefaultDelay           ## CONSUMES

diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index 7b2d1230bd..2ebea0a261 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -136,3 +136,7 @@
   # Up to this many bytes of vendor specific data will be used. Default is 0

   # (disabled).

   gEfiShellPkgTokenSpaceGuid.PcdShellVendorExtendedDecode|0|UINT32|0x00000013

+

+  ## Controls the default delay the shell will offer to the user at the

+  # start to check if the user wishes to cancel the script autostart

+  gEfiShellPkgTokenSpaceGuid.PcdShellDefaultDelay|5|UINT32|0x00000015

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index dd0d88603f..1a4e970ce7 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -82,6 +82,7 @@
 !ifdef $(NO_SHELL_PROFILES)

   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask|0x00

 !endif #$(NO_SHELL_PROFILES)

+  gEfiShellPkgTokenSpaceGuid.PcdShellDefaultDelay|5

 

 [Components]

   #

-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97870): https://edk2.groups.io/g/devel/message/97870
Mute This Topic: https://groups.io/mt/96027198/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-