[PATCH v2 0/8] Move Shell protocols definition to MdePkg

[PATCH v2 0/8] Move Shell protocols definition to MdePkg

[Ruiyu Ni]

The patches moves Shell spec defined protocol definitions to
MdePkg and updates all references.
Content of ShellBase.h is moved to Protocol/Shell.h and
ShellBase.h is removed.

In V2, to keep maximum backward compatibility, the header files
in ShellPkg will not be removed until all consumers are
updated to reference the protocol definitions in MdePkg.
"git mv" command is used to keep the history of the
protocol definition header files when moving them to MdePkg.


Ruiyu Ni (8):
  ShellPkg: Move SHELL_FREE_NON_NULL from ShellBase.h to ShellLib.h
  MdePkg: Include Shell/ShellDynamicCommand/ShellParameters definitions
  ShellPkg: Update header files to reference MdePkg protocol definition
  MdePkg: Merge ShellBase.h and remove Efi prefix from header files
  ArmPkg/LinuxLoader: Reference Shell protocols in MdePkg
  EmbeddedPkg/FdtPlatformDxe: Reference Shell protocols in MdePkg
  ShellPkg: Update sources to include MdePkg protocol definitions
  ArmPlatformPkg/ArmShellCmdRunAxf: Reference MdePkg protocol definition

 ArmPkg/Application/LinuxLoader/LinuxLoader.h       |    4 +-
 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h  |    6 +-
 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h   |    4 +-
 .../EfiShell.h => MdePkg/Include/Protocol/Shell.h  |  138 ++-
 .../Include/Protocol/ShellDynamicCommand.h         |   11 +-
 .../Include/Protocol/ShellParameters.h             |    8 +-
 MdePkg/MdePkg.dec                                  |   15 +
 ShellPkg/Application/Shell/Shell.h                 |    5 +-
 ShellPkg/Include/Library/ShellCommandLib.h         |    5 +-
 ShellPkg/Include/Library/ShellLib.h                |   14 +-
 ShellPkg/Include/Protocol/EfiShell.h               | 1125 +-------------------
 ShellPkg/Include/Protocol/EfiShellDynamicCommand.h |   73 +-
 ShellPkg/Include/Protocol/EfiShellParameters.h     |   48 +-
 ShellPkg/Include/ShellBase.h                       |  141 +--
 ShellPkg/Library/UefiDpLib/Dp.h                    |    3 +-
 ShellPkg/Library/UefiDpLib/UefiDpLib.h             |    7 +-
 .../UefiHandleParsingLib/UefiHandleParsingLib.h    |    8 +-
 .../UefiShellBcfgCommandLib.c                      |    5 +-
 .../UefiShellCEntryLib/UefiShellCEntryLib.c        |    6 +-
 .../UefiShellCommandLib/UefiShellCommandLib.h      |    7 +-
 .../Library/UefiShellDebug1CommandsLib/Compress.c  |    7 +-
 .../UefiShellDebug1CommandsLib.h                   |    7 +-
 .../UefiShellDriver1CommandsLib.h                  |    7 +-
 .../UefiShellLevel1CommandsLib.h                   |    7 +-
 .../UefiShellLevel2CommandsLib.h                   |    7 +-
 ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c |    2 +-
 .../UefiShellLevel3CommandsLib.h                   |    7 +-
 ShellPkg/Library/UefiShellLib/UefiShellLib.c       |    1 -
 ShellPkg/Library/UefiShellLib/UefiShellLib.h       |    6 +-
 .../UefiShellNetwork1CommandsLib.h                 |    3 +-
 .../UefiShellTftpCommandLib.h                      |    3 +-
 ShellPkg/ShellPkg.dec                              |    3 -
 ShellPkg/ShellPkg.dsc                              |    2 +
 33 files changed, 235 insertions(+), 1460 deletions(-)
 copy ShellPkg/Include/Protocol/EfiShell.h => MdePkg/Include/Protocol/Shell.h (91%)
 copy ShellPkg/Include/Protocol/EfiShellDynamicCommand.h => MdePkg/Include/Protocol/ShellDynamicCommand.h (89%)
 copy ShellPkg/Include/Protocol/EfiShellParameters.h => MdePkg/Include/Protocol/ShellParameters.h (87%)

-- 
2.9.0.windows.1

[PATCH v2 1/8] ShellPkg: Move SHELL_FREE_NON_NULL from ShellBase.h to ShellLib.h

[Ruiyu Ni]

The more proper place for macro SHELL_FREE_NON_NULL is ShellLib.h
instead of ShellBase.h.

Modify Compress.c to resolve build failure due to this change.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 ShellPkg/Include/Library/ShellLib.h                    | 10 +++++++++-
 ShellPkg/Include/ShellBase.h                           | 10 +---------
 ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index fe4b9cf..fafa041 100644
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to shell functionality for shell commands and applications.
 
-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -24,6 +24,14 @@
 #include <Protocol/EfiShell.h>
 #include <Protocol/EfiShellParameters.h>
 
