Change uint to uint32_t in sfAnalogInput to allow its build for external mode.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/mf624_SIMULINK.c b/mf624_SIMULINK.c
index ab41f7d3c976a8253ac66074880492961c604058..59242a577a2105777acceafea5ee2ffb74eb57fe 100644 (file)
--- a/mf624_SIMULINK.c
+++ b/mf624_SIMULINK.c
@@ -473,6 +473,8 @@ int mf624_done()
                        mfst = NULL;
                }
        }
+
+       return 0;
 }
 
 

diff --git a/sfAnalogInput.c b/sfAnalogInput.c
index 21ff7708a7724112380af8c72fe2b8afa97dc846..9c09cc7b6020f87bcc7bbb75c09e9d2337ed6cf0 100644 (file)
--- a/sfAnalogInput.c
+++ b/sfAnalogInput.c
@@ -74,7 +74,7 @@ static void mdlInitializeSizes(SimStruct *S)
         ssSetErrorStatus(S,"Invalid parameter mask, set to 0-255");
     }
     
-    int ADCChannels = __builtin_popcount((uint)ADCCMask);           //Counts number of set bits in ADCCMask
+    int ADCChannels = __builtin_popcount((uint32_t)ADCCMask);           //Counts number of set bits in ADCCMask
         
     
     if (!ssSetNumInputPorts(S, 0)) return;
@@ -156,7 +156,7 @@ static void mdlInitializeSampleTimes(SimStruct *S)
         ssSetErrorStatus(S,"Invalid parameter mask, set to 0-255");
     }
     
-    int ADCChannels = __builtin_popcount((uint)ADCCMask);           //Counts number of set bits in ADCCMask
+    int ADCChannels = __builtin_popcount((uint32_t)ADCCMask);           //Counts number of set bits in ADCCMask
     
     ssSetIWorkValue(S, 0, ADCChannels);