X-Git-Url: http://rtime.felk.cvut.cz/gitweb/mf624-simulink.git/blobdiff_plain/e5b71077fab070bf1f18f7f41ec300f7f5be891b..aae090ddcb04104f83e9c2a1a6f2bd1e7acdd7ee:/sfReadPWM.c

diff --git a/sfReadPWM.c b/sfReadPWM.c
index a2a3448..da79c92 100644
--- a/sfReadPWM.c
+++ b/sfReadPWM.c
@@ -2,7 +2,7 @@
 #define S_FUNCTION_NAME  sfReadPWM
 #define S_FUNCTION_LEVEL 2
 
-#define CTRX_MODE 2083 //=100000100011, count up, repeat, outpu low,gate by ctrIn
+#define CTRX_MODE 10275 //=10100000100011, count up, repeat, outpu low,gate by ctrIn, gate high
 #define CTR4_MODE 35 //100011, count upm, repeat,output low
 #define CTR_START ((1 << 0) | (1 << 6) | (1 << 12) | (1 << 24)) //start counters 0,1,2,4
 #define CTR_STOP  ((1 << 1) | (1 << 7) | (1 << 13) | (1 << 25)) //stop counters 0,1,2,4
@@ -93,7 +93,7 @@ static void mdlInitializeSizes(SimStruct *S)
  */
 static void mdlInitializeSampleTimes(SimStruct *S)
 {
-    ssSetSampleTime(S, 0, CONTINUOUS_SAMPLE_TIME);
+    ssSetSampleTime(S, 0, 0.00005);
     ssSetOffsetTime(S, 0, 0.0);
 
 }
@@ -130,50 +130,29 @@ static void mdlInitializeSampleTimes(SimStruct *S)
    */
   static void mdlStart(SimStruct *S)
   {
-    if(mfst==NULL){
-        #define BUFF_SMALL      	32
-        mfst = malloc(sizeof(mf624_state_t));
-        char buff[BUFF_SMALL];
-        memset(buff, '\0', BUFF_SMALL);
-        mfst->uio_dev = "uio0";
-
-        strncat(buff, "/dev/", 5);
-        strncat(buff, mfst->uio_dev, sizeof(buff) - 6);
-
-        mfst->device_fd = open_device(buff);
-    
-        if (mfst->device_fd < 0) {
-            ssSetErrorStatus(S,"open failed");
-            return;
-        }
-    
-        if (mmap_regions(mfst) < 0) {
-            ssSetErrorStatus(S,"mmap_regions failed");
-        	return;
-        }
-    
-    }
+    if (mf624_init(NULL) != 0)
+	return;
             
     /*Configuration of desired counter modes*/
-    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR0MODE));
-    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR1MODE));
-    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR2MODE));
-    mf624_write32(CTR4_MODE,MFST2REG(mfst,4,CTR4MODE));
+    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR0MODE_reg));
+    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR1MODE_reg));
+    mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR2MODE_reg));
+    mf624_write32(CTR4_MODE,MFST2REG(mfst,4,CTR4MODE_reg));
     
     /*Set reload values of ctrs 0,1,2,4 to 0 just to be sure*/
-    mf624_write32(0,MFST2REG(mfst,4,CTR0));
-    mf624_write32(0,MFST2REG(mfst,4,CTR1));
-    mf624_write32(0,MFST2REG(mfst,4,CTR2));
-    mf624_write32(0,MFST2REG(mfst,4,CTR4));
+    mf624_write32(0,MFST2REG(mfst,4,CTR0_reg));
+    mf624_write32(0,MFST2REG(mfst,4,CTR1_reg));
+    mf624_write32(0,MFST2REG(mfst,4,CTR2_reg));
+    mf624_write32(0,MFST2REG(mfst,4,CTR4_reg));
     
     /*Read values from counters and initialize IWork values with them*/
-    ssSetIWorkValue(S,0,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR0)));
-    ssSetIWorkValue(S,1,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR1)));
-    ssSetIWorkValue(S,2,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR2)));
-    ssSetIWorkValue(S,3,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR4)));
+    ssSetIWorkValue(S,0,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR0_reg)));
+    ssSetIWorkValue(S,1,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR1_reg)));
+    ssSetIWorkValue(S,2,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR2_reg)));
+    ssSetIWorkValue(S,3,(unsigned int)mf624_read32(MFST2REG(mfst,4,CTR4_reg)));
     
     /*Start counters 0,1,2, tehy are gated with their inputs so no worries about premature start*/
-    mf624_write32(CTR_START,MFST2REG(mfst,4,CTRXCTRL));
+    mf624_write32(CTR_START,MFST2REG(mfst,4,CTRXCTRL_reg));
             
     
   }
@@ -194,11 +173,13 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     unsigned int period;
     unsigned int c0,c1,c2,c4;
     
-    
-    c0 = mf624_read32(MFST2REG(mfst,4,CTR0));
-    c1 = mf624_read32(MFST2REG(mfst,4,CTR1));
-    c2 = mf624_read32(MFST2REG(mfst,4,CTR2));
-    c4 = mf624_read32(MFST2REG(mfst,4,CTR4));
+    if (mf624_check(S) != 0)
+	    return;
+	
+    c0 = mf624_read32(MFST2REG(mfst,4,CTR0_reg));
+    c1 = mf624_read32(MFST2REG(mfst,4,CTR1_reg));
+    c2 = mf624_read32(MFST2REG(mfst,4,CTR2_reg));
+    c4 = mf624_read32(MFST2REG(mfst,4,CTR4_reg));
     
     period = (unsigned int)(c4-(unsigned int)ssGetIWorkValue(S,3));
     
@@ -252,34 +233,11 @@ static void mdlOutputs(SimStruct *S, int_T tid)
  */
 static void mdlTerminate(SimStruct *S)
 {
-    if(mfst!=NULL){
-        mf624_write32(CTR_STOP,MFST2REG(mfst,4,CTRXCTRL));
-        free(mfst);
-        mfst=NULL;
-    } else {
-        mfst = malloc(sizeof(mf624_state_t));
-        char buff[BUFF_SMALL];
-        memset(buff, '\0', BUFF_SMALL);
-        mfst->uio_dev = "uio0";
-
-        strncat(buff, "/dev/", 5);
-        strncat(buff, mfst->uio_dev, sizeof(buff) - 6);
-
-        mfst->device_fd = open_device(buff);
-    
-        if (mfst->device_fd < 0) {
-            ssSetErrorStatus(S,"open failed");
-            return;
-        }
-    
-        if (mmap_regions(mfst) < 0) {
-            ssSetErrorStatus(S,"mmap_regions failed");
-        	return;
-        }
-        mf624_write32(CTR_STOP,MFST2REG(mfst,4,CTRXCTRL));
-        free(mfst);
-        mfst=NULL;
-    }
+    if (mf624_check(NULL) != 0)
+	    return;
+
+    mf624_write32(CTR_STOP,MFST2REG(mfst,4,CTRXCTRL_reg));
+    mf624_done();
 }