+#define SHELL_FREE_NON_NULL(Pointer)  \
+  do {                                \
+    if ((Pointer) != NULL) {          \
+      FreePool((Pointer));            \
+      (Pointer) = NULL;               \
+    }                                 \
+  } while(FALSE)
+
 // (20 * (6+5+2))+1) unicode characters from EFI FAT spec (doubled for bytes)
 #define MAX_FILE_NAME_LEN 512
 
diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
index 09f87b4..4b7a3d1 100644
--- a/ShellPkg/Include/ShellBase.h
+++ b/ShellPkg/Include/ShellBase.h
@@ -1,7 +1,7 @@
 /** @file
   Root include file for Shell Package modules that utilize the SHELL_RETURN type
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -17,14 +17,6 @@
 
 typedef VOID *SHELL_FILE_HANDLE;
 
-#define SHELL_FREE_NON_NULL(Pointer)  \
-  do {                                \
-    if ((Pointer) != NULL) {          \
-      FreePool((Pointer));            \
-      (Pointer) = NULL;               \
-    }                                 \
-  } while(FALSE)
-
 typedef enum {
 ///
 /// The operation completed successfully.
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
index dda2fed..da8e647 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
@@ -7,7 +7,7 @@
   This sequence is further divided into Blocks and Huffman codings
   are applied to each Block.
 
-  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -17,12 +17,12 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
-
+#include <Uefi.h>
+#include <ShellBase.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
-#include <ShellBase.h>
-#include <Uefi.h>
+#include <Library/ShellLib.h>
 
 //
 // Macro Definitions
-- 
2.9.0.windows.1

[PATCH v2 2/8] MdePkg: Include Shell/ShellDynamicCommand/ShellParameters definitions

[Ruiyu Ni]

Move Shell/ShellDynamicCommand/ShellParameters definitions from
ShellPkg to MdePkg.

The following patches will rename the header file name.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 {ShellPkg => MdePkg}/Include/Protocol/EfiShell.h          |  0
 .../Include/Protocol/EfiShellDynamicCommand.h             |  0
 .../Include/Protocol/EfiShellParameters.h                 |  0
 {ShellPkg => MdePkg}/Include/ShellBase.h                  |  0
 MdePkg/MdePkg.dec                                         | 15 +++++++++++++++
 5 files changed, 15 insertions(+)
 rename {ShellPkg => MdePkg}/Include/Protocol/EfiShell.h (100%)
 rename {ShellPkg => MdePkg}/Include/Protocol/EfiShellDynamicCommand.h (100%)
 rename {ShellPkg => MdePkg}/Include/Protocol/EfiShellParameters.h (100%)
 rename {ShellPkg => MdePkg}/Include/ShellBase.h (100%)

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/MdePkg/Include/Protocol/EfiShell.h
similarity index 100%
rename from ShellPkg/Include/Protocol/EfiShell.h
rename to MdePkg/Include/Protocol/EfiShell.h
diff --git a/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h b/MdePkg/Include/Protocol/EfiShellDynamicCommand.h
similarity index 100%
rename from ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
rename to MdePkg/Include/Protocol/EfiShellDynamicCommand.h
diff --git a/ShellPkg/Include/Protocol/EfiShellParameters.h b/MdePkg/Include/Protocol/EfiShellParameters.h
similarity index 100%
rename from ShellPkg/Include/Protocol/EfiShellParameters.h
rename to MdePkg/Include/Protocol/EfiShellParameters.h
diff --git a/ShellPkg/Include/ShellBase.h b/MdePkg/Include/ShellBase.h
similarity index 100%
rename from ShellPkg/Include/ShellBase.h
rename to MdePkg/Include/ShellBase.h
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index f1e5151..3e08bed 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -1645,6 +1645,21 @@ [Protocols]
   ## Include/Protocol/EraseBlock.h
   gEfiEraseBlockProtocolGuid           = { 0x95a9a93e, 0xa86e, 0x4926, {0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87 }}
 
+  #
+  # Protocols defined in Shell2.0
+  #
+  ## Include/Protocol/Shell.h
+  gEfiShellProtocolGuid                = { 0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e }}
+
+  ## Include/Protocol/ShellParameters.h
+  gEfiShellParametersProtocolGuid      = { 0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca }}
+
+  #
+  # Protocols defined in Shell2.1
+  #
+  ## Include/Protocol/ShellDynamicCommand.h
+  gEfiShellDynamicCommandProtocolGuid  = { 0x3c7200e9, 0x005f, 0x4ea4, {0x87, 0xde, 0xa3, 0xdf, 0xac, 0x8a, 0x27, 0xc3 }}
+
 #
 # [Error.gEfiMdePkgTokenSpaceGuid]
 #   0x80000001 | Invalid value provided.
-- 
2.9.0.windows.1

[PATCH v2 3/8] ShellPkg: Update header files to reference MdePkg protocol definition

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/Include/Protocol/EfiShell.h               | 21 +++++++++++++++++++++
 ShellPkg/Include/Protocol/EfiShellDynamicCommand.h | 21 +++++++++++++++++++++
 ShellPkg/Include/Protocol/EfiShellParameters.h     | 20 ++++++++++++++++++++
 ShellPkg/Include/ShellBase.h                       | 20 ++++++++++++++++++++
 ShellPkg/ShellPkg.dec                              |  3 ---
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 ShellPkg/Include/Protocol/EfiShell.h
 create mode 100644 ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
 create mode 100644 ShellPkg/Include/Protocol/EfiShellParameters.h
 create mode 100644 ShellPkg/Include/ShellBase.h

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
new file mode 100644
index 0000000..4fb8f23
--- /dev/null
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -0,0 +1,21 @@
+/** @file
+  EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.
+
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __EFI_SHELL_PROTOCOL_H__WRAPPER
+#define __EFI_SHELL_PROTOCOL_H__WRAPPER
+
+#include <Protocol/Shell.h>
+
+#endif
diff --git a/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h b/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
new file mode 100644
index 0000000..43cb688
--- /dev/null
+++ b/ShellPkg/Include/Protocol/EfiShellDynamicCommand.h
@@ -0,0 +1,21 @@
+/** @file
+  EFI Shell Dynamic Command registration protocol
+
+  (C) Copyright 2012-2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__WRAPPER
+#define __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__WRAPPER
+
+#include <Protocol/ShellDynamicCommand.h>
+
+#endif
diff --git a/ShellPkg/Include/Protocol/EfiShellParameters.h b/ShellPkg/Include/Protocol/EfiShellParameters.h
new file mode 100644
index 0000000..ba8bd1a
--- /dev/null
+++ b/ShellPkg/Include/Protocol/EfiShellParameters.h
@@ -0,0 +1,20 @@
+/** @file
+  EFI Shell protocol as defined in the UEFI Shell 2.0 specification.
+
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __EFI_SHELL_PARAMETERS_PROTOCOL_H__WRAPPER
+#define __EFI_SHELL_PARAMETERS_PROTOCOL_H__WRAPPER
+
+#include <Protocol/ShellParameters.h>
+
+#endif
diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
new file mode 100644
index 0000000..725ce52
--- /dev/null
+++ b/ShellPkg/Include/ShellBase.h
@@ -0,0 +1,20 @@
+/** @file
+  Root include file for Shell Package modules that utilize the SHELL_RETURN type
+
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _SHELL_BASE_
+#define _SHELL_BASE_
+
+#include <Protocol/Shell.h>
+
+#endif //__SHELL_BASE_
diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index 39f8012..bb31c2d 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -58,11 +58,8 @@ [Guids]
   gShellBcfgHiiGuid               = {0x5f5f605d, 0x1583, 0x4a2d, {0xa6, 0xb2, 0xeb, 0x12, 0xda, 0xb4, 0xa2, 0xb6}}
 
 [Protocols]
-  gEfiShellProtocolGuid               = {0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e}}
-  gEfiShellParametersProtocolGuid     = {0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca}}
   gEfiShellEnvironment2Guid           = {0x47c7b221, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
   gEfiShellInterfaceGuid              = {0x47c7b223, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
-  gEfiShellDynamicCommandProtocolGuid = {0x3c7200e9, 0x005f, 0x4ea4, {0x87, 0xde, 0xa3, 0xdf, 0xac, 0x8a, 0x27, 0xc3}}
 
 [PcdsFeatureFlag]
   ## This flag is used to control whether the shell includes NT32 platform Guids
-- 
2.9.0.windows.1

[PATCH v2 4/8] MdePkg: Merge ShellBase.h and remove Efi prefix from header files

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 MdePkg/Include/Protocol/{EfiShell.h => Shell.h}    | 138 ++++++++++++++++++-
 ...ShellDynamicCommand.h => ShellDynamicCommand.h} |  11 +-
 .../{EfiShellParameters.h => ShellParameters.h}    |   8 +-
 MdePkg/Include/ShellBase.h                         | 149 ---------------------
 4 files changed, 143 insertions(+), 163 deletions(-)
 rename MdePkg/Include/Protocol/{EfiShell.h => Shell.h} (91%)
 rename MdePkg/Include/Protocol/{EfiShellDynamicCommand.h => ShellDynamicCommand.h} (89%)
 rename MdePkg/Include/Protocol/{EfiShellParameters.h => ShellParameters.h} (87%)
 delete mode 100644 MdePkg/Include/ShellBase.h

diff --git a/MdePkg/Include/Protocol/EfiShell.h b/MdePkg/Include/Protocol/Shell.h
similarity index 91%
rename from MdePkg/Include/Protocol/EfiShell.h
rename to MdePkg/Include/Protocol/Shell.h
index 5c7f4f6..b4bf2f4 100644
--- a/MdePkg/Include/Protocol/EfiShell.h
+++ b/MdePkg/Include/Protocol/Shell.h
@@ -2,7 +2,7 @@
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.
 
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -13,16 +13,146 @@
 
 **/
 
