Improve cleanup on termination (unmaps mappings and closes fd)

[mf624-simulink.git] / sfAnalogInput.c

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index d949801db58d68e438dc6515040d14efc73bcfc3..21ff7708a7724112380af8c72fe2b8afa97dc846 100644 (file)
--- a/sfAnalogInput.c
+++ b/sfAnalogInput.c
@@ -147,7 +147,7 @@ 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);
@@ -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);
 }