EmbeddedPkg/MmcDxe: Add 'This' pointer attribute to protocol function

[mirror_edk2.git] / ArmPlatformPkg / Drivers / PL180MciDxe / PL180Mci.c

diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
index 03500af88c606a9422ca8152481c196af2e12315..b79845dccb713bfcd480d96b41d867e32188891f 100644 (file)
--- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
+++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
@@ -46,7 +46,7 @@ MciInitialize (
 \r
 BOOLEAN\r
 MciIsCardPresent (\r
-  VOID\r
+  IN EFI_MMC_HOST_PROTOCOL     *This\r
   )\r
 {\r
   return (MmioRead32(FixedPcdGet32(PcdPL180SysMciRegAddress)) & 1);\r
@@ -54,7 +54,7 @@ MciIsCardPresent (
 \r
 BOOLEAN\r
 MciIsReadOnly (\r
-  VOID\r
+  IN EFI_MMC_HOST_PROTOCOL     *This\r
   )\r
 {\r
   return (MmioRead32(FixedPcdGet32(PcdPL180SysMciRegAddress)) & 2);\r
@@ -92,22 +92,23 @@ MciPrepareDataPath (
   )\r
 {\r
   // Set Data Length & Data Timer\r
-  MmioWrite32(MCI_DATA_TIMER_REG,0xFFFFFFF);\r
-  MmioWrite32(MCI_DATA_LENGTH_REG,MMCI0_BLOCKLEN);\r
+  MmioWrite32 (MCI_DATA_TIMER_REG,0xFFFFFFF);\r
+  MmioWrite32 (MCI_DATA_LENGTH_REG,MMCI0_BLOCKLEN);\r
 \r
 #ifndef USE_STREAM\r
   //Note: we are using a hardcoded BlockLen (=512). If we decide to use a variable size, we could\r
   // compute the pow2 of BlockLen with the above function GetPow2BlockLen()\r
-  MmioWrite32(MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE |  MCI_DATACTL_DMA_ENABLE | TransferDirection | (MMCI0_POW2_BLOCKLEN << 4));\r
+  MmioWrite32 (MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE |  MCI_DATACTL_DMA_ENABLE | TransferDirection | (MMCI0_POW2_BLOCKLEN << 4));\r
 #else\r
-  MmioWrite32(MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE | MCI_DATACTL_DMA_ENABLE | TransferDirection | MCI_DATACTL_STREAM_TRANS);\r
+  MmioWrite32 (MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE | MCI_DATACTL_DMA_ENABLE | TransferDirection | MCI_DATACTL_STREAM_TRANS);\r
 #endif\r
 }\r
 \r
 EFI_STATUS\r
 MciSendCommand (\r
-  IN MMC_CMD MmcCmd,\r
-  IN UINT32 Argument\r
+  IN EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN MMC_CMD                    MmcCmd,\r
+  IN UINT32                     Argument\r
   )\r
 {\r
   UINT32 Status;\r
@@ -190,7 +191,7 @@ MciSendCommand (
   }\r
 \r
 Exit:\r
-       //Disable Command Path\r
+       // Disable Command Path\r
        CmdCtrlReg = MmioRead32(MCI_COMMAND_REG);\r
        MmioWrite32(MCI_COMMAND_REG, (CmdCtrlReg & ~MCI_CPSM_ENABLED));\r
        return RetVal;\r
@@ -198,8 +199,9 @@ Exit:
 \r
 EFI_STATUS\r
 MciReceiveResponse (\r
-  IN MMC_RESPONSE_TYPE Type,\r
-  IN UINT32* Buffer\r
+  IN EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN MMC_RESPONSE_TYPE          Type,\r
+  IN UINT32*                    Buffer\r
   )\r
 {\r
   if (Buffer == NULL) {\r
@@ -223,9 +225,10 @@ MciReceiveResponse (
 \r
 EFI_STATUS\r
 MciReadBlockData (\r
-  IN EFI_LBA Lba,\r
-  IN UINTN Length,\r
-  IN UINT32* Buffer\r
+  IN EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN EFI_LBA                    Lba,\r
+  IN UINTN                      Length,\r
+  IN UINT32*                    Buffer\r
   )\r
 {\r
   UINTN Loop;\r
@@ -298,9 +301,10 @@ MciReadBlockData (
 \r
 EFI_STATUS\r
 MciWriteBlockData (\r
-  IN EFI_LBA Lba,\r
-  IN UINTN Length,\r
-  IN UINT32* Buffer\r
+  IN EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN EFI_LBA                   Lba,\r
+  IN UINTN                     Length,\r
+  IN UINT32*                   Buffer\r
   )\r
 {\r
   UINTN Loop;\r
@@ -396,7 +400,8 @@ Exit:
 \r
 EFI_STATUS\r
 MciNotifyState (\r
-  IN MMC_STATE State\r
+  IN  EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN MMC_STATE                  State\r
   )\r
 {\r
   UINT32      Data32;\r
@@ -490,7 +495,8 @@ EFI_GUID mPL180MciDevicePathGuid = EFI_CALLER_ID_GUID;
 \r
 EFI_STATUS\r
 MciBuildDevicePath (\r
-  IN EFI_DEVICE_PATH_PROTOCOL **DevicePath\r
+  IN EFI_MMC_HOST_PROTOCOL      *This,\r
+  IN EFI_DEVICE_PATH_PROTOCOL   **DevicePath\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL    *NewDevicePathNode;\r
@@ -503,6 +509,7 @@ MciBuildDevicePath (
 }\r
 \r
 EFI_MMC_HOST_PROTOCOL gMciHost = {\r
+  MMC_HOST_PROTOCOL_REVISION,\r
   MciIsCardPresent,\r
   MciIsReadOnly,\r
   MciBuildDevicePath,\r