Fix ICC 9.1 build break

[mirror_edk2.git] / Nt32Pkg / WinNtSerialIoDxe / WinNtSerialIo.h

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
index affc392b511dbf1bf09c49fecf4aca92bdf2ed1e..f96984eaa0710c3f5743e11e0d7d121c84f447db 100644 (file)
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
@@ -1,7 +1,7 @@
-/*++\r
+/**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006, Intel Corporation. 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
@@ -16,7 +16,7 @@ Module Name:
 Abstract:\r
 \r
 \r
---*/\r
+**/\r
 \r
 #ifndef _WIN_NT_SERIAL_IO_\r
 #define _WIN_NT_SERIAL_IO_\r
@@ -58,7 +58,7 @@ typedef struct {
   UINT8   Data[SERIAL_MAX_BUFFER_SIZE];\r
 } SERIAL_DEV_FIFO;\r
 \r
-#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 's', 'i')\r
+#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('N', 'T', 's', 'i')\r
 typedef struct {\r
   UINT64                    Signature;\r
 \r
@@ -102,8 +102,9 @@ typedef struct {
 //\r
 // Global Protocol Variables\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gWinNtSerialIoDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gWinNtSerialIoComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gWinNtSerialIoDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gWinNtSerialIoComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gWinNtSerialIoComponentName2;\r
 \r
 //\r
 // Macros to convert EFI serial types to NT serial types.\r
@@ -119,12 +120,15 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gWinNtSerialIoComponentName;
 #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
@@ -154,6 +158,12 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gWinNtSerialIoComponentName;
 //\r
 #define SERIAL_PORT_MAX_BAUD_RATE 115400  \r
 \r
+#define SERIAL_PORT_MIN_BAUD_RATE           50\r
+#define SERIAL_PORT_MAX_RECEIVE_FIFO_DEPTH  16\r
+\r
+#define SERIAL_PORT_MIN_TIMEOUT             1         // 1 uS\r
+#define SERIAL_PORT_MAX_TIMEOUT             100000000 // 100 seconds\r
+\r
 //\r
 // Function Prototypes\r
 //\r
@@ -181,7 +191,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoDriverBindingSupported (\r
@@ -208,7 +217,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoDriverBindingStart (\r
@@ -235,7 +243,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoDriverBindingStop (\r
@@ -264,7 +271,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoReset (\r
@@ -287,7 +293,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoSetAttributes (\r
@@ -322,7 +327,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoSetControl (\r
@@ -347,7 +351,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoGetControl (\r
@@ -372,7 +375,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoWrite (\r
@@ -399,7 +401,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtSerialIoRead (\r