]> rtime.felk.cvut.cz Git - CanFestival-3.git/commitdiff
Removed some warnings.
authoretisserant <etisserant>
Mon, 16 Mar 2009 23:04:24 +0000 (23:04 +0000)
committeretisserant <etisserant>
Mon, 16 Mar 2009 23:04:24 +0000 (23:04 +0000)
drivers/timers_unix/timers_unix.c
examples/DS401_Master/TestMasterMicroMod.c
examples/TestMasterMicroMod/TestMasterMicroMod.c
examples/TestMasterSlave/Master.c

index a32313075b8a8f4019e478dd443738ac7e960606..6fbf8888fd1163e308670e47c04c7326d779c634 100644 (file)
@@ -83,12 +83,12 @@ static void (*unixtimer_ReceiveLoop_task_proc)(CAN_PORT) = NULL;
  * Enter in realtime and start the CAN receiver loop
  * @param port
  */
-void unixtimer_canReceiveLoop(CAN_PORT port)
+void* unixtimer_canReceiveLoop(void* port)
 {
        
     /*get signal*/
     signal(SIGTERM, canReceiveLoop_signal);
-    unixtimer_ReceiveLoop_task_proc(port);
+    unixtimer_ReceiveLoop_task_proc((CAN_PORT)port);
 }
 
 void CreateReceiveTask(CAN_PORT port, TASK_HANDLE* Thread, void* ReceiveLoopPtr)
index 69a27e9b850557bfb8e62e85719ab6edef9deecf..0c3419fd507c53867f2f693a8bd50072ff2e512a 100644 (file)
@@ -38,7 +38,7 @@ void pause(void)
 #include "canfestival.h"
 #include "TestMasterMicroMod.h"
 #include "TestMaster.h"
-UNS8 slavenodeid;
+unsigned int slavenodeid;
 
 
 /*****************************************************************************/
@@ -56,7 +56,7 @@ void TestMaster_initialisation(CO_Data* d)
 {
        UNS32 PDO1_COBID = 0x0180 + slavenodeid; 
        UNS32 PDO2_COBID = 0x0200 + slavenodeid;
-       UNS8 size = sizeof(UNS32); 
+       UNS32 size = sizeof(UNS32); 
 
        eprintf("TestMaster_initialisation\n");
 
index 1d7e297e99b13ce48af271d0f62fad3ae89146ad..5dc37c080f6108c391547415b5769c7ac44e9039 100644 (file)
@@ -38,7 +38,7 @@ void pause(void)
 #include "canfestival.h"
 #include "TestMasterMicroMod.h"
 #include "TestMaster.h"
-UNS8 slavenodeid = 0x40;
+unsigned int slavenodeid = 0x40;
 
 
 /*****************************************************************************/
@@ -56,7 +56,7 @@ void TestMaster_initialisation(CO_Data* d)
 {
        UNS32 PDO1_COBID = 0x0180 + slavenodeid; 
        UNS32 PDO2_COBID = 0x0200 + slavenodeid;
-       UNS8 size = sizeof(UNS32); 
+       UNS32 size = sizeof(UNS32); 
 
        eprintf("TestMaster_initialisation\n");
 
index 6967a622bee2e8514b7c65814b4285143a1b875f..2a8716eb5e66da2c8dfccb15d2aee5ffdb7eb588 100644 (file)
@@ -40,7 +40,7 @@ void TestMaster_initialisation(CO_Data* d)
 {
        UNS32 PDO1_COBID = 0x0182; 
        UNS32 PDO2_COBID = 0x0282;
-       UNS8 size = sizeof(UNS32); 
+       UNS32 size = sizeof(UNS32); 
        UNS32 SINC_cicle=0;
        UNS8 data_type = 0;