Revision: 13939
http://edk2.svn.sourceforge.net/edk2/?rev=13939&view=rev
Author: jcarsey
Date: 2012-11-13 22:39:09 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
ShellPkg: Clean up header file usage.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <[email protected]>
Reviewed-by: Erik Bjorge <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c
trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.h
trunk/edk2/ShellPkg/Application/Shell/ConsoleWrappers.c
trunk/edk2/ShellPkg/Application/Shell/Shell.h
trunk/edk2/ShellPkg/Application/Shell/ShellEnvVar.c
trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.h
trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.c
trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.h
Modified: trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c 2012-11-13
16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c 2012-11-13
22:39:09 UTC (rev 13939)
@@ -11,7 +11,6 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include "ConsoleLogger.h"
#include "Shell.h"
STATIC CONST CHAR16 mCrLfString[3] = {
CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
Modified: trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.h
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.h 2012-11-13
16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.h 2012-11-13
22:39:09 UTC (rev 13939)
@@ -14,20 +14,8 @@
#ifndef _CONSOLE_LOGGER_HEADER_
#define _CONSOLE_LOGGER_HEADER_
-#include <Uefi.h>
+#include "Shell.h"
-#include <Protocol/SimpleTextOut.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
-
-#include <Library/DebugLib.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/HiiLib.h>
-#include <Library/ShellLib.h>
-
#define CONSOLE_LOGGER_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('c', 'o', 'P',
'D')
typedef struct _CONSOLE_LOGGER_PRIVATE_DATA{
Modified: trunk/edk2/ShellPkg/Application/Shell/ConsoleWrappers.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ConsoleWrappers.c 2012-11-13
16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ConsoleWrappers.c 2012-11-13
22:39:09 UTC (rev 13939)
@@ -12,10 +12,6 @@
**/
-#include <Uefi.h>
-#include <ShellBase.h>
-
-#include "ConsoleWrappers.h"
#include "Shell.h"
typedef struct {
Modified: trunk/edk2/ShellPkg/Application/Shell/Shell.h
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/Shell.h 2012-11-13 16:08:52 UTC
(rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/Shell.h 2012-11-13 22:39:09 UTC
(rev 13939)
@@ -19,6 +19,7 @@
#include <ShellBase.h>
#include <Guid/ShellVariableGuid.h>
+#include <Guid/ShellAliasGuid.h>
#include <Protocol/LoadedImage.h>
#include <Protocol/SimpleTextOut.h>
@@ -45,6 +46,7 @@
#include <Library/PrintLib.h>
#include <Library/HandleParsingLib.h>
#include <Library/PathLib.h>
+#include <Library/FileHandleLib.h>
#include "ShellParametersProtocol.h"
#include "ShellProtocol.h"
@@ -52,6 +54,7 @@
#include "ConsoleLogger.h"
#include "ShellManParser.h"
#include "ConsoleWrappers.h"
+#include "FileHandleWrappers.h"
typedef struct {
LIST_ENTRY Link; ///< Standard linked list handler.
Modified: trunk/edk2/ShellPkg/Application/Shell/ShellEnvVar.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ShellEnvVar.c 2012-11-13 16:08:52 UTC
(rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ShellEnvVar.c 2012-11-13 22:39:09 UTC
(rev 13939)
@@ -12,19 +12,8 @@
**/
-#include <Uefi.h>
-#include <ShellBase.h>
+#include "Shell.h"
-#include <Guid/ShellVariableGuid.h>
-
-#include <Library/BaseLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
-
-#include "ShellEnvVar.h"
-
/**
Reports whether an environment variable is Volatile or Non-Volatile.
Modified: trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
2012-11-13 16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.c
2012-11-13 22:39:09 UTC (rev 13939)
@@ -13,8 +13,7 @@
**/
-#include "ShellParametersProtocol.h"
-#include "ConsoleWrappers.h"
+#include "Shell.h"
/**
return the next parameter from a command line string;
Modified: trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.h
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.h
2012-11-13 16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ShellParametersProtocol.h
2012-11-13 22:39:09 UTC (rev 13939)
@@ -16,26 +16,6 @@
#ifndef _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_
#define _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_
-#include <Uefi.h>
-
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/LoadedImage.h>
-#include <Protocol/SimpleTextOut.h>
-#include <Protocol/SimpleTextIn.h>
-
-#include <Guid/ShellVariableGuid.h>
-
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiLib.h>
-#include <Library/DebugLib.h>
-#include <Library/ShellLib.h>
-#include <Library/FileHandleLib.h>
-
-#include "ShellEnvVar.h"
-#include "FileHandleWrappers.h"
#include "Shell.h"
/**
Modified: trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.c 2012-11-13
16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.c 2012-11-13
22:39:09 UTC (rev 13939)
@@ -14,7 +14,6 @@
**/
#include "Shell.h"
-#include <Library/FileHandleLib.h>
/**
Close an open file handle.
Modified: trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.h
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.h 2012-11-13
16:08:52 UTC (rev 13938)
+++ trunk/edk2/ShellPkg/Application/Shell/ShellProtocol.h 2012-11-13
22:39:09 UTC (rev 13939)
@@ -16,41 +16,8 @@
#ifndef _SHELL_PROTOCOL_HEADER_
#define _SHELL_PROTOCOL_HEADER_
-#include <Uefi.h>
-#include <ShellBase.h>
+#include "Shell.h"
-#include <Guid/ShellVariableGuid.h>
-#include <Guid/ShellMapGuid.h>
-#include <Guid/ShellAliasGuid.h>
-
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/DevicePathToText.h>
-#include <Protocol/ComponentName2.h>
-#include <Protocol/LoadedImage.h>
-#include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/SimpleTextInEx.h>
-
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/BaseLib.h>
-#include <Library/ShellCommandLib.h>
-#include <Library/PrintLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/DebugLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiLib.h>
-#include <Library/SortLib.h>
-#include <Library/PcdLib.h>
-#include <Library/ShellLib.h>
-
-#include "FileHandleWrappers.h"
-#include "ShellEnvVar.h"
-#include "ShellManParser.h"
-
typedef struct {
LIST_ENTRY Link;
EFI_SHELL_PROTOCOL *Interface;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
