Remove code duplication

diff --git a/mf624_SIMULINK.c b/mf624_SIMULINK.c
index 30f3e9657c18bfc149afb2bcc109a1a9efa29e4b..1357fdfb4d5587c0e14155191feebf14d1b8d016 100644 (file)
--- a/mf624_SIMULINK.c
+++ b/mf624_SIMULINK.c
@@ -36,6 +36,9 @@
 
 /****************************************************************/
 
+
+#include "simstruc.h"
+
 mf624_state_t* mfst=NULL;
 
 int bar_mapping_fill(bar_mapping_t *barmap, const char *uio_dev, int map_nr)
@@ -402,6 +405,28 @@ int mmap_regions(mf624_state_t* mfst)
 }
 
 
+
+int mf624_init(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;
+               }
+
+       }
+}
+
 /*int main(int argc, char* argv[])
 {
        mf624_state_t* mfst = &mf624_state;

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index 940bf439794789f838584415c014b2695efea60f..d949801db58d68e438dc6515040d14efc73bcfc3 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(S) != 0)
+       return;
             
     int ADCCMask = (int)MASK_PRM(S);
     int i;

diff --git a/sfAnalogOutput.c b/sfAnalogOutput.c
index 0b59e1923f069216ba3bb1cf8198c4df5d731a4b..d51a28a3be9178081bfad0bddc8a7ff117035f52 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(S) != 0)
+           return;
        DAC_enable(mfst);
     //ssSetPWorkValue(S, 0, mfst);
   }

diff --git a/sfDigitalOutput.c b/sfDigitalOutput.c
index 445c946458da2d5dcf1696b90b318af3522d7f1b..9d4d81b4d3c13104451f33f0df06c7f5a63a7417 100644 (file)
--- a/sfDigitalOutput.c
+++ b/sfDigitalOutput.c
@@ -146,26 +146,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;
     mfst->DOut=0;
     
   }

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;