[edk2-devel] [PATCH edk2-test 1/3] SctPkg: Remove EdkCompatibilityPkg references

[edk2-devel] [PATCH edk2-test 1/3] SctPkg: Remove EdkCompatibilityPkg references

[Luigi Leonardi via groups.io]

edk2 commit c455bc8c8d78ad51c24426a500914ea32504bf06
("EdkCompatibilityPkg: Remove EdkCompatibilityPkg") removed the
EdkCompatibilityPkg.

Remove all the remaining references and replace them if necessary.

Signed-off-by: Luigi Leonardi <leonardi@redhat.com>
---
 uefi-sct/SctPkg/Library/SctLib/Hob.c                           |  2 +-
 .../BlackBoxTest/Dependency/ValidHiiImage1/makefile.forbuild   | 10 ----------
 .../UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/Print.c       |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/uefi-sct/SctPkg/Library/SctLib/Hob.c b/uefi-sct/SctPkg/Library/SctLib/Hob.c
index 2daf862dbeb31698675ae7a4656103e22c24b7a2..e1cdc89f17497b27721e0170de3ba9f9f9b63212 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Hob.c
+++ b/uefi-sct/SctPkg/Library/SctLib/Hob.c
@@ -385,7 +385,7 @@ Returns:
 
   *BaseAddress  = FirmwareVolumeHob.FirmwareVolume2->BaseAddress;
   *Length       = FirmwareVolumeHob.FirmwareVolume2->Length;
-  EfiCommonLibCopyMem(FileName,&FirmwareVolumeHob.FirmwareVolume2->FileName,sizeof(EFI_GUID));
+  SctCopyMem(FileName,&FirmwareVolumeHob.FirmwareVolume2->FileName,sizeof(EFI_GUID));
 
   *HobStart     = GET_NEXT_HOB (FirmwareVolumeHob);
 
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/ValidHiiImage1/makefile.forbuild b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/ValidHiiImage1/makefile.forbuild
index 9b19a1b73ef66a63ea12a6fd5cc99804e896f03b..f2ad8709dd0efe9c5d7ad89c3e913961f11da019 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/ValidHiiImage1/makefile.forbuild
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/ValidHiiImage1/makefile.forbuild
@@ -252,16 +252,6 @@ OBJECTS = $(OBJECTS) \
 #
 DEST_OUTPUT_DIRS = $(OUTPUT_DIR) 
 
-#
-# Tool-generated list of libraries that are generated
-# from the list of libraries listed in the [libraries.*] sections
-# of the component INF file.
-#
-LIBS = $(LIBS)     \
-       $(LIB_DIR)\EdkCompatibilityPkg\Foundation\Efi\Guid\EfiGuidLib\OUTPUT\EfiGuidLib.lib    \
-       $(LIB_DIR)\EdkCompatibilityPkg\Foundation\Efi\Protocol\EfiProtocolLib\OUTPUT\EfiProtocolLib.lib    \
-       $(LIB_DIR)\EdkCompatibilityPkg\Foundation\Library\EfiCommonLib\EfiCommonLib\OUTPUT\EfiCommonLib.lib
-
 #
 # ORIGIN: [Build.X64.???] section of the platform DSC file
 #
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/Print.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/Print.c
index 752189d6d57af6da359328129dde287a13fd7ca3..d9a8ec7be915edb060c1306a92d545b2d38d59de 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/Print.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/Print.c
@@ -15,7 +15,6 @@
 
 
 //#include "TianoCommon.h"
-//#include "EfiCommonLib.h"
 //#include "EfiPrintLib.h"
 #include "Print.h"
 #include "SctLib.h"

-- 
2.48.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#121211): https://edk2.groups.io/g/devel/message/121211
Mute This Topic: https://groups.io/mt/111793445/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-test 2/3] SctPkg: Remove UsbHostController reference

[Luigi Leonardi via groups.io]

EDK2 Commit 32b57911153ea8289a6257bc84843e922e81f127 ("MdePkg: delete
EFI 1.10 USB Host Controller Protocol") drops the support for
UsbHostController. This causes the tests not to compile.

Drop any reference from edk2-test.

Signed-off-by: Luigi Leonardi <leonardi@redhat.com>
---
 .../Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
index 272ed53b3497ebd5365b8198fd46a5df9e2a0765..d60cf7e46e8f4cc6c562afb3c3690c15173092e1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
@@ -47,7 +47,6 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
 #include EFI_PROTOCOL_DEFINITION (PciIo)
 #include EFI_PROTOCOL_DEFINITION (DeviceIo)
-#include EFI_PROTOCOL_DEFINITION (UsbHostController)
 #include EFI_PROTOCOL_DEFINITION (UsbIo)
 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
 #include EFI_PROTOCOL_DEFINITION (DebugSupport)

-- 
2.48.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#121212): https://edk2.groups.io/g/devel/message/121212
Mute This Topic: https://groups.io/mt/111793447/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-test 3/3] SctPkg: Fix missing function declaration error

[Luigi Leonardi via groups.io]

Fix compilation error: implicit declaration of function
‘SctDevicePathStrFromProtocol’ [-Wimplicit-function-declaration].

Signed-off-by: Luigi Leonardi <leonardi@redhat.com>
---
 .../EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
index 9952fbcab83312404e73905fdbd51c2cd768c32a..0095c3e16d2e4c58c5d23b4fe92aa853898541c1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
@@ -31,6 +31,7 @@ Abstract:
 #include <Library/EfiTestLib.h>
 #include <UEFI/Protocol/AdapterInfo.h>
 #include "Guid.h"
+#include <SctLib.h>
 
 
 #define EFI_ADAPTER_INFORMATION_PROTOCOL_TEST_REVISION    0x00010000
@@ -161,11 +162,4 @@ BBTestGetSupportedTypesFunctionTest (
   );
 
 
-VOID
-SctInitializeLib (
-  IN EFI_HANDLE                 ImageHandle,
-  IN EFI_SYSTEM_TABLE           *SystemTable
-  );
-
-
 #endif

-- 
2.48.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#121213): https://edk2.groups.io/g/devel/message/121213
Mute This Topic: https://groups.io/mt/111793448/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-