Generate more meaningful error messages

[mf624-simulink.git] / sfAnalogOutput.c

diff --git a/sfAnalogOutput.c b/sfAnalogOutput.c
index 888bff8303adc03f45d48decc17348d073dc4433..d51a28a3be9178081bfad0bddc8a7ff117035f52 100644 (file)
--- a/sfAnalogOutput.c
+++ b/sfAnalogOutput.c
@@ -146,27 +146,8 @@ static void mdlInitializeSampleTimes(SimStruct *S)
    */
   static void mdlStart(SimStruct *S)
   {
-    if(mfst==NULL){
-        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;
-        }
-
-    }
+        if (mf624_init(S) != 0)
+           return;
        DAC_enable(mfst);
     //ssSetPWorkValue(S, 0, mfst);
   }