Minor change of HW-in-the-Loop model -

[mf624-simulink.git] / sfAnalogInput.c

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index 940bf439794789f838584415c014b2695efea60f..21ff7708a7724112380af8c72fe2b8afa97dc846 100644 (file)
--- a/sfAnalogInput.c
+++ b/sfAnalogInput.c
@@ -147,29 +147,8 @@ 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;
             
     int ADCCMask = (int)MASK_PRM(S);
     int i;
@@ -206,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));
     
@@ -273,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);
 }