From 838b31a68cba781fb64ae4deb97fa69b2ed6d4b8 Mon Sep 17 00:00:00 2001 From: Chris Phillips Date: Mon, 18 Aug 2014 20:00:08 +0000 Subject: ShellPkg: Fix EFI_SHELL_PROTOCOL to contain new members from UEFI Shell 2.1 spec - Removes EFI_SHELL_PROTOCOL21 - Adds RegisterGuidName, GetGuidName, GetGuidFromName, and GetEnvEx to EFI_SHELL_PROTOCOL Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chris Phillips Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15818 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Application/Shell/Shell.h | 3 ++- ShellPkg/Application/Shell/ShellProtocol.c | 11 ++++++----- ShellPkg/Application/Shell/ShellProtocol.h | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'ShellPkg/Application/Shell') diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index f78e559665..57518dfd29 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -1,6 +1,7 @@ /** @file function definitions for internal to shell functions. + (C) Copyright 2014, Hewlett-Packard Development Company, L.P. Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -96,7 +97,7 @@ typedef struct { typedef struct { EFI_SHELL_PARAMETERS_PROTOCOL *NewShellParametersProtocol; - EFI_SHELL_PROTOCOL21 *NewEfiShellProtocol; + EFI_SHELL_PROTOCOL *NewEfiShellProtocol; BOOLEAN PageBreakEnabled; BOOLEAN RootShellInstance; SHELL_INIT_SETTINGS ShellInitSettings; diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index 24fa485137..fb94a5b45e 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -2,6 +2,7 @@ Member functions of EFI_SHELL_PROTOCOL and functions for creation, manipulation, and initialization of EFI_SHELL_PROTOCOL. + (C) Copyright 2014, Hewlett-Packard Development Company, L.P. Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -3379,7 +3380,7 @@ EfiShellSetAlias( // Pure FILE_HANDLE operations are passed to FileHandleLib // these functions are indicated by the * -EFI_SHELL_PROTOCOL21 mShellProtocol = { +EFI_SHELL_PROTOCOL mShellProtocol = { EfiShellExecute, EfiShellGetEnv, EfiShellSetEnv, @@ -3420,8 +3421,8 @@ EFI_SHELL_PROTOCOL21 mShellProtocol = { EfiShellOpenRoot, EfiShellOpenRootByHandle, NULL, - 2, // SHELL_MAJOR_VERSION, - 1, // SHELL_MINOR_VERSION, + SHELL_MAJOR_VERSION, + SHELL_MINOR_VERSION, // New for UEFI Shell 2.1 EfiShellRegisterGuidName, @@ -3447,7 +3448,7 @@ EFI_SHELL_PROTOCOL21 mShellProtocol = { EFI_STATUS EFIAPI CreatePopulateInstallShellProtocol ( - IN OUT EFI_SHELL_PROTOCOL21 **NewShell + IN OUT EFI_SHELL_PROTOCOL **NewShell ) { EFI_STATUS Status; @@ -3574,7 +3575,7 @@ CreatePopulateInstallShellProtocol ( EFI_STATUS EFIAPI CleanUpShellProtocol ( - IN OUT EFI_SHELL_PROTOCOL21 *NewShell + IN OUT EFI_SHELL_PROTOCOL *NewShell ) { EFI_STATUS Status; diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h index e1369617f2..16e3718e61 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.h +++ b/ShellPkg/Application/Shell/ShellProtocol.h @@ -2,6 +2,7 @@ Member functions of EFI_SHELL_PROTOCOL and functions for creation, manipulation, and initialization of EFI_SHELL_PROTOCOL. + (C) Copyright 2014, Hewlett-Packard Development Company, L.P. Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -44,7 +45,7 @@ typedef struct { EFI_STATUS EFIAPI CreatePopulateInstallShellProtocol ( - IN OUT EFI_SHELL_PROTOCOL21 **NewShell + IN OUT EFI_SHELL_PROTOCOL **NewShell ); /** @@ -60,7 +61,7 @@ CreatePopulateInstallShellProtocol ( EFI_STATUS EFIAPI CleanUpShellProtocol ( - IN OUT EFI_SHELL_PROTOCOL21 *NewShell + IN OUT EFI_SHELL_PROTOCOL *NewShell ); /** -- cgit v1.2.3