ddrlibv2: Fix error and warnings compilation in CPSS WM
Modify the ddr3TipPbs, printAdll and ddr3TipRunSweepTest functions
to fix error and warnings compilation in CPSS WM
Change-Id: Ic2594f9cac568ba9c2d43e523dfc972415021ec6
Signed-off-by: Yaron David <yarond@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/19229
Reviewed-by: Igor Patrik <igorp@marvell.com>
Tested-by: Igor Patrik <igorp@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/24121
Reviewed-by: Omri Itach <omrii@marvell.com>
Tested-by: Omri Itach <omrii@marvell.com>
diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3Debug.c b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3Debug.c
index 4f28b3c..96017b1 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3Debug.c
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3Debug.c
@@ -1284,13 +1284,14 @@
GT_STATUS printAdll(GT_U32 devNum, GT_U32 adll[MAX_INTERFACE_NUM*MAX_BUS_NUM])
{
GT_U32 i,j;
+ GT_U32 octetsPerInterfaceNum;
- devNum = devNum;
- GT_U8 octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
+ devNum = devNum;
+ octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
for(j=0; j< octetsPerInterfaceNum; j++)
{
- VALIDATE_BUS_ACTIVE(topologyMap->activeBusMask, j)
+ VALIDATE_BUS_ACTIVE(topologyMap->activeBusMask, j)
for(i=0;i<MAX_INTERFACE_NUM; i++)
{
mvPrintf("%d ,",adll[i*octetsPerInterfaceNum+j]);
@@ -1410,7 +1411,7 @@
MV_HWS_ACCESS_TYPE pupAccess;
GT_U32 uiCs;
GT_U32 maxCs = mvHwsDdr3TipMaxCSGet();
- GT_U8 octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
+ GT_U32 octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
RepeatNum = RepeatNum;
diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingPbs.c b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingPbs.c
index 02602b5..864dccb 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingPbs.c
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingPbs.c
@@ -524,7 +524,7 @@
temp = (MaxPBSPerPup[interfaceId][pup] == MinPBSPerPup[interfaceId][pup])?\
TYPICAL_PBS_VALUE :\
- ((MaxADLLPerPup[interfaceId][pup] - MinADLLPerPup[interfaceId][pup])*ADLLTap/(MaxPBSPerPup[interfaceId][pup] - MinPBSPerPup[interfaceId][pup]));
+ ((MaxADLLPerPup[interfaceId][pup] - MinADLLPerPup[interfaceId][pup]*(GT_U8)ADLLTap/(MaxPBSPerPup[interfaceId][pup]) - MinPBSPerPup[interfaceId][pup]));
pbsDelayPerPup[pbsMode][interfaceId][pup][effective_cs] = temp;
@@ -638,7 +638,7 @@
{
GT_U32 dataValue = 0, bit = 0, interfaceId = 0, pup = 0;
GT_U32 regAddr = (pbsMode == PBS_RX_MODE) ? (PBS_RX_PHY_REG + csNum * 0x10) : (PBS_TX_PHY_REG + csNum * 0x10);
- GT_U8 octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
+ GT_U32 octetsPerInterfaceNum = ddr3TipDevAttrGet(devNum, MV_ATTR_OCTET_PER_INTERFACE);
mvPrintf("%s,CS%d,PBS,ADLLRATIO,,,", (pbsMode == PBS_RX_MODE)?"Rx":"Tx", csNum);
for(interfaceId = 0; interfaceId <= MAX_INTERFACE_NUM-1; interfaceId++)
