Digital input for MF624 implemented.

[mf624-simulink.git] / sfAnalogOutput.c

diff --git a/sfAnalogOutput.c b/sfAnalogOutput.c
index 0b59e1923f069216ba3bb1cf8198c4df5d731a4b..d6d89a861405c76932157e423d3dcadca2442186 100644 (file)
--- a/sfAnalogOutput.c
+++ b/sfAnalogOutput.c
@@ -146,23 +146,8 @@ static void mdlInitializeSampleTimes(SimStruct *S)
    */
   static void mdlStart(SimStruct *S)
   {
-    if(mfst==NULL){
-        mfst = malloc(sizeof(mf624_state_t));
-        char buff[32];
-        mfst->uio_dev = "uio0";
-       snprintf(buff, sizeof(buff), "/dev/%s", mfst->uio_dev);
-
-        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;
        DAC_enable(mfst);
     //ssSetPWorkValue(S, 0, mfst);
   }
@@ -180,6 +165,10 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     const real_T *u = (const real_T*) ssGetInputPortSignal(S,0);
     //mf624_state_t* mfst = ssGetPWorkValue(S,0);
     int out;
+
+    if (mf624_check(S) != 0)
+           return;
+
     if(u[0] > 9.9988){
         out = 0x3FFF;
     }
@@ -233,39 +222,15 @@ static void mdlOutputs(SimStruct *S, int_T tid)
 static void mdlTerminate(SimStruct *S)
 {
     //mf624_state_t* mfst = ssGetPWorkValue(S,0);
+    if (mf624_check(NULL) != 0)
+           return;
+
     /*At the end of simulation disable D/A outputs*/
-    if(mfst != NULL){
-        mf624_write32((mf624_read32(MFST2REG(mfst, 0, GPIOC_reg))
-            & ~GPIOC_DACEN_mask), // disable output,
-            MFST2REG(mfst, 0, GPIOC_reg));
-        free(mfst);
-        mfst=NULL;
-    } else {
-        mfst = malloc(sizeof(mf624_state_t));
-        #define BUFF_SMALL             32
-        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((mf624_read32(MFST2REG(mfst, 0, GPIOC_reg))
-            & ~GPIOC_DACEN_mask), // disable output,
-            MFST2REG(mfst, 0, GPIOC_reg));
-        free(mfst);
-        mfst=NULL;
-    }
-    
+    mf624_write32((mf624_read32(MFST2REG(mfst, 0, GPIOC_reg))
+                  & ~GPIOC_DACEN_mask), // disable output,
+                 MFST2REG(mfst, 0, GPIOC_reg));
+
+    mf624_done();
 }