Fix ICC build issues

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

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index dfccbc384753e472cb74070198f6acec98358576..82dc7bb0780ebe105dac824423e4f2e51b03f618 100644 (file)
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
@@ -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
@@ -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