-#ifndef __EFI_SHELL_PROTOCOL__
-#define __EFI_SHELL_PROTOCOL__
+#ifndef __EFI_SHELL_PROTOCOL_H__
+#define __EFI_SHELL_PROTOCOL_H__
 
-#include <ShellBase.h>
 #include <Guid/FileInfo.h>
 
 #define EFI_SHELL_PROTOCOL_GUID \
   { \
   0x6302d008, 0x7f9b, 0x4f30, { 0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e } \
   }
+typedef VOID *SHELL_FILE_HANDLE;
+
+typedef enum {
+  ///
+  /// The operation completed successfully.
+  ///
+  SHELL_SUCCESS               = 0,
+
+  ///
+  /// The image failed to load.
+  ///
+  SHELL_LOAD_ERROR            = 1,
+
+  ///
+  /// The parameter was incorrect.
+  ///
+  SHELL_INVALID_PARAMETER     = 2,
+
+  ///
+  /// The operation is not supported.
+  ///
+  SHELL_UNSUPPORTED           = 3,
+
+  ///
+  /// The buffer was not the proper size for the request.
+  ///
+  SHELL_BAD_BUFFER_SIZE       = 4,
+
+  ///
+  /// The buffer was not large enough to hold the requested data.
+  /// The required buffer size is returned in the appropriate
+  /// parameter when this error occurs.
+  ///
+  SHELL_BUFFER_TOO_SMALL      = 5,
+
+  ///
+  /// There is no data pending upon return.
+  ///
+  SHELL_NOT_READY             = 6,
+
+  ///
+  /// The physical device reported an error while attempting the
+  /// operation.
+  ///
+  SHELL_DEVICE_ERROR          = 7,
+
+  ///
+  /// The device cannot be written to.
+  ///
+  SHELL_WRITE_PROTECTED       = 8,
+
+  ///
+  /// The resource has run out.
+  ///
+  SHELL_OUT_OF_RESOURCES      = 9,
+
+  ///
+  /// An inconsistency was detected on the file system causing the
+  /// operation to fail.
+  ///
+  SHELL_VOLUME_CORRUPTED      = 10,
+
+  ///
+  /// There is no more space on the file system.
+  ///
+  SHELL_VOLUME_FULL           = 11,
+
+  ///
+  /// The device does not contain any medium to perform the
+  /// operation.
+  ///
+  SHELL_NO_MEDIA              = 12,
+
+  ///
+  /// The medium in the device has changed since the last
+  /// access.
+  ///
+  SHELL_MEDIA_CHANGED         = 13,
+
+  ///
+  /// The item was not found.
+  ///
+  SHELL_NOT_FOUND             = 14,
+
+  ///
+  /// Access was denied.
+  ///
+  SHELL_ACCESS_DENIED         = 15,
+
+  // note the skipping of 16 and 17
+
+  ///
+  /// A timeout time expired.
+  ///
+  SHELL_TIMEOUT               = 18,
+
+  ///
+  /// The protocol has not been started.
+  ///
+  SHELL_NOT_STARTED           = 19,
+
+  ///
+  /// The protocol has already been started.
+  ///
+  SHELL_ALREADY_STARTED       = 20,
+
+  ///
+  /// The operation was aborted.
+  ///
+  SHELL_ABORTED               = 21,
+
+  // note the skipping of 22, 23, and 24
+
+  ///
+  /// A function encountered an internal version that was
+  /// incompatible with a version requested by the caller.
+  ///
+  SHELL_INCOMPATIBLE_VERSION  = 25,
+
+  ///
+  /// The function was not performed due to a security violation.
+  ///
+  SHELL_SECURITY_VIOLATION    = 26,
+
+  ///
+  /// The function was performed and resulted in an unequal
+  /// comparison..
+  ///
+  SHELL_NOT_EQUAL             = 27
+} SHELL_STATUS;
+
 
 // replaced EFI_LIST_ENTRY with LIST_ENTRY for simplicity.
 // they are identical outside of the name.
