2nd wave of r11105 checkin.2nd wave of r11105 checkin.

[mirror_edk2.git] / UnixPkg / UnixSerialIoDxe / UnixSerialIo.h

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
index bcd8018e4c0df87bb2ec2dc2d95c27806fd42d4c..484a07c482c9f59414182b6236111b72d9caaf6e 100644 (file)
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
@@ -1,8 +1,8 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
-Portions copyright (c) 2008-2009 Apple Inc.\r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -21,20 +21,10 @@ Abstract:
 \r
 #ifndef _UNIXPKG_SERIAL_IO_\r
 #define _UNIXPKG_SERIAL_IO_\r
-#include <sys/types.h>\r
-#include <sys/stat.h>\r
-#include <stdio.h>\r
-\r
-#ifdef __APPLE__\r
-#else\r
-#include <stdlib.h>\r
-#include <termio.h>\r
-#endif\r
 \r
-#include <fcntl.h>\r
-#include <errno.h>\r
+#include <Common/UnixInclude.h>\r
 \r
-#include "Uefi.h"\r
+#include <Uefi.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Protocol/DevicePath.h>\r
 \r
@@ -120,12 +110,15 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gUnixSerialIoComponentName;
 #define SERIAL_PARITY_DEFAULT   DefaultParity\r
 #define SERIAL_STOPBITS_DEFAULT DefaultStopBits\r
 \r
-#define SERIAL_CONTROL_MASK     (EFI_SERIAL_CLEAR_TO_SEND       | \\r
-                                 EFI_SERIAL_DATA_SET_READY      | \\r
-                                 EFI_SERIAL_RING_INDICATE       | \\r
-                                 EFI_SERIAL_CARRIER_DETECT      | \\r
-                                 EFI_SERIAL_REQUEST_TO_SEND     | \\r
-                                 EFI_SERIAL_DATA_TERMINAL_READY | \\r
+#define SERIAL_CONTROL_MASK     (EFI_SERIAL_CLEAR_TO_SEND                | \\r
+                                 EFI_SERIAL_DATA_SET_READY               | \\r
+                                 EFI_SERIAL_RING_INDICATE                | \\r
+                                 EFI_SERIAL_CARRIER_DETECT               | \\r
+                                 EFI_SERIAL_REQUEST_TO_SEND              | \\r
+                                 EFI_SERIAL_DATA_TERMINAL_READY          | \\r
+                                 EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE     | \\r
+                                 EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE     | \\r
+                                 EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE | \\r
                                  EFI_SERIAL_INPUT_BUFFER_EMPTY)\r
 \r
 #define ConvertBaud2Nt(x)       (DWORD) x\r