X-Git-Url: http://rtime.felk.cvut.cz/gitweb/mf624-simulink.git/blobdiff_plain/3b288601fc048d2410d695f795ac552eab000406..4d56091f3f22165080f52d32d4a25f02d951aab6:/sfAnalogInput.c

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index efd2f31..9f7dd14 100644
--- a/sfAnalogInput.c
+++ b/sfAnalogInput.c
@@ -74,7 +74,7 @@ static void mdlInitializeSizes(SimStruct *S)
         ssSetErrorStatus(S,"Invalid parameter mask, set to 0-255");
     }
     
-    int ADCChannels = __builtin_popcount((uint)ADCCMask);           //Counts number of set bits in ADCCMask
+    int ADCChannels = __builtin_popcount((uint32_t)ADCCMask);           //Counts number of set bits in ADCCMask
         
     
     if (!ssSetNumInputPorts(S, 0)) return;
@@ -111,7 +111,7 @@ static void mdlInitializeSizes(SimStruct *S)
 static void mdlInitializeSampleTimes(SimStruct *S)
 {
     ssSetSampleTime(S, 0, CONTINUOUS_SAMPLE_TIME);
-    ssSetOffsetTime(S, 0, 0.0);
+    ssSetOffsetTime(S, 0, FIXED_IN_MINOR_STEP_OFFSET);
 
 }
 
@@ -151,12 +151,12 @@ static void mdlInitializeSampleTimes(SimStruct *S)
 	return;
             
     int ADCCMask = (int)MASK_PRM(S);
-    int i;
+
     if(ADCCMask > 255 || ADCCMask < 0) {
         ssSetErrorStatus(S,"Invalid parameter mask, set to 0-255");
     }
     
-    int ADCChannels = __builtin_popcount((uint)ADCCMask);           //Counts number of set bits in ADCCMask
+    int ADCChannels = __builtin_popcount((uint32_t)ADCCMask);           //Counts number of set bits in ADCCMask
     
     ssSetIWorkValue(S, 0, ADCChannels);
     
@@ -185,7 +185,7 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     int i;
     int res,res1;
     
-    if (mf624_init(S) != 0)
+    if (mf624_check(S) != 0)
 	    return;
 
     // Activate trigger to start conversion
@@ -255,10 +255,7 @@ static void mdlOutputs(SimStruct *S, int_T tid)
  */
 static void mdlTerminate(SimStruct *S)
 {
-    if(mfst != NULL){
-        free(mfst);
-        mfst=NULL;
-    }
+    mf624_done(S);
 }