Generate more meaningful error messages

[mf624-simulink.git] / sfReadPWM.c

diff --git a/sfReadPWM.c b/sfReadPWM.c
index ca4f74b797412a3f2e47590d7ae9e38b2cacb076..451af83631631dd2fb244d8bb19b94686cd6dd52 100644 (file)
--- a/sfReadPWM.c
+++ b/sfReadPWM.c
@@ -130,29 +130,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(S) != 0)
+       return;
             
     /*Configuration of desired counter modes*/
     mf624_write32(CTRX_MODE,MFST2REG(mfst,4,CTR0MODE));
@@ -252,30 +231,15 @@ static void mdlOutputs(SimStruct *S, int_T tid)
  */
 static void mdlTerminate(SimStruct *S)
 {
+    /* FIXME: This is ugly! */
     if(mfst!=NULL){
         mf624_write32(CTR_STOP,MFST2REG(mfst,4,CTRXCTRL));
         free(mfst);
         mfst=NULL;
     } else {
         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(S) != 0)
+               return;
         mf624_write32(CTR_STOP,MFST2REG(mfst,4,CTRXCTRL));
         free(mfst);
         mfst=NULL;