Add _reg suffix to MF624 counter subsystem registers.

[mf624-simulink.git] / sfAnalogInput.c

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index d949801db58d68e438dc6515040d14efc73bcfc3..9f7dd1469b213ee07bece91dd98f9e78e9783afa 100644 (file)
--- 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);
 
 }
 
@@ -147,16 +147,16 @@ static void mdlInitializeSampleTimes(SimStruct *S)
    */
   static void mdlStart(SimStruct *S)
   {
-    if (mf624_init(S) != 0)
+    if (mf624_init(NULL) != 0)
        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,6 +185,9 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     int i;
     int res,res1;
     
+    if (mf624_check(S) != 0)
+           return;
+
     // Activate trigger to start conversion
        mf624_read16(MFST2REG(mfst, 2, ADSTART_reg));
     
@@ -252,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);
 }