ddr3libv2: Fixed CPSS compilation errors and warnings due new Sweep test functionality
Change-Id: I700bb044cd6e95864faae9194e5fc47c804bcd85
Signed-off-by: Igor Patrik <igorp@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/20292
Tested-by: Star_Automation <star@marvell.com>
Tested-by: Star_New_DDR <star-new-ddr@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/24132
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 2df6c86..b640b25 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
@@ -447,11 +447,12 @@
ddr3TipRunSweepTest(devNum, sweepCnt, 1 , isPupLog);
ddr3TipRunSweepTest(devNum, sweepCnt, 0 , isPupLog);
+#if defined(EXCLUDE_SWITCH_DEBUG)
if( isRunLevelingSweepTests == 1 ){
ddr3TipRunLevelingSweepTest(devNum, sweepCnt, 0 , isPupLog);
ddr3TipRunLevelingSweepTest(devNum, sweepCnt, 1 , isPupLog);
}
-
+#endif
ddr3TipPrintAllPbsResult(devNum);
ddr3TipPrintWLSuppResult(devNum);
mvPrintf("===VALIDATE WINDOW LOG END ===\n");
@@ -1538,7 +1539,7 @@
return 0;
}
-
+#if defined(EXCLUDE_SWITCH_DEBUG)
GT_BOOL ddr3TipRunLevelingSweepTest(GT_32 devNum, GT_U32 RepeatNum, GT_U32 direction, GT_U32 mode)
{
GT_U32 pup = 0, startPup = 0, endPup = 0, startAdll = 0;
@@ -1708,7 +1709,7 @@
ddr3TipResetFifoPtr(devNum);
return 0;
}
-
+#endif
void printTopology(MV_HWS_TOPOLOGY_MAP *pTopologyDB)
diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingDb.c b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingDb.c
index ad9507d..1498408 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingDb.c
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingDb.c
@@ -442,7 +442,7 @@
}
}
-inline static GT_U32 patternTableGetSsoFullXtalkWord( GT_U8 bit, GT_U8 index)
+INLINE static GT_U32 patternTableGetSsoFullXtalkWord( GT_U8 bit, GT_U8 index)
{
GT_U8 byte = (1 << bit);
@@ -453,7 +453,7 @@
return (byte || (byte<<8) || (byte<<16) || (byte<<24));
}
-inline static GT_U32 patternTableGetSsoXtalkFreeWord( GT_U8 bit, GT_U8 index)
+INLINE static GT_U32 patternTableGetSsoXtalkFreeWord( GT_U8 bit, GT_U8 index)
{
GT_U8 byte = (1 << bit);
@@ -464,7 +464,7 @@
return (byte || (byte<<8) || (byte<<16) || (byte<<24));
}
-inline static GT_U32 patternTableGetISIWord( GT_U8 index)
+INLINE static GT_U32 patternTableGetISIWord( GT_U8 index)
{
GT_U8 I0 = index%32;
GT_U8 I1 = index%8;
@@ -481,7 +481,7 @@
return Word;
}
-inline static GT_U32 patternTableGetSsoFullXtalkWord_16( GT_U8 bit, GT_U8 index)
+INLINE static GT_U32 patternTableGetSsoFullXtalkWord_16( GT_U8 bit, GT_U8 index)
{
GT_U8 byte = (1 << bit);
@@ -492,7 +492,7 @@
return (byte || (byte<<8) || ((~byte)<<16) || ((~byte)<<24));
}
-inline static GT_U32 patternTableGetSsoXtalkFreeWord_16( GT_U8 bit, GT_U8 index)
+INLINE static GT_U32 patternTableGetSsoXtalkFreeWord_16( GT_U8 bit, GT_U8 index)
{
GT_U8 byte = (1 << bit);
@@ -504,7 +504,7 @@
}
}
-inline static GT_U32 patternTableGetISIWord_16( GT_U8 index)
+INLINE static GT_U32 patternTableGetISIWord_16( GT_U8 index)
{
GT_U8 I0 = index%16;
GT_U8 I1 = index%4;
diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingLeveling.c b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingLeveling.c
index 0bc14f3..0f144d5 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingLeveling.c
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/src/Driver/ddr3/mvHwsDdr3TrainingLeveling.c
@@ -1157,7 +1157,7 @@
for(wordInPattern = startXsbOffset; wordInPattern < (TEST_PATTERN_LENGTH*2) ; wordInPattern++)
{
wordOffset = wordInPattern + edgeOffset;
- if ((wordOffset > (TEST_PATTERN_LENGTH*2 - 1))||(wordOffset < 0))
+ if ( wordOffset > (TEST_PATTERN_LENGTH*2 - 1) )
continue;
if ((readPattern[wordInPattern] & pupMaskTable[busId]) == (patternTestPatternTable[wordOffset] & pupMaskTable[busId]))
{
