Merged PR: https://github.com/tianocore/edk2/pull/3937 Commit: https://github.com/tianocore/edk2/commit/e96a5734f6b1b1d38a60d9ecf77a453ae2fc8303
Mike > -----Original Message----- > From: Kinney, Michael D <michael.d.kin...@intel.com> > Sent: Friday, January 20, 2023 7:56 AM > To: devel@edk2.groups.io; quic_tpi...@quicinc.com > Cc: Ni, Ray <ray...@intel.com>; Gao, Zhichao <zhichao....@intel.com>; Kinney, > Michael D <michael.d.kin...@intel.com> > Subject: RE: [edk2-devel] [PATCH v3 1/1] ShellPkg: Export default shell delay > as PCD > > Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com> > > Mike > > > -----Original Message----- > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Tomas Pilar > > (tpilar) > > Sent: Tuesday, January 3, 2023 9:02 AM > > To: devel@edk2.groups.io > > Cc: Ni, Ray <ray...@intel.com>; Gao, Zhichao <zhichao....@intel.com> > > Subject: [edk2-devel] [PATCH v3 1/1] ShellPkg: Export default shell delay > > as PCD > > > > From: Tomas Pilar <quic_tpi...@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...@intel.com> > > Cc: Zhichao Gao <zhichao....@intel.com> > > Signed-off-by: Tomas Pilar <to...@quicinc.com> > > --- > > ShellPkg/ShellPkg.dec | 4 ++++ > > ShellPkg/Application/Shell/Shell.inf | 1 + > > ShellPkg/Application/Shell/Shell.c | 2 +- > > 3 files changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec > > index 7b2d1230bd2c..2ebea0a2615f 100644 > > --- a/ShellPkg/ShellPkg.dec > > +++ b/ShellPkg/ShellPkg.dec > > @@ -136,3 +136,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, > > PcdsDynamicEx] > > # 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/Application/Shell/Shell.inf > > b/ShellPkg/Application/Shell/Shell.inf > > index 4c32960a9687..f1e41de133d1 100644 > > --- a/ShellPkg/Application/Shell/Shell.inf > > +++ b/ShellPkg/Application/Shell/Shell.inf > > @@ -103,3 +103,4 @@ [Pcd] > > gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole ## CONSUMES > > gEfiShellPkgTokenSpaceGuid.PcdShellSupplier ## CONSUMES > > gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount ## CONSUMES > > + gEfiShellPkgTokenSpaceGuid.PcdShellDefaultDelay ## CONSUMES > > diff --git a/ShellPkg/Application/Shell/Shell.c > > b/ShellPkg/Application/Shell/Shell.c > > index df00adfdfa5b..0ae6e14a34bf 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] > > -- > > 2.34.1 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98938): https://edk2.groups.io/g/devel/message/98938 Mute This Topic: https://groups.io/mt/96032068/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
