update variable names to match fmlib changes

fmlib changes the variable names in commit: http://sw-stash.freescale.net/projects/DPAAMODULES/repos/fmlib/commits/2a9113a83f6c24997e08227d85d2e76969cdbda1 comittedInfoRate -> committedInfoRate comittedBurstSize -> committedBurstSize peakOrAccessiveInfoRate -> peakOrExcessInfoRate peakOrAccessiveBurstSize -> peakOrExcessBurstSize Signed-off-by: Ting Liu <ting.liu@freescale.com>
nxp-qoriq · Oct 21, 2015 · a079d2c · a079d2c
1 parent 44b1f42
commit a079d2c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/source/FMCCModelOutput.cpp b/source/FMCCModelOutput.cpp
@@ -1767,10 +1767,10 @@ CFMCCModelOutput::output_fmc_policer( const CFMCModel& model, fmc_model_t* cmode
     EMIT4STR( policer[, index, ].algSelection = , plc.algorithm );
     EMIT4STR( policer[, index, ].colorMode = , plc.colorMode );
 
-    EMIT4( policer[, index, ].nonPassthroughAlgParams.comittedInfoRate =, plc.comittedInfoRate );
-    EMIT4( policer[, index, ].nonPassthroughAlgParams.comittedBurstSize =, plc.comittedBurstSize );
-    EMIT4( policer[, index, ].nonPassthroughAlgParams.peakOrAccessiveInfoRate =, plc.peakOrAccessiveInfoRate );
-    EMIT4( policer[, index, ].nonPassthroughAlgParams.peakOrAccessiveBurstSize =, plc.peakOrAccessiveBurstSize );
+    EMIT4( policer[, index, ].nonPassthroughAlgParams.committedInfoRate =, plc.committedInfoRate );
+    EMIT4( policer[, index, ].nonPassthroughAlgParams.committedBurstSize =, plc.committedBurstSize );
+    EMIT4( policer[, index, ].nonPassthroughAlgParams.peakOrExcessInfoRate =, plc.peakOrExcessInfoRate );
+    EMIT4( policer[, index, ].nonPassthroughAlgParams.peakOrExcessBurstSize =, plc.peakOrExcessBurstSize );
     EMIT4STR( policer[, index, ].nonPassthroughAlgParams.rateMode =, plc.rateMode );
     EMIT3( policer[, index, ].nonPassthroughAlgParams.byteModeParams.frameLengthSelection = e_FM_PCD_PLCR_L2_FRM_LEN );
     EMIT3( policer[, index, ].nonPassthroughAlgParams.byteModeParams.rollBackFrameSelection = e_FM_PCD_PLCR_ROLLBACK_FULL_FRM_LEN );

diff --git a/source/FMCPCDModel.cpp b/source/FMCPCDModel.cpp
@@ -2553,10 +2553,10 @@ CFMCModel::createPolicer( const CTaskDef* pTaskDef, Port& port, const CPolicer&
         policer.rateModeStr = "e_FM_PCD_PLCR_BYTE_MODE";
     }
 
-    policer.comittedInfoRate         = xmlPolicer.CIR;
-    policer.peakOrAccessiveInfoRate  = xmlPolicer.EIR;
-    policer.comittedBurstSize        = xmlPolicer.CBS;
-    policer.peakOrAccessiveBurstSize = xmlPolicer.EBS;
+    policer.committedInfoRate         = xmlPolicer.CIR;
+    policer.peakOrExcessInfoRate  = xmlPolicer.EIR;
+    policer.committedBurstSize        = xmlPolicer.CBS;
+    policer.peakOrExcessBurstSize = xmlPolicer.EBS;
 
     policer.dfltColor    = getPlcrColor( xmlPolicer.dfltColor );
     policer.dfltColorStr = getPlcrColorStr( xmlPolicer.dfltColor );

diff --git a/source/FMCPCDModel.h b/source/FMCPCDModel.h
@@ -387,10 +387,10 @@ class Policer : public FMBlock
     e_FmPcdPlcrRateMode rateMode;
     std::string         rateModeStr;
 
-    unsigned int comittedInfoRate;
-    unsigned int comittedBurstSize;
-    unsigned int peakOrAccessiveInfoRate;
-    unsigned int peakOrAccessiveBurstSize;
+    unsigned int committedInfoRate;
+    unsigned int committedBurstSize;
+    unsigned int peakOrExcessInfoRate;
+    unsigned int peakOrExcessBurstSize;
 
     e_FmPcdEngine     nextEngineOnGreen;
     std::string       nextEngineOnGreenStr;