From efb419ea76fb685688507fc6491f3969ee10cd67 Mon Sep 17 00:00:00 2001 From: Daryl McDaniel Date: Thu, 18 Sep 2014 19:13:22 +0000 Subject: [PATCH] StdLib: Produce DevMedia as a library class alternative to DevShell. AppPkg: Replace existing DevShell dependencies with DevMedia. These patches will NOT cause existing code which uses DevShell to break. During an interim period, either DevShell or DevMedia may be used. In the future, DevShell will be removed from the code base. During the interim, DevShell and DevMedia refer to the same library. StdLib/LibC/Uefi/Devices/daShell.inf Make this library also satisfy the DevMedia library class. StdLib/StdLib.inc Add a library class definition for DevMedia AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf AppPkg/Applications/Python/PythonCore.inf AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf AppPkg/Applications/Sockets/GetServByName/GetServByName.inf AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf AppPkg/Applications/Sockets/SetHostName/SetHostName.inf AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf AppPkg/Applications/Sockets/TftpServer/TftpServer.inf AppPkg/Applications/Sockets/WebServer/WebServer.inf Change LibraryClass dependency from DevShell to DevMedia Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Daryl McDaniel Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16142 6f19259b-4bc3-4df7-8a09-765794883524 --- .../OrderedCollectionTest/OrderedCollectionTest.inf | 2 +- AppPkg/Applications/Python/PythonCore.inf | 2 +- AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf | 2 +- AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf | 2 +- AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf | 2 +- AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf | 2 +- AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf | 2 +- AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf | 2 +- AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf | 2 +- AppPkg/Applications/Sockets/GetServByName/GetServByName.inf | 2 +- AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf | 2 +- AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf | 2 +- AppPkg/Applications/Sockets/SetHostName/SetHostName.inf | 2 +- AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf | 2 +- AppPkg/Applications/Sockets/TftpServer/TftpServer.inf | 2 +- AppPkg/Applications/Sockets/WebServer/WebServer.inf | 2 +- StdLib/LibC/Uefi/Devices/daShell.inf | 1 + StdLib/StdLib.inc | 3 ++- 18 files changed, 19 insertions(+), 17 deletions(-) diff --git a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf index 5eb71fe49a..cfa835b761 100644 --- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf +++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf @@ -38,5 +38,5 @@ [LibraryClasses] LibC LibStdio - DevShell + DevMedia OrderedCollectionLib diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf index 91c3afa22b..ece84378fe 100644 --- a/AppPkg/Applications/Python/PythonCore.inf +++ b/AppPkg/Applications/Python/PythonCore.inf @@ -41,7 +41,7 @@ LibWchar LibGen LibNetUtil - DevShell + DevMedia # # Comment out the following two library classes if socket support is # NOT being built in to Python. diff --git a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf index 34267a860b..bcfb985432 100644 --- a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf +++ b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf @@ -40,7 +40,7 @@ [LibraryClasses] BaseMemoryLib BsdSocketLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf index 9ed1d37ad5..d164510db1 100644 --- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf +++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf index 44d6fda757..9856578306 100644 --- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf +++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf index f6d0aea466..a6f001a76a 100644 --- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf +++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf index 0aa35a5b66..87f8910f8b 100644 --- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf +++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf @@ -40,7 +40,7 @@ [LibraryClasses] BaseMemoryLib BsdSocketLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf index 003b89fd93..f1b3954bc5 100644 --- a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf +++ b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf index e5e7416488..bfb1cd61b1 100644 --- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf +++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf index 5c10b90146..1b66e50a35 100644 --- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf +++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf index a6b5b61ab7..d2a387f36f 100644 --- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf +++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf index 89e907c140..9a9ca711c6 100644 --- a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf +++ b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf index 97b63822b6..ed1b4951e4 100644 --- a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf +++ b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf index 8f6ab004eb..e088be7cc4 100644 --- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf +++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf @@ -41,7 +41,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC LibMath diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf index f069494b30..79513c2215 100644 --- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf +++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf @@ -52,7 +52,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia EfiSocketLib LibC ShellLib diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.inf b/AppPkg/Applications/Sockets/WebServer/WebServer.inf index 3650aef96e..27faefba2c 100644 --- a/AppPkg/Applications/Sockets/WebServer/WebServer.inf +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.inf @@ -75,7 +75,7 @@ BaseMemoryLib BsdSocketLib DebugLib - DevShell + DevMedia DxeServicesTableLib EfiSocketLib LibC diff --git a/StdLib/LibC/Uefi/Devices/daShell.inf b/StdLib/LibC/Uefi/Devices/daShell.inf index 56710259b6..7c456cb652 100644 --- a/StdLib/LibC/Uefi/Devices/daShell.inf +++ b/StdLib/LibC/Uefi/Devices/daShell.inf @@ -23,6 +23,7 @@ MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 LIBRARY_CLASS = DevShell + LIBRARY_CLASS = DevMedia CONSTRUCTOR = __ctor_DevShell DESTRUCTOR = __dtor_DevShell diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc index 60f4cc4d1c..cb54be1548 100644 --- a/StdLib/StdLib.inc +++ b/StdLib/StdLib.inc @@ -65,7 +65,8 @@ # Applications should not directly access any functions defined in these libraries. LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf - DevShell|StdLib/LibC/Uefi/Devices/daShell.inf + DevShell|StdLib/LibC/Uefi/Devices/daShell.inf # DEPRECATED! Please use DevMedia for new code. + DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf [LibraryClasses.ARM]