ocf: update to version 20120127

[15.05/openwrt.git] / target / linux / generic / files / crypto / ocf / kirkwood / mvHal / kw_family / ctrlEnv / mvCtrlEnvAddrDec.c

diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c b/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
index 2d148e0..fbe7c56 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
+++ b/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
@@ -236,61 +236,61 @@ MV_TARGET mvCtrlTargetGet(MV_TARGET_ATTRIB *targetAttrib)
 
        return target;
 }
-
-MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, 
-                                MV_DEC_WIN_PARAMS *pWinParam)
-{
-       MV_U32 baseToReg=0, sizeToReg=0;
-    
-       /* BaseLow[31:16] => base register [31:16]              */
-       baseToReg = pAddrDecWin->addrWin.baseLow & CTRL_DEC_BASE_MASK;
-
-       /* Write to address decode Base Address Register                  */
-       pWinParam->baseAddr &= ~CTRL_DEC_BASE_MASK;
-       pWinParam->baseAddr |= baseToReg;
-
-       /* Get size register value according to window size                                             */
-       sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, CTRL_DEC_SIZE_ALIGNMENT);
-       
-       /* Size parameter validity check.                                   */
-       if (-1 == sizeToReg)
-       {
-        mvOsPrintf("mvCtrlAddrDecToParams: ERR. ctrlSizeToReg failed.\n");
-               return MV_BAD_PARAM;
-       }
-    pWinParam->size = sizeToReg;
-
-    pWinParam->attrib   = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].attrib;
-    pWinParam->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].targetId;
-
-    return MV_OK;
-}
-
-MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, 
-                                MV_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttrib;
-
-    pAddrDecWin->addrWin.baseLow = pWinParam->baseAddr;
-       
-       /* Upper 32bit address base is supported under PCI High Address remap */
-       pAddrDecWin->addrWin.baseHigh = 0;      
-
-       /* Prepare sizeReg to ctrlRegToSize function */
-    pAddrDecWin->addrWin.size = ctrlRegToSize(pWinParam->size, CTRL_DEC_SIZE_ALIGNMENT);
-
-       if (-1 == pAddrDecWin->addrWin.size)
-       {
-               DB(mvOsPrintf("mvCtrlParamsToAddrDec: ERR. ctrlRegToSize failed.\n"));
-               return MV_BAD_PARAM;
-       }
-    targetAttrib.targetId = pWinParam->targetId;
-    targetAttrib.attrib = pWinParam->attrib;
-
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-    return MV_OK;
-}
-
-
-
+\r
+MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, \r
+                                MV_DEC_WIN_PARAMS *pWinParam)\r
+{\r
+       MV_U32 baseToReg=0, sizeToReg=0;\r
+    \r
+       /* BaseLow[31:16] => base register [31:16]              */\r
+       baseToReg = pAddrDecWin->addrWin.baseLow & CTRL_DEC_BASE_MASK;\r
+\r
+       /* Write to address decode Base Address Register                  */\r
+       pWinParam->baseAddr &= ~CTRL_DEC_BASE_MASK;\r
+       pWinParam->baseAddr |= baseToReg;\r
+\r
+       /* Get size register value according to window size                                             */\r
+       sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, CTRL_DEC_SIZE_ALIGNMENT);\r
+       \r
+       /* Size parameter validity check.                                   */\r
+       if (-1 == sizeToReg)\r
+       {\r
+        mvOsPrintf("mvCtrlAddrDecToParams: ERR. ctrlSizeToReg failed.\n");\r
+               return MV_BAD_PARAM;\r
+       }\r
+    pWinParam->size = sizeToReg;\r
+\r
+    pWinParam->attrib   = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].attrib;\r
+    pWinParam->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].targetId;\r
+\r
+    return MV_OK;\r
+}\r
+\r
+MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, \r
+                                MV_DEC_WIN *pAddrDecWin)\r
+{\r
+    MV_TARGET_ATTRIB    targetAttrib;\r
+\r
+    pAddrDecWin->addrWin.baseLow = pWinParam->baseAddr;\r
+       \r
+       /* Upper 32bit address base is supported under PCI High Address remap */\r
+       pAddrDecWin->addrWin.baseHigh = 0;      \r
+\r
+       /* Prepare sizeReg to ctrlRegToSize function */\r
+    pAddrDecWin->addrWin.size = ctrlRegToSize(pWinParam->size, CTRL_DEC_SIZE_ALIGNMENT);\r
+\r
+       if (-1 == pAddrDecWin->addrWin.size)\r
+       {\r
+               DB(mvOsPrintf("mvCtrlParamsToAddrDec: ERR. ctrlRegToSize failed.\n"));\r
+               return MV_BAD_PARAM;\r
+       }\r
+    targetAttrib.targetId = pWinParam->targetId;\r
+    targetAttrib.attrib = pWinParam->attrib;\r
+\r
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);\r
+\r
+    return MV_OK;\r
+}\r
+\r
+
+\r