ArmPlatformPkg/PL011SerialPortLib: use untyped PCD for register base

[mirror_edk2.git] / ArmPlatformPkg / Library / PL011SerialPortLib / PL011SerialPortLib.c

diff --git a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
index 015f6fbb712c4ca6fbf20448d795dda41ad24e9c..d576f79c3e6e045ef2f59ea3a827ebe7d1063bd7 100644 (file)
--- a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
+++ b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
@@ -19,18 +19,16 @@
 \r
 #include <Library/IoLib.h>\r
 #include <Library/PcdLib.h>\r
+#include <Library/PL011UartClockLib.h>\r
+#include <Library/PL011UartLib.h>\r
 #include <Library/SerialPortLib.h>\r
 \r
-#include <Drivers/PL011Uart.h>\r
+/** Initialise the serial device hardware with default settings.\r
 \r
-\r
-/**\r
-\r
-  Programmed hardware of Serial port.\r
-\r
-  @return    Always return RETURN_UNSUPPORTED.\r
-\r
-**/\r
+  @retval RETURN_SUCCESS            The serial device was initialised.\r
+  @retval RETURN_INVALID_PARAMETER  One or more of the default settings\r
+                                    has an unsupported value.\r
+ **/\r
 RETURN_STATUS\r
 EFIAPI\r
 SerialPortInitialize (\r
@@ -43,20 +41,21 @@ SerialPortInitialize (
   UINT8               DataBits;\r
   EFI_STOP_BITS_TYPE  StopBits;\r
 \r
-  BaudRate = (UINTN)FixedPcdGet64 (PcdUartDefaultBaudRate);\r
+  BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);\r
   ReceiveFifoDepth = 0;         // Use default FIFO depth\r
   Parity = (EFI_PARITY_TYPE)FixedPcdGet8 (PcdUartDefaultParity);\r
   DataBits = FixedPcdGet8 (PcdUartDefaultDataBits);\r
   StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits);\r
 \r
   return PL011UartInitializePort (\r
-      (UINTN)FixedPcdGet64 (PcdSerialRegisterBase),\r
-      &BaudRate,\r
-      &ReceiveFifoDepth,\r
-      &Parity,\r
-      &DataBits,\r
-      &StopBits\r
-      );\r
+           (UINTN)PcdGet64 (PcdSerialRegisterBase),\r
+           PL011UartClockGetFreq(),\r
+           &BaudRate,\r
+           &ReceiveFifoDepth,\r
+           &Parity,\r
+           &DataBits,\r
+           &StopBits\r
+           );\r
 }\r
 \r
 /**\r
@@ -76,7 +75,7 @@ SerialPortWrite (
   IN UINTN     NumberOfBytes\r
   )\r
 {\r
-  return PL011UartWrite ((UINTN)FixedPcdGet64 (PcdSerialRegisterBase), Buffer, NumberOfBytes);\r
+  return PL011UartWrite ((UINTN)PcdGet64 (PcdSerialRegisterBase), Buffer, NumberOfBytes);\r
 }\r
 \r
 /**\r
@@ -96,15 +95,14 @@ SerialPortRead (
   IN  UINTN     NumberOfBytes\r
 )\r
 {\r
-  return PL011UartRead ((UINTN)FixedPcdGet64 (PcdSerialRegisterBase), Buffer, NumberOfBytes);\r
+  return PL011UartRead ((UINTN)PcdGet64 (PcdSerialRegisterBase), Buffer, NumberOfBytes);\r
 }\r
 \r
 /**\r
   Check to see if any data is available to be read from the debug device.\r
 \r
-  @retval EFI_SUCCESS       At least one byte of data is available to be read\r
-  @retval EFI_NOT_READY     No data is available to be read\r
-  @retval EFI_DEVICE_ERROR  The serial device is not functioning properly\r
+  @retval TRUE       At least one byte of data is available to be read\r
+  @retval FALSE      No data is available to be read\r
 \r
 **/\r
 BOOLEAN\r
@@ -113,7 +111,7 @@ SerialPortPoll (
   VOID\r
   )\r
 {\r
-  return PL011UartPoll ((UINTN)FixedPcdGet64 (PcdSerialRegisterBase));\r
+  return PL011UartPoll ((UINTN)PcdGet64 (PcdSerialRegisterBase));\r
 }\r
 /**\r
   Set new attributes to PL011.\r
@@ -158,13 +156,14 @@ SerialPortSetAttributes (
   )\r
 {\r
   return PL011UartInitializePort (\r
-    (UINTN)FixedPcdGet64 (PcdSerialRegisterBase),\r
-    BaudRate,\r
-    ReceiveFifoDepth,\r
-    Parity,\r
-    DataBits,\r
-    StopBits\r
-    );\r
+           (UINTN)PcdGet64 (PcdSerialRegisterBase),\r
+           PL011UartClockGetFreq(),\r
+           BaudRate,\r
+           ReceiveFifoDepth,\r
+           Parity,\r
+           DataBits,\r
+           StopBits\r
+           );\r
 }\r
 \r
 /**\r
@@ -199,7 +198,7 @@ SerialPortSetControl (
   IN UINT32  Control\r
   )\r
 {\r
-  return PL011UartSetControl ((UINTN)FixedPcdGet64 (PcdSerialRegisterBase), Control);\r
+  return PL011UartSetControl ((UINTN)PcdGet64 (PcdSerialRegisterBase), Control);\r
 }\r
 \r
 /**\r
@@ -240,5 +239,5 @@ SerialPortGetControl (
   OUT UINT32  *Control\r
   )\r
 {\r
-  return PL011UartGetControl ((UINTN)FixedPcdGet64 (PcdSerialRegisterBase), Control);\r
+  return PL011UartGetControl ((UINTN)PcdGet64 (PcdSerialRegisterBase), Control);\r
 }\r