Clean up BaseSerialPortLib16550 to remove references and checks for Carrier Detect...

[mirror_edk2.git] / MdeModulePkg / Library / BaseSerialPortLib16550 / BaseSerialPortLib16550.c

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index dfccbc384753e472cb74070198f6acec98358576..04d8ca194934ead73b66e684dd539f97237ab0c9 100644 (file)
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
@@ -1,7 +1,7 @@
 /** @file\r
   16550 UART Serial Port library functions\r
 \r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2011, 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
@@ -38,7 +38,6 @@
 #define   B_UART_LSR_TEMT     BIT6\r
 #define R_UART_MSR            6\r
 #define   B_UART_MSR_CTS      BIT4\r
-#define   B_UART_MSR_DCD      BIT7\r
 \r
 /**\r
   Read an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is read from \r
@@ -69,7 +68,8 @@ SerialPortReadRegister (
   parameter Offset is added to the base address of the 16550 registers that is specified \r
   by PcdSerialRegisterBase. \r
   \r
-  @param  Offset  The offset of the 16550 register to read.\r
+  @param  Offset  The offset of the 16550 register to write.\r
+  @param  Value   The value to write to the 16550 register specified by Offset.\r
 \r
   @return The value written to the 16550 register.\r
 \r
@@ -128,9 +128,10 @@ SerialPortInitialize (
   if ((SerialPortReadRegister (R_UART_LCR) & 0x3F) != (PcdGet8 (PcdSerialLineControl) & 0x3F)) {\r
     Initialized = FALSE;\r
   }\r
-  SerialPortWriteRegister (R_UART_LCR, SerialPortReadRegister (R_UART_LCR) | B_UART_LCR_DLAB);\r
-  Divisor = (SerialPortReadRegister (R_UART_BAUD_HIGH) << 8) | SerialPortReadRegister (R_UART_BAUD_LOW);\r
-  SerialPortWriteRegister (R_UART_LCR, SerialPortReadRegister (R_UART_LCR) & ~B_UART_LCR_DLAB);\r
+  SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) | B_UART_LCR_DLAB));\r
+  Divisor =  SerialPortReadRegister (R_UART_BAUD_HIGH) << 8;\r
+  Divisor |= SerialPortReadRegister (R_UART_BAUD_LOW);\r
+  SerialPortWriteRegister (R_UART_LCR, (UINT8)(SerialPortReadRegister (R_UART_LCR) & ~B_UART_LCR_DLAB));\r
   if (Divisor != 115200 / PcdGet32 (PcdSerialBaudRate)) {\r
     Initialized = FALSE;\r
   }\r
@@ -150,13 +151,13 @@ SerialPortInitialize (
   // Clear DLAB and configure Data Bits, Parity, and Stop Bits.\r
   // Strip reserved bits from PcdSerialLineControl\r
   //\r
-  SerialPortWriteRegister (R_UART_LCR, PcdGet8 (PcdSerialLineControl) & 0x3F);\r
+  SerialPortWriteRegister (R_UART_LCR, (UINT8)(PcdGet8 (PcdSerialLineControl) & 0x3F));\r
 \r
   //\r
   // Enable and reset FIFOs\r
   // Strip reserved bits from PcdSerialFifoControl\r
   //\r
-  SerialPortWriteRegister (R_UART_FCR, PcdGet8 (PcdSerialFifoControl) & 0x17);\r
+  SerialPortWriteRegister (R_UART_FCR, (UINT8)(PcdGet8 (PcdSerialFifoControl) & 0x17));\r
 \r
   //\r
   // Put Modem Control Register(MCR) into its reset state of 0x00.\r
@@ -192,9 +193,9 @@ SerialPortWrite (
   IN UINTN     NumberOfBytes\r
 )\r
 {\r
-  UINTN  Result;\r
-  UINTN  Index;\r
-  UINTN  FifoSize;\r
+  UINTN    Result;\r
+  UINTN    Index;\r
+  UINTN    FifoSize;\r
 \r
   if (Buffer == NULL) {\r
     return 0;\r
@@ -211,7 +212,7 @@ SerialPortWrite (
       FifoSize = 64;\r
     }\r
   }\r
-  \r
+\r
   Result = NumberOfBytes;\r
   while (NumberOfBytes != 0) {\r
     //\r
@@ -228,7 +229,7 @@ SerialPortWrite (
         //\r
         // Wait for notification from peer to send data\r
         //\r
-        while ((SerialPortReadRegister (R_UART_MSR) & (B_UART_MSR_CTS | B_UART_MSR_DCD)) == B_UART_MSR_DCD);\r
+        while ((SerialPortReadRegister (R_UART_MSR) & (B_UART_MSR_CTS)) == 0);\r
       }\r
       \r
       //\r
@@ -265,7 +266,7 @@ SerialPortRead (
     return 0;\r
   }\r
 \r
-  Mcr = SerialPortReadRegister (R_UART_MCR) & ~B_UART_MCR_RTS;\r
+  Mcr = (UINT8)(SerialPortReadRegister (R_UART_MCR) & ~B_UART_MCR_RTS);\r
   \r
   for (Result = 0; NumberOfBytes-- != 0; Result++, Buffer++) {\r
     //\r
@@ -276,7 +277,7 @@ SerialPortRead (
         //\r
         // Set RTS to let the peer send some data\r
         //\r
-        SerialPortWriteRegister (R_UART_MCR, Mcr | B_UART_MCR_RTS);\r
+        SerialPortWriteRegister (R_UART_MCR, (UINT8)(Mcr | B_UART_MCR_RTS));\r
       }\r
     }\r
     if (PcdGetBool (PcdSerialUseHardwareFlowControl)) {\r
@@ -320,7 +321,7 @@ SerialPortPoll (
       //\r
       // Clear RTS to prevent peer from sending data\r
       //\r
-      SerialPortWriteRegister (R_UART_MCR, SerialPortReadRegister (R_UART_MCR) & ~B_UART_MCR_RTS);\r
+      SerialPortWriteRegister (R_UART_MCR, (UINT8)(SerialPortReadRegister (R_UART_MCR) & ~B_UART_MCR_RTS));\r
     }\r
     return TRUE;\r
   }    \r
@@ -329,7 +330,7 @@ SerialPortPoll (
     //\r
     // Set RTS to let the peer send some data\r
     //\r
-    SerialPortWriteRegister (R_UART_MCR, SerialPortReadRegister (R_UART_MCR) | B_UART_MCR_RTS);\r
+    SerialPortWriteRegister (R_UART_MCR, (UINT8)(SerialPortReadRegister (R_UART_MCR) | B_UART_MCR_RTS));\r
   }\r
   \r
   return FALSE;\r