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  <daryl.mcdaniel@intel.com>
Reviewed-by:  Jaben Carsey <Jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16142 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
index 5eb71fe49a2b2c5e611cefdbcb44b878c63a0416..cfa835b7619f82e6a4ec1df0a089019d87155afa 100644 (file)
--- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
+++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
@@ -38,5 +38,5 @@
 [LibraryClasses]\r
   LibC\r
   LibStdio\r
 [LibraryClasses]\r
   LibC\r
   LibStdio\r

-  DevShell\r
+  DevMedia\r

   OrderedCollectionLib\r
   OrderedCollectionLib\r

diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index 91c3afa22b8de743cebe35f3811e8e9b52e25910..ece84378fe4b5e8ef66bb1aeb3fdf98bf96222b7 100644 (file)
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -41,7 +41,7 @@
   LibWchar\r
   LibGen\r
   LibNetUtil\r
   LibWchar\r
   LibGen\r
   LibNetUtil\r

-  DevShell\r
+  DevMedia\r

   #\r
   # Comment out the following two library classes if socket support is\r
   # NOT being built in to Python.\r
   #\r
   # Comment out the following two library classes if socket support is\r
   # NOT being built in to Python.\r

diff --git a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
index 34267a860bd8a4a4e5b21a758ba20d096d9be22f..bcfb9854320df126074fb7d89f04ac60ea97329b 100644 (file)
--- a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
+++ b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
@@ -40,7 +40,7 @@
 [LibraryClasses]\r
   BaseMemoryLib\r
   BsdSocketLib\r
 [LibraryClasses]\r
   BaseMemoryLib\r
   BsdSocketLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
index 9ed1d37ad5fb3d0df1f4a8c97db42112a5dc8e8b..d164510db190237c91f885abc0db014656705c12 100644 (file)
--- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
index 44d6fda7576afb63c589cfe332a01e759e2eb123..9856578306a5ee1196997c3b0509c6172a583c2c 100644 (file)
--- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
+++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
index f6d0aea4660d979dd58dc96713d966d9a22a8cca..a6f001a76a5aa18f2a53304f4c5c9836db5d724c 100644 (file)
--- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
+++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
index 0aa35a5b666937f021f06911e6a65d7bf85565a2..87f8910f8b0d1577f26cc364aeb15106ab25d8b8 100644 (file)
--- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
+++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
@@ -40,7 +40,7 @@
 [LibraryClasses]\r
   BaseMemoryLib\r
   BsdSocketLib\r
 [LibraryClasses]\r
   BaseMemoryLib\r
   BsdSocketLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
index 003b89fd932b5fa48e695a956ec67a02bc8332a4..f1b3954bc54b71a8cb03803adcb35e6aa1dd947b 100644 (file)
--- a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
index e5e74164887942daa4e9db17283941d8e0bbc14e..bfb1cd61b105b6f21fd6fc8caa3209a44d7af0d9 100644 (file)
--- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
+++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
index 5c10b90146518e262a41d35e5e192496b8790407..1b66e50a35646cbc16c83299cf2f54934b17cbec 100644 (file)
--- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
+++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
index a6b5b61ab7fad6a8d7c2073592c8722366fa1dcb..d2a387f36f2fde5e22648834953163525153b28a 100644 (file)
--- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
+++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
index 89e907c140a17e8c47dc1a05663d5e56fa21b38d..9a9ca711c632c1ab0e09c4b5605bde8f63acfb1a 100644 (file)
--- a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
+++ b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
index 97b63822b636330934314c7801b0189bd075a011..ed1b4951e41688f41eeb66f4677bf231072cab6d 100644 (file)
--- a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
+++ b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
index 8f6ab004ebdafc452993246d854363d896a2b1d4..e088be7cc4d0baae3ac683114a66bec9fec09b1c 100644 (file)
--- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
+++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   LibMath\r
   EfiSocketLib\r
   LibC\r
   LibMath\r

diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
index f069494b30c0950bdad843134763eba06f3e25b3..79513c2215668793801b959a2cd584bf2964ef2a 100644 (file)
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
@@ -52,7 +52,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   EfiSocketLib\r
   LibC\r
   ShellLib\r
   EfiSocketLib\r
   LibC\r
   ShellLib\r

diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.inf b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
index 3650aef96e4e4e92eefb12f5f22a2952f24b3082..27faefba2c8120b6385a286aecae17afa906fa8a 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.inf
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
@@ -75,7 +75,7 @@
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r
   BaseMemoryLib\r
   BsdSocketLib\r
   DebugLib\r

-  DevShell\r
+  DevMedia\r

   DxeServicesTableLib\r
   EfiSocketLib\r
   LibC\r
   DxeServicesTableLib\r
   EfiSocketLib\r
   LibC\r

diff --git a/StdLib/LibC/Uefi/Devices/daShell.inf b/StdLib/LibC/Uefi/Devices/daShell.inf
index 56710259b6b11d40980b24291cefc17c6fa17d63..7c456cb6529123e66175245ea8f7851072893e9c 100644 (file)
--- a/StdLib/LibC/Uefi/Devices/daShell.inf
+++ b/StdLib/LibC/Uefi/Devices/daShell.inf
@@ -23,6 +23,7 @@
   MODULE_TYPE                   = UEFI_APPLICATION\r
   VERSION_STRING                = 1.0\r
   LIBRARY_CLASS                 = DevShell\r
   MODULE_TYPE                   = UEFI_APPLICATION\r
   VERSION_STRING                = 1.0\r
   LIBRARY_CLASS                 = DevShell\r

+  LIBRARY_CLASS                 = DevMedia\r

   CONSTRUCTOR                   = __ctor_DevShell\r
   DESTRUCTOR                    = __dtor_DevShell\r
 \r
   CONSTRUCTOR                   = __ctor_DevShell\r
   DESTRUCTOR                    = __dtor_DevShell\r
 \r

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 60f4cc4d1c68c69b261cfa85e715755717c4bef5..cb54be1548c8a958ff45c05594e427047d0599b0 100644 (file)
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -65,7 +65,8 @@
 # Applications should not directly access any functions defined in these libraries.\r
   LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf\r
   DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf\r
 # Applications should not directly access any functions defined in these libraries.\r
   LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf\r
   DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf\r

-  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf\r
+  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf       # DEPRECATED!  Please use DevMedia for new code.\r
+  DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf\r

   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf\r
 \r
 [LibraryClasses.ARM]\r
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf\r
 \r
 [LibraryClasses.ARM]\r