diff --git a/MdePkg/Include/Protocol/EfiShellDynamicCommand.h b/MdePkg/Include/Protocol/ShellDynamicCommand.h
similarity index 89%
rename from MdePkg/Include/Protocol/EfiShellDynamicCommand.h
rename to MdePkg/Include/Protocol/ShellDynamicCommand.h
index 27e384c..e949878 100644
--- a/MdePkg/Include/Protocol/EfiShellDynamicCommand.h
+++ b/MdePkg/Include/Protocol/ShellDynamicCommand.h
@@ -2,6 +2,7 @@
   EFI Shell Dynamic Command registration protocol
 
   (C) Copyright 2012-2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,13 +13,11 @@
 
 **/
 
-#ifndef __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL__
-#define __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL__
-
-#include <ShellBase.h>
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/EfiShell.h>
+#ifndef __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__
+#define __EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_H__
 
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 
 // {3C7200E9-005F-4EA4-87DE-A3DFAC8A27C3}
 #define EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL_GUID \
diff --git a/MdePkg/Include/Protocol/EfiShellParameters.h b/MdePkg/Include/Protocol/ShellParameters.h
similarity index 87%
rename from MdePkg/Include/Protocol/EfiShellParameters.h
rename to MdePkg/Include/Protocol/ShellParameters.h
index e52328b..5679249 100644
--- a/MdePkg/Include/Protocol/EfiShellParameters.h
+++ b/MdePkg/Include/Protocol/ShellParameters.h
@@ -1,7 +1,7 @@
 /** @file
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification.
 
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,10 +12,10 @@
 
 **/
 
