Sync with EmulatorPkg changes.

signed-off-by:afish@apple.com

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14015 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
index 3d9e85bb3654e721ccc22b7a77832dd6713709a2..2efb8400faba7006c709cc58a8403ba3b9bd7130 100644 (file)
--- a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
+++ b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.c
@@ -17,6 +17,7 @@
 \r
 #include <PiDxe.h>\r
 #include <Library/SerialPortLib.h>\r
+#include <Library/SerialPortExtLib.h>\r
 #include <Library/EmuThunkLib.h>\r
 \r
 \r
@@ -116,4 +117,57 @@ SerialPortPoll (
   return gEmuThunk->PollStdIn ();\r
 }\r
 \r
+/**\r
+  Set the serial device control bits.\r
+\r
+  @return    Always return EFI_UNSUPPORTED.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortSetControl (\r
+  IN UINT32                   Control\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+/**\r
+  Get the serial device control bits.\r
+\r
+  @param  Control                 Control signals read from the serial device.\r
+\r
+  @retval EFI_SUCCESS             The control bits were read from the serial device.\r
+  @retval EFI_DEVICE_ERROR        The serial device is not functioning correctly.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortGetControl (\r
+  OUT UINT32                  *Control\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+\r
+/**\r
+  Set the serial device attributes.\r
+\r
+  @return    Always return EFI_UNSUPPORTED.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortSetAttributes (\r
+  IN UINT64              BaudRate,\r
+  IN UINT32              ReceiveFifoDepth,\r
+  IN UINT32              Timeout,\r
+  IN EFI_PARITY_TYPE     Parity,\r
+  IN UINT8               DataBits,\r
+  IN EFI_STOP_BITS_TYPE  StopBits\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
 \r

diff --git a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
index 81276e6073776a9a189c125f04855641929c443b..119028d46538063e96651828dbf3ddd4ffc582b7 100644 (file)
--- a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
@@ -30,6 +30,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   EmulatorPkg/EmulatorPkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
 \r
 [LibraryClasses]\r
   EmuThunkLib\r

diff --git a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
index 4ff7144218ea2965fd8f8726a2448f3b92c15f8f..3b74a0c325c6685f130f0a193492b7ba8ec03d25 100644 (file)
--- a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
+++ b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.c
@@ -18,6 +18,7 @@
 \r
 #include <PiPei.h>\r
 #include <Library/SerialPortLib.h>\r
+#include <Library/SerialPortExtLib.h>\r
 #include <Library/PeiServicesLib.h>\r
 \r
 #include <Ppi/EmuThunk.h>\r
@@ -137,4 +138,58 @@ SerialPortPoll (
   return FALSE;\r
 }\r
 \r
+/**\r
+  Set the serial device control bits.\r
+\r
+  @return    Always return EFI_UNSUPPORTED.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortSetControl (\r
+  IN UINT32                   Control\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+/**\r
+  Get the serial device control bits.\r
+\r
+  @param  Control                 Control signals read from the serial device.\r
+\r
+  @retval EFI_SUCCESS             The control bits were read from the serial device.\r
+  @retval EFI_DEVICE_ERROR        The serial device is not functioning correctly.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortGetControl (\r
+  OUT UINT32                  *Control\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+\r
+/**\r
+  Set the serial device attributes.\r
+\r
+  @return    Always return EFI_UNSUPPORTED.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+SerialPortSetAttributes (\r
+  IN UINT64              BaudRate,\r
+  IN UINT32              ReceiveFifoDepth,\r
+  IN UINT32              Timeout,\r
+  IN EFI_PARITY_TYPE     Parity,\r
+  IN UINT8               DataBits,\r
+  IN EFI_STOP_BITS_TYPE  StopBits\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
 \r

diff --git a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
index 16450f6da323b9f56468fb1b2475cc166d5a1308..d431acdb079d126ffe095e52f16d003631bf5d86 100644 (file)
--- a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
@@ -33,6 +33,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   EmulatorPkg/EmulatorPkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
 \r
 [LibraryClasses]\r
   PeiServicesLib\r