Merge of lint branches.

diff --git a/memory/Fee/Fee.c b/memory/Fee/Fee.c
index dbfd4069f32d57da75688a449af778f241af3ead..1d1c91b2f1db43af2d8ee2115b215dd2ef3c7f54 100644 (file)
--- a/memory/Fee/Fee.c
+++ b/memory/Fee/Fee.c
@@ -22,6 +22,14 @@
 \r
 //lint -emacro(904,VALIDATE_RV,VALIDATE_NO_RV) //904 PC-Lint exception to MISRA 14.7 (validate macros).\r
 \r
+// Exception made as a result of that NVM_DATASET_SELECTION_BITS can be zero\r
+//lint -emacro(835, MIN_BLOCKNR) // 835 PC-lint: A zero has been given as right argument to operator '<<' or '>>'\r
+//lint -emacro(835, GET_BLOCK_INDEX_FROM_BLOCK_NUMBER) // 835 PC-lint: A zero has been given as right argument to operator '<<' or '>>'\r
+//lint -emacro(835, GET_DATASET_FROM_BLOCK_NUMBER) // 835 PC-lint: A zero has been given as right argument to operator '<<' or '>>'\r
+//lint -emacro(778, GET_DATASET_FROM_BLOCK_NUMBER) // 778 PC-lint: Constant expression evaluates to 0 in operation '-'\r
+//lint -emacro(845, GET_DATASET_FROM_BLOCK_NUMBER) // 845 PC-lint: The right argument to operator '&' is certain to be 0\r
+//lint -emacro(835, BLOCK_INDEX_AND_SET_TO_BLOCKNR) // 835 PC-lint: A zero has been given as right argument to operator '<<' or '>>'\r
+\r
 #include <string.h>\r
 #include "Fee.h"\r
 #include "Fee_Cbk.h"\r

diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c
index 60cff01c210345127d7b362dc6135a5072fb670b..6f18b99a9936b5341d296b63da111b57bb53c764 100644 (file)
--- a/memory/NvM/NvM.c
+++ b/memory/NvM/NvM.c
@@ -28,10 +28,14 @@
  * NB! Even though some code exist for handling crc, the functionality is not complete\r
  * and shall not be used.
  */\r
-// 522 PC-Lint exception for empty functions\r
-//lint -esym(522,CalcCrc)\r
+\r
+//lint -esym(522,CalcCrc) // 522 PC-Lint exception for empty functions\r
 //lint -emacro(904,VALIDATE_RV,VALIDATE_NO_RV) //904 PC-Lint exception to MISRA 14.7 (validate macros).\r
 \r
+// Exception made as a result of that NVM_DATASET_SELECTION_BITS can be zero\r
+//lint -emacro(835, BLOCK_BASE_AND_SET_TO_BLOCKNR) // 835 PC-lint: A zero has been given as right argument to operator '<<' or '>>'\r
+\r
+\r
 \r
 #include "NvM.h"\r
 #include "NvM_Cbk.h"\r