From: mahi <devnull@localhost>
Date: Mon, 20 Aug 2012 18:43:43 +0000 (+0200)
Subject: SchM: Corrections of timer. Need to update all SchM_<mod> files.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/48221f159695f0556812a53c25a1671a41b97332

SchM: Corrections of timer. Need to update all SchM_<mod> files.
---

diff --git a/boards/mpc5516it/examples/mem_nvm_fee/Nvm_App.c b/boards/mpc5516it/examples/mem_nvm_fee/Nvm_App.c
index 7f92dca2..eed56d11 100644
--- a/boards/mpc5516it/examples/mem_nvm_fee/Nvm_App.c
+++ b/boards/mpc5516it/examples/mem_nvm_fee/Nvm_App.c
@@ -48,8 +48,8 @@
 
 #define BUSY_WAIT(_block,_var)	\
 	do { \
-		NvM_GetErrorStatus(_block, &_var); \
-	} while( _var != NVM_REQ_OK );
+		NvM_GetErrorStatus(_block, &(_var)); \
+	} while( (_var) != NVM_REQ_OK );
 
 
 /* ----------------------------[private typedef]-----------------------------*/
@@ -154,11 +154,11 @@ static void nvmApplication(void) {
 	 */
 	PATTERN_FILL(TEST_RamBlock_Dataset_0,0);
 	NvM_WriteBlock(currBlock,TEST_RamBlock_Dataset_0);
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	memset(TEST_RamBlock_Dataset_0,0,sizeof(TEST_RamBlock_Dataset_0));
 	NvM_ReadBlock(currBlock,TEST_RamBlock_Dataset_0);
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	rv = PATTERN_VERIFY(TEST_RamBlock_Dataset_0,0);
 	assert(rv == 0);
@@ -168,15 +168,15 @@ static void nvmApplication(void) {
 	 */
 	rv = NvM_SetDataIndex(currBlock,1);
 	assert( rv == E_OK );
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	PATTERN_FILL(TEST_RamBlock_Dataset_0,5);
 	NvM_WriteBlock(currBlock,TEST_RamBlock_Dataset_0);
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	memset(TEST_RamBlock_Dataset_0,0,sizeof(TEST_RamBlock_Dataset_0));
 	NvM_ReadBlock(currBlock,TEST_RamBlock_Dataset_0);
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	rv = PATTERN_VERIFY(TEST_RamBlock_Dataset_0,5);
 	assert(rv == 0);
@@ -187,10 +187,10 @@ static void nvmApplication(void) {
 	 */
 	NvM_SetDataIndex(currBlock,0);
 	assert( rv == E_OK );
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	NvM_ReadBlock(currBlock,TEST_RamBlock_Dataset_0);
-	BUSY_WAIT(currBlock,&errorStatus);
+	BUSY_WAIT(currBlock,errorStatus);
 
 	rv = PATTERN_VERIFY(TEST_RamBlock_Dataset_0,0);
 	assert(rv == 0);
diff --git a/system/SchM/SchM.h b/system/SchM/SchM.h
index f51e92b9..2447e869 100644
--- a/system/SchM/SchM.h
+++ b/system/SchM/SchM.h
@@ -41,7 +41,7 @@ typedef struct  {
 		SchM_InfoType SchM_Info_ ## _mod
 
 #define SCHM_MAINFUNCTION(_mod,_func) \
-		if( SchM_Info_ ## _mod.timer++ > SCHM_MAINFUNCTION_PERIOD_ ## _mod ) { \
+		if( ++SchM_Info_ ## _mod.timer ==  SCHM_MAINFUNCTION_CYCLE_ ## _mod ) { \
 			_func; \
 			SchM_Info_ ## _mod.timer = 0; \
 		}
diff --git a/system/SchM/SchM_NvM.h b/system/SchM/SchM_NvM.h
index 9bad09c6..2a691ec0 100644
--- a/system/SchM/SchM_NvM.h
+++ b/system/SchM/SchM_NvM.h
@@ -17,6 +17,6 @@
 #ifndef SCHM_NVM_H_
 #define SCHM_NVM_H_
 
-#define SCHM_MAINFUNCTION_NVM() 	NvM_MainFunction()
+#define SCHM_MAINFUNCTION_NVM() 	SCHM_MAINFUNCTION(NVM,NvM_MainFunction())
 
 #endif /* SCHM_NVM_H_ */
diff --git a/system/SchM/SchM_cfg.h b/system/SchM/SchM_cfg.h
index ee97983d..3f4e17d1 100644
--- a/system/SchM/SchM_cfg.h
+++ b/system/SchM/SchM_cfg.h
@@ -23,7 +23,7 @@
 /*
  * Scheduling BSW
  */
-#define SCHM_CYCLE_MAIN				5
+#define SCHM_CYCLE_MAIN				(5-1)
 
 #define SCHM_MAINFUNCTION_CYCLE_ADC     SCHM_CYCLE_MAIN
 #define SCHM_MAINFUNCTION_CYCLE_CAN     SCHM_CYCLE_MAIN
@@ -50,11 +50,10 @@
 /*
  * Schedule BSW memory
  */
-#define SCHM_CYCLE_MEM				20
 
-#define SCHM_MAINFUNCTION_CYCLE_NVM     SCHM_CYCLE_MEM
-#define SCHM_MAINFUNCTION_CYCLE_FEE     SCHM_CYCLE_MEM
-#define SCHM_MAINFUNCTION_CYCLE_FLS     SCHM_CYCLE_MEM
+#define SCHM_MAINFUNCTION_CYCLE_NVM     SCHM_CYCLE_MAIN
+#define SCHM_MAINFUNCTION_CYCLE_FEE     SCHM_CYCLE_MAIN
+#define SCHM_MAINFUNCTION_CYCLE_FLS     SCHM_CYCLE_MAIN
 
 
 #endif /*SCHM_CFG_H_*/