Revision: 16526
http://sourceforge.net/p/edk2/code/16526
Author: jcarsey
Date: 2014-12-16 17:50:57 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
ShellPkg: Remove IntelFramweorkModulePkg as Shell library dependency
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: jaben carsey <[email protected]>
Reviewed-by: Tim Lewis <[email protected]>
Reviewed-by: Samer El-Haj-Mahmoud <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
Modified:
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2014-12-16 02:52:00 UTC (rev 16525)
+++ trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2014-12-16 17:50:57 UTC (rev 16526)
@@ -815,6 +815,21 @@
STATIC CONST EFI_GUID WinNtIoProtocolGuid =
LOCAL_EFI_WIN_NT_BUS_DRIVER_IO_PROTOCOL_GUID;
STATIC CONST EFI_GUID WinNtSerialPortGuid =
LOCAL_EFI_WIN_NT_SERIAL_PORT_GUID;
+//
+// Deprecated protocols we dont want to link from IntelFrameworkModulePkg
+//
+#define LOCAL_EFI_ISA_IO_PROTOCOL_GUID \
+ { \
+ 0x7ee2bd44, 0x3da0, 0x11d4, { 0x9a, 0x38, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d
} \
+ }
+#define LOCAL_EFI_ISA_ACPI_PROTOCOL_GUID \
+ { \
+ 0x64a892dc, 0x5561, 0x4536, { 0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55
} \
+ }
+STATIC CONST EFI_GUID EfiIsaIoProtocolGuid = LOCAL_EFI_ISA_IO_PROTOCOL_GUID;
+STATIC CONST EFI_GUID EfiIsaAcpiProtocolGuid =
LOCAL_EFI_ISA_ACPI_PROTOCOL_GUID;
+
+
STATIC CONST GUID_INFO_BLOCK mGuidStringListNT[] = {
{STRING_TOKEN(STR_WINNT_THUNK),
(EFI_GUID*)&WinNtThunkProtocolGuid, NULL},
{STRING_TOKEN(STR_WINNT_DRIVER_IO), (EFI_GUID*)&WinNtIoProtocolGuid,
NULL},
@@ -926,10 +941,14 @@
{STRING_TOKEN(STR_GPT_NBR), &gEfiPartTypeLegacyMbrGuid,
NULL},
{STRING_TOKEN(STR_DRIVER_CONFIG),
&gEfiDriverConfigurationProtocolGuid, NULL},
{STRING_TOKEN(STR_DRIVER_CONFIG2),
&gEfiDriverConfiguration2ProtocolGuid, NULL},
- {STRING_TOKEN(STR_ISA_IO), &gEfiIsaIoProtocolGuid,
NULL},
- {STRING_TOKEN(STR_ISA_ACPI), &gEfiIsaAcpiProtocolGuid,
NULL},
//
+// these are using local (non-global) definitions to reduce package dependancy.
+//
+ {STRING_TOKEN(STR_ISA_IO), (EFI_GUID*)&EfiIsaIoProtocolGuid,
NULL},
+ {STRING_TOKEN(STR_ISA_ACPI),
(EFI_GUID*)&EfiIsaAcpiProtocolGuid, NULL},
+
+//
// the ones under this are GUID identified structs, not protocols
//
{STRING_TOKEN(STR_FILE_INFO), &gEfiFileInfoGuid,
NULL},
Modified:
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
2014-12-16 02:52:00 UTC (rev 16525)
+++ trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
2014-12-16 17:50:57 UTC (rev 16526)
@@ -135,8 +135,6 @@
#include <Protocol/DiskIo2.h>
#include <Protocol/AdapterInformation.h>
#include <Protocol/EfiShellDynamicCommand.h>
-#include <Protocol/IsaIo.h>
-#include <Protocol/IsaAcpi.h>
#include <Library/HandleParsingLib.h>
#include <Library/UefiBootServicesTableLib.h>
Modified:
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
2014-12-16 02:52:00 UTC (rev 16525)
+++ trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
2014-12-16 17:50:57 UTC (rev 16526)
@@ -36,7 +36,6 @@
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
ShellPkg/ShellPkg.dec
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses]
UefiBootServicesTableLib
@@ -173,8 +172,6 @@
gEfiIdeControllerInitProtocolGuid ##UNDEFINED
gEfiDiskIo2ProtocolGuid ##UNDEFINED
gEfiAdapterInformationProtocolGuid ##UNDEFINED
- gEfiIsaIoProtocolGuid ##UNDEFINED
- gEfiIsaAcpiProtocolGuid ##UNDEFINED
gEfiShellDynamicCommandProtocolGuid ##UNDEFINED
[Guids]
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
