From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 14 Feb 2014 19:20:28 +0000 (+0100)
Subject: Change uint to uint32_t in sfAnalogInput to allow its build for external mode.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/mf624-simulink.git/commitdiff_plain/df8e3d947add25fec417be0e61fb3bc3633d36b4

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 ab41f7d..59242a5 100644
--- 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 21ff770..9c09cc7 100644
--- 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);