-#ifndef __EFI_SHELL_PARAMETERS_PROTOCOL__
-#define __EFI_SHELL_PARAMETERS_PROTOCOL__
+#ifndef __EFI_SHELL_PARAMETERS_PROTOCOL_H__
+#define __EFI_SHELL_PARAMETERS_PROTOCOL_H__
 
-#include <ShellBase.h>
+#include <Protocol/Shell.h>
 
 #define EFI_SHELL_PARAMETERS_PROTOCOL_GUID \
   { \
diff --git a/MdePkg/Include/ShellBase.h b/MdePkg/Include/ShellBase.h
deleted file mode 100644
index 4b7a3d1..0000000
--- a/MdePkg/Include/ShellBase.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/** @file
-  Root include file for Shell Package modules that utilize the SHELL_RETURN type
-
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _SHELL_BASE_
-#define _SHELL_BASE_
-
-typedef VOID *SHELL_FILE_HANDLE;
-
-typedef enum {
-///
-/// The operation completed successfully.
-///
-SHELL_SUCCESS               = 0,
-
-///
-/// The image failed to load.
-///
-SHELL_LOAD_ERROR            = 1,
-
-///
-/// The parameter was incorrect.
-///
-SHELL_INVALID_PARAMETER     = 2,
-
-///
-/// The operation is not supported.
-///
-SHELL_UNSUPPORTED           = 3,
-
-///
-/// The buffer was not the proper size for the request.
-///
-SHELL_BAD_BUFFER_SIZE       = 4,
-
-///
-/// The buffer was not large enough to hold the requested data.
-/// The required buffer size is returned in the appropriate
-/// parameter when this error occurs.
-///
-SHELL_BUFFER_TOO_SMALL      = 5,
-
-///
-/// There is no data pending upon return.
-///
-SHELL_NOT_READY             = 6,
-
-///
-/// The physical device reported an error while attempting the
-/// operation.
-///
-SHELL_DEVICE_ERROR          = 7,
-
-///
-/// The device cannot be written to.
-///
-SHELL_WRITE_PROTECTED       = 8,
-
-///
-/// The resource has run out.
-///
-SHELL_OUT_OF_RESOURCES      = 9,
-
-///
-/// An inconsistency was detected on the file system causing the
-/// operation to fail.
-///
-SHELL_VOLUME_CORRUPTED      = 10,
-
-///
-/// There is no more space on the file system.
-///
-SHELL_VOLUME_FULL           = 11,
-
-///
-/// The device does not contain any medium to perform the
-/// operation.
-///
-SHELL_NO_MEDIA              = 12,
-
-///
-/// The medium in the device has changed since the last
-/// access.
-///
-SHELL_MEDIA_CHANGED         = 13,
-
-///
-/// The item was not found.
-///
-SHELL_NOT_FOUND             = 14,
-
-///
-/// Access was denied.
-///
-SHELL_ACCESS_DENIED         = 15,
-
-// note the skipping of 16 and 17
-
-///
-/// A timeout time expired.
-///
-SHELL_TIMEOUT               = 18,
-
-///
-/// The protocol has not been started.
-///
-SHELL_NOT_STARTED           = 19,
-
-///
-/// The protocol has already been started.
-///
-SHELL_ALREADY_STARTED       = 20,
-
-///
-/// The operation was aborted.
-///
-SHELL_ABORTED               = 21,
-
-// note the skipping of 22, 23, and 24
-
-///
-/// A function encountered an internal version that was
-/// incompatible with a version requested by the caller.
-///
-SHELL_INCOMPATIBLE_VERSION  = 25,
-
-///
-/// The function was not performed due to a security violation.
-///
-SHELL_SECURITY_VIOLATION    = 26,
-
-///
-/// The function was performed and resulted in an unequal
-/// comparison..
-///
-SHELL_NOT_EQUAL             = 27
-}SHELL_STATUS;
-
-#endif //__SHELL_BASE_
-- 
2.9.0.windows.1

[PATCH v2 5/8] ArmPkg/LinuxLoader: Reference Shell protocols in MdePkg

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPkg/Application/LinuxLoader/LinuxLoader.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ArmPkg/Application/LinuxLoader/LinuxLoader.h b/ArmPkg/Application/LinuxLoader/LinuxLoader.h
index 8a23d7f..0d18c24 100644
--- a/ArmPkg/Application/LinuxLoader/LinuxLoader.h
+++ b/ArmPkg/Application/LinuxLoader/LinuxLoader.h
@@ -25,8 +25,8 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
 
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/EfiShell.h>
+#include <Protocol/ShellParameters.h>
+#include <Protocol/Shell.h>
 
 #include <libfdt.h>
 
-- 
2.9.0.windows.1

[PATCH v2 6/8] EmbeddedPkg/FdtPlatformDxe: Reference Shell protocols in MdePkg

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h b/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h
index d49dd42..a631f28 100644
--- a/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h
+++ b/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h
@@ -19,8 +19,8 @@
 
 #include <Protocol/DevicePathToText.h>
 #include <Protocol/DevicePathFromText.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellDynamicCommand.h>
 
 #include <Library/DebugLib.h>
 #include <Library/HiiLib.h>
-- 
2.9.0.windows.1

[PATCH v2 7/8] ShellPkg: Update sources to include MdePkg protocol definitions

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/Application/Shell/Shell.h                                | 5 ++---
 ShellPkg/Include/Library/ShellCommandLib.h                        | 5 ++---
 ShellPkg/Include/Library/ShellLib.h                               | 4 ++--
 ShellPkg/Library/UefiDpLib/Dp.h                                   | 3 +--
 ShellPkg/Library/UefiDpLib/UefiDpLib.h                            | 7 +++----
 ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h      | 8 ++++----
 .../Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c     | 5 ++---
 ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c          | 6 +++---
 ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h        | 7 +++----
 ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c            | 1 -
 .../UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h       | 7 +++----
 .../UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h     | 7 +++----
 .../UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h       | 7 +++----
 .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h       | 7 +++----
 ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c                | 2 +-
 .../UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h       | 7 +++----
 ShellPkg/Library/UefiShellLib/UefiShellLib.c                      | 1 -
 ShellPkg/Library/UefiShellLib/UefiShellLib.h                      | 6 +++---
 .../UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h   | 3 +--
 .../Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h     | 3 +--
 ShellPkg/ShellPkg.dsc                                             | 2 ++
 21 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index a93ea60..25ac114 100644
--- a/ShellPkg/Application/Shell/Shell.h
+++ b/ShellPkg/Application/Shell/Shell.h
@@ -17,17 +17,16 @@
 #define _SHELL_INTERNAL_HEADER_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellVariableGuid.h>
 #include <Guid/ShellAliasGuid.h>
 
 #include <Protocol/LoadedImage.h>
 #include <Protocol/SimpleTextOut.h>
-#include <Protocol/EfiShell.h>
+#include <Protocol/Shell.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/HiiPackageList.h>
 
diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index 3ee8200..08de133 100644
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -21,10 +21,9 @@
 #define _SHELL_COMMAND_LIB_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/UnicodeCollation.h>
 #include <Protocol/SimpleFileSystem.h>
 
diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index fafa041..9b611d8 100644
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -21,8 +21,8 @@
 #include <Protocol/LoadedImage.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 
 #define SHELL_FREE_NON_NULL(Pointer)  \
   do {                                \
diff --git a/ShellPkg/Library/UefiDpLib/Dp.h b/ShellPkg/Library/UefiDpLib/Dp.h
index 72e2c3b..06fee3b 100644
--- a/ShellPkg/Library/UefiDpLib/Dp.h
+++ b/ShellPkg/Library/UefiDpLib/Dp.h
@@ -1,7 +1,7 @@
 /** @file
   Common declarations for the Dp Performance Reporting Utility.
 
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
+  Copyright (c) 2009 - 2016, 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
   which accompanies this distribution.  The full text of the license may be found at
@@ -15,7 +15,6 @@
 #define _EFI_APP_DP_H_
 
 #include <Library/ShellLib.h>
-#include <ShellBase.h>
 
 #define DP_MAJOR_VERSION        2
 #define DP_MINOR_VERSION        4
diff --git a/ShellPkg/Library/UefiDpLib/UefiDpLib.h b/ShellPkg/Library/UefiDpLib/UefiDpLib.h
index 3dd9ddf..283f833 100644
--- a/ShellPkg/Library/UefiDpLib/UefiDpLib.h
+++ b/ShellPkg/Library/UefiDpLib/UefiDpLib.h
@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for dp command functions.
 
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -17,12 +17,11 @@
 #define _UEFI_DP_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 extern EFI_GUID gDpHiiGuid;
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index 9a45076..ada2b4a 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   (C) Copyright 2013-2016 Hewlett-Packard Development Company, L.P.<BR>
   This program and the accompanying materials
@@ -32,8 +32,8 @@
 #include <Protocol/LoadedImage.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePathToText.h>
 #include <Protocol/DriverBinding.h>
 #include <Protocol/DriverConfiguration2.h>
@@ -136,7 +136,7 @@
 #include <Protocol/IdeControllerInit.h>
 #include <Protocol/DiskIo2.h>
 #include <Protocol/AdapterInformation.h>
-#include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/ShellDynamicCommand.h>
 #include <Protocol/DiskInfo.h>
 
 #include <Library/HandleParsingLib.h>
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
index dc3714d..62a52ad 100644
--- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
+++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
@@ -15,13 +15,12 @@
 
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/GlobalVariable.h>
 #include <Guid/ShellLibHiiGuid.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
index 525c1f1..7fcdedb 100644
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
@@ -1,7 +1,7 @@
 /** @file
   Provides application point extension for "C" style main funciton
 
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -17,7 +17,7 @@
 #include <Protocol/SimpleFileSystem.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/EfiShellInterface.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/ShellParameters.h>
 
 #include <Library/ShellCEntryLib.h>
 #include <Library/DebugLib.h>
@@ -32,7 +32,7 @@
 
   Note that the Shell uses POSITIVE integers for error values, while UEFI
   uses NEGATIVE values.  If the application is to be used within a script,
-  it needs to return one of the SHELL_STATUS values defined in ShellBase.h.
+  it needs to return one of the SHELL_STATUS values defined in Protocol/Shell.h.
 
   @param  ImageHandle  The image handle of the UEFI Application.
   @param  SystemTable  A pointer to the EFI System Table.
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
index faf2f51..b998656 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
@@ -17,7 +17,6 @@
 #define _UEFI_COMMAND_LIB_INTERNAL_HEADER_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/FileInfo.h>
 
@@ -25,11 +24,11 @@
 #include <Protocol/LoadedImage.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/UnicodeCollation.h>
 #include <Protocol/BlockIo.h>
-#include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/ShellDynamicCommand.h>
 
 #include <Library/DevicePathLib.h>
 #include <Library/SortLib.h>
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
index da8e647..736d2a3 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
@@ -18,7 +18,6 @@
 
 **/
 #include <Uefi.h>
-#include <ShellBase.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index 4a4932e..52ea56a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for Profile1 shell command functions.
 
-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -16,7 +16,6 @@
 #define _UEFI_SHELL_DEBUG1_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/GlobalVariable.h>
 #include <Guid/ConsoleInDevice.h>
@@ -24,8 +23,8 @@
 #include <Guid/FileSystemInfo.h>
 #include <Guid/ShellLibHiiGuid.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index 7d1a601..b061243 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for Profile1 shell command functions.
 
-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -16,7 +16,6 @@
 #define _UEFI_SHELL_DRIVER1_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/GlobalVariable.h>
 #include <Guid/ConsoleInDevice.h>
@@ -25,8 +24,8 @@
 
 #include <IndustryStandard/Pci.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
index 292abbf..04892a6 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for level 1 shell command functions.
 
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -16,12 +16,11 @@
 #define _UEFI_SHELL_LEVEL1_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 19e46a1..c262bb5 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -9,7 +9,7 @@
   * functions are non-interactive only
 
 
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -24,12 +24,11 @@
 #define _UEFI_SHELL_LEVEL2_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
index 5940a1e..a71ade3 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
@@ -20,7 +20,7 @@
 #include <Library/ShellLib.h>
 #include <Library/HandleParsingLib.h>
 
-#include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/ShellDynamicCommand.h>
 
 /**
    function to insert string items into a list in the correct alphabetical place
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
index bd5b9be..be88dd5 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file
   header file for NULL named library for level 3 shell command functions.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved. <BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -16,12 +16,11 @@
 #define _UEFI_SHELL_LEVEL3_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index a7f84a8..2389207 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -15,7 +15,6 @@
 **/
 
 #include "UefiShellLib.h"
-#include <ShellBase.h>
 #include <Library/SortLib.h>
 #include <Library/BaseLib.h>
 
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.h b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
index 955f8ac..fca6b7b 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.h
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
@@ -2,7 +2,7 @@
   Provides interface to shell functionality for shell commands and applications.
 
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
-  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -24,8 +24,8 @@
 #include <Protocol/LoadedImage.h>
 #include <Protocol/EfiShellInterface.h>
 #include <Protocol/EfiShellEnvironment2.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/UnicodeCollation.h>
 
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
index 98b40df..2df1b54 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file
   header file for NULL named library for network1 shell command functions.
 
-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -17,7 +17,6 @@
 #define _UEFI_SHELL_NETWORK1_COMMANDS_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
 
diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
index bef1e1d..6767f95 100644
--- a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.h
@@ -1,7 +1,7 @@
 /** @file
   header file for NULL named library for 'tftp' Shell command functions.
 
-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>
   Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -18,7 +18,6 @@
 #define _UEFI_SHELL_TFTP_COMMAND_LIB_H_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
 #include <Guid/ShellLibHiiGuid.h>
 
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 809bd42..6b7864b 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -84,7 +84,9 @@ [Components]
   #
   ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+  ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
   ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+  ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
   ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
   ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
   ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
-- 
2.9.0.windows.1

[PATCH v2 8/8] ArmPlatformPkg/ArmShellCmdRunAxf: Reference MdePkg protocol definition

[Ruiyu Ni]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
index 8599961..2708b53 100644
--- a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
+++ b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
@@ -15,10 +15,8 @@
 #ifndef __ARM_SHELL_CMD_RUNAXF__
 #define __ARM_SHELL_CMD_RUNAXF__
 
-#include <ShellBase.h>
-
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellDynamicCommand.h>
 
 #include <Library/HiiLib.h>
 #include <Library/ShellLib.h>
-- 
2.9.0.windows.1

Re: [PATCH v2 8/8] ArmPlatformPkg/ArmShellCmdRunAxf: Reference MdePkg protocol definition

[Ard Biesheuvel]

On 18 October 2016 at 09:46, Ruiyu Ni <ruiyu.ni@intel.com> wrote:
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> index 8599961..2708b53 100644
> --- a/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> +++ b/ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> @@ -15,10 +15,8 @@
>  #ifndef __ARM_SHELL_CMD_RUNAXF__
>  #define __ARM_SHELL_CMD_RUNAXF__
>
> -#include <ShellBase.h>
> -
> -#include <Protocol/EfiShell.h>
> -#include <Protocol/EfiShellDynamicCommand.h>
> +#include <Protocol/Shell.h>
> +#include <Protocol/ShellDynamicCommand.h>
>
>  #include <Library/HiiLib.h>
>  #include <Library/ShellLib.h>
> --
> 2.9.0.windows.1
>

Re: [PATCH v2 0/8] Move Shell protocols definition to MdePkg

[Carsey, Jaben]

I am good with this.

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Tuesday, October 18, 2016 1:46 AM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [PATCH v2 0/8] Move Shell protocols definition to MdePkg
> Importance: High
> 
> The patches moves Shell spec defined protocol definitions to
> MdePkg and updates all references.
> Content of ShellBase.h is moved to Protocol/Shell.h and
> ShellBase.h is removed.
> 
> In V2, to keep maximum backward compatibility, the header files
> in ShellPkg will not be removed until all consumers are
> updated to reference the protocol definitions in MdePkg.
> "git mv" command is used to keep the history of the
> protocol definition header files when moving them to MdePkg.
> 
> 
> Ruiyu Ni (8):
>   ShellPkg: Move SHELL_FREE_NON_NULL from ShellBase.h to ShellLib.h
>   MdePkg: Include Shell/ShellDynamicCommand/ShellParameters definitions
>   ShellPkg: Update header files to reference MdePkg protocol definition
>   MdePkg: Merge ShellBase.h and remove Efi prefix from header files
>   ArmPkg/LinuxLoader: Reference Shell protocols in MdePkg
>   EmbeddedPkg/FdtPlatformDxe: Reference Shell protocols in MdePkg
>   ShellPkg: Update sources to include MdePkg protocol definitions
>   ArmPlatformPkg/ArmShellCmdRunAxf: Reference MdePkg protocol
> definition
> 
>  ArmPkg/Application/LinuxLoader/LinuxLoader.h       |    4 +-
>  .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h  |    6 +-
>  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.h   |    4 +-
>  .../EfiShell.h => MdePkg/Include/Protocol/Shell.h  |  138 ++-
>  .../Include/Protocol/ShellDynamicCommand.h         |   11 +-
>  .../Include/Protocol/ShellParameters.h             |    8 +-
>  MdePkg/MdePkg.dec                                  |   15 +
>  ShellPkg/Application/Shell/Shell.h                 |    5 +-
>  ShellPkg/Include/Library/ShellCommandLib.h         |    5 +-
>  ShellPkg/Include/Library/ShellLib.h                |   14 +-
>  ShellPkg/Include/Protocol/EfiShell.h               | 1125 +-------------------
>  ShellPkg/Include/Protocol/EfiShellDynamicCommand.h |   73 +-
>  ShellPkg/Include/Protocol/EfiShellParameters.h     |   48 +-
>  ShellPkg/Include/ShellBase.h                       |  141 +--
>  ShellPkg/Library/UefiDpLib/Dp.h                    |    3 +-
>  ShellPkg/Library/UefiDpLib/UefiDpLib.h             |    7 +-
>  .../UefiHandleParsingLib/UefiHandleParsingLib.h    |    8 +-
>  .../UefiShellBcfgCommandLib.c                      |    5 +-
>  .../UefiShellCEntryLib/UefiShellCEntryLib.c        |    6 +-
>  .../UefiShellCommandLib/UefiShellCommandLib.h      |    7 +-
>  .../Library/UefiShellDebug1CommandsLib/Compress.c  |    7 +-
>  .../UefiShellDebug1CommandsLib.h                   |    7 +-
>  .../UefiShellDriver1CommandsLib.h                  |    7 +-
>  .../UefiShellLevel1CommandsLib.h                   |    7 +-
>  .../UefiShellLevel2CommandsLib.h                   |    7 +-
>  ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c |    2 +-
>  .../UefiShellLevel3CommandsLib.h                   |    7 +-
>  ShellPkg/Library/UefiShellLib/UefiShellLib.c       |    1 -
>  ShellPkg/Library/UefiShellLib/UefiShellLib.h       |    6 +-
>  .../UefiShellNetwork1CommandsLib.h                 |    3 +-
>  .../UefiShellTftpCommandLib.h                      |    3 +-
>  ShellPkg/ShellPkg.dec                              |    3 -
>  ShellPkg/ShellPkg.dsc                              |    2 +
>  33 files changed, 235 insertions(+), 1460 deletions(-)
>  copy ShellPkg/Include/Protocol/EfiShell.h =>
> MdePkg/Include/Protocol/Shell.h (91%)
>  copy ShellPkg/Include/Protocol/EfiShellDynamicCommand.h =>
> MdePkg/Include/Protocol/ShellDynamicCommand.h (89%)
>  copy ShellPkg/Include/Protocol/EfiShellParameters.h =>
> MdePkg/Include/Protocol/ShellParameters.h (87%)
> 
> --
> 2.9.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel