# HG changeset patch
# User Christian Taedcke <hacking@taedcke.com>
# Date 1327304966 -3600
# Node ID 23df92154894aff1c90297e52a224f77057123d9
# Parent  c26ea35559f8cabcf27fd4d7fee7dded27133f4d
Win32 fixes:
- added SDO_BLOCK_SIZE macro to win32 config.h
- added explicit casts to remove compiler warnings to sdo.c
- added missing exports to Canfestival-3.def

diff -r c26ea35559f8 -r 23df92154894 include/win32/config.h
--- a/include/win32/config.h	Mon Jan 23 08:43:13 2012 +0100
+++ b/include/win32/config.h	Mon Jan 23 08:49:26 2012 +0100
@@ -29,6 +29,7 @@
 #define SDO_DYNAMIC_BUFFER_ALLOCATION_SIZE (1024 * 128)
 #define SDO_MAX_LENGTH_TRANSFERT 32
 #define SDO_MAX_SIMULTANEOUS_TRANSFERTS 32
+#define SDO_BLOCK_SIZE 16
 #define NMT_MAX_NODE_ID 128
 #define SDO_TIMEOUT_MS 3000
 #define MAX_NB_TIMER 32
diff -r c26ea35559f8 -r 23df92154894 src/sdo.c
--- a/src/sdo.c	Mon Jan 23 08:43:13 2012 +0100
+++ b/src/sdo.c	Mon Jan 23 08:49:26 2012 +0100
@@ -143,7 +143,7 @@
 	if ((offset == 0) || ((offset+d->transfers[id].CliServNbr) > d->lastIndex->SDO_CLT)) {
 		return ;
 	}
-	nodeId = *((UNS32*) d->objdict[offset+d->transfers[id].CliServNbr].pSubindex[3].pObject);
+	nodeId = (UNS8) *((UNS32*) d->objdict[offset+d->transfers[id].CliServNbr].pSubindex[3].pObject);
 	MSG_ERR(0x1A01, "SDO timeout. SDO response not received.", 0);
 	MSG_WAR(0x2A02, "server node id : ", nodeId);
 	MSG_WAR(0x2A02, "         index : ", d->transfers[id].index);
@@ -678,7 +678,7 @@
 			MSG_ERR(0x1A42, "SendSDO : SDO server not found", 0);
 			return 0xFF;
 		}
-		m.cob_id = *((UNS32*) d->objdict[offset+CliServNbr].pSubindex[2].pObject);
+		m.cob_id = (UNS16) *((UNS32*) d->objdict[offset+CliServNbr].pSubindex[2].pObject);
 		MSG_WAR(0x3A41, "I am server Tx cobId : ", m.cob_id);
 	}
 	else {			/*case client*/
@@ -688,7 +688,7 @@
 			MSG_ERR(0x1A42, "SendSDO : SDO client not found", 0);
 			return 0xFF;
 		}
-		m.cob_id = *((UNS32*) d->objdict[offset+CliServNbr].pSubindex[1].pObject);
+		m.cob_id = (UNS16) *((UNS32*) d->objdict[offset+CliServNbr].pSubindex[1].pObject);
 		MSG_WAR(0x3A41, "I am client Tx cobId : ", m.cob_id);
 	}
 	/* message copy for sending */
@@ -1137,10 +1137,10 @@
 					data[1] = index & 0xFF;        /* LSB */
 					data[2] = (index >> 8) & 0xFF; /* MSB */
 					data[3] = subIndex;
-					data[4] = nbBytes; 
-					data[5] = nbBytes >> 8; 
-					data[6] = nbBytes >> 16; 
-					data[7] = nbBytes >> 24; 
+					data[4] = (UNS8) nbBytes;
+					data[5] = (UNS8) (nbBytes >> 8);
+					data[6] = (UNS8) (nbBytes >> 16);
+					data[7] = (UNS8) (nbBytes >> 24);
  					MSG_WAR(0x3A95, "SDO. Sending normal upload initiate response defined at index 0x1200 + ", nodeId);
 					sendSDO(d, whoami, CliServNbr, data);
 				}
@@ -1399,10 +1399,10 @@
 					data[1] = index & 0xFF;        /* LSB */
 					data[2] = (index >> 8) & 0xFF; /* MSB */
 					data[3] = subIndex;
-					data[4] = nbBytes;
-					data[5] = nbBytes >> 8;
-					data[6] = nbBytes >> 16;
-					data[7] = nbBytes >> 24;
+					data[4] = (UNS8) nbBytes;
+					data[5] = (UNS8) (nbBytes >> 8);
+					data[6] = (UNS8) (nbBytes >> 16);
+					data[7] = (UNS8) (nbBytes >> 24);
 					MSG_WAR(0x3A9A, "SDO. Sending normal block upload initiate response defined at index 0x1200 + ", nodeId);
 					sendSDO(d, whoami, CliServNbr, data);
                 }
@@ -1459,7 +1459,7 @@
            			}
                     else
 					    MSG_WAR(0x3AA2, "Received SDO block START upload defined at index 0x1200 + ", CliServNbr);
-                    d->transfers[line].lastblockoffset = d->transfers[line].offset;
+                    d->transfers[line].lastblockoffset = (UNS8) d->transfers[line].offset;
                     for(SeqNo = 1 ; SeqNo <= d->transfers[line].blksize ; SeqNo++) {
                         d->transfers[line].seqno = SeqNo;
 				        getSDOlineRestBytes(d, line, &nbBytes);
@@ -1486,7 +1486,7 @@
 						        data[i] = 0;
 					        MSG_WAR(0x3AA5, "SDO. Sending last upload segment defined at index 0x1200 + ", CliServNbr);
 					        sendSDO(d, whoami, CliServNbr, data);
-                            d->transfers[line].endfield = 7 - nbBytes;
+                            d->transfers[line].endfield = (UNS8) (7 - nbBytes);
                             break;
 				        }
                     }
@@ -1531,7 +1531,7 @@
 					        return 0xFF;
                         }
 					}
-                 	d->transfers[line].lastblockoffset = d->transfers[line].offset;
+                 	d->transfers[line].lastblockoffset = (UNS8) d->transfers[line].offset;
                 	for(SeqNo = 1 ; SeqNo <= d->transfers[line].blksize ; SeqNo++) {
                         d->transfers[line].seqno = SeqNo;
 				        getSDOlineRestBytes(d, line, &nbBytes);
@@ -1558,7 +1558,7 @@
 						        data[i] = 0;
 					        MSG_WAR(0x3AAB, "SDO. Sending last download segment to node id ", nodeId);
 					        sendSDO(d, whoami, CliServNbr, data);
-                            d->transfers[line].endfield = 7 - nbBytes;
+                            d->transfers[line].endfield = (UNS8) (7 - nbBytes);
                             break;
 				        }
                     }
@@ -1606,8 +1606,8 @@
 					if ((m->data[0]) & 2)	/* if data set size is indicated */
                     	d->transfers[line].objsize = (UNS32)m->data[4] + (UNS32)m->data[5]*256 + (UNS32)m->data[6]*256*256 + (UNS32)m->data[7]*256*256*256;
                     data[0] = (5 << 5) | SDO_BSS_INITIATE_DOWNLOAD_RESPONSE;
-					data[1] = index;        /* LSB */
-					data[2] = index >> 8;   /* MSB */
+					data[1] = (UNS8) index;        /* LSB */
+					data[2] = (UNS8) (index >> 8); /* MSB */
 					data[3] = subIndex;
 					data[4] = SDO_BLOCK_SIZE;
 					data[5] = data[6] = data[7] = 0;
diff -r c26ea35559f8 -r 23df92154894 src/win32/CanFestival-3.def
--- a/src/win32/CanFestival-3.def	Mon Jan 23 08:43:13 2012 +0100
+++ b/src/win32/CanFestival-3.def	Mon Jan 23 08:49:26 2012 +0100
@@ -26,7 +26,7 @@
 EXPORTS
 
         ; dcf.h
-        send_consise_dcf
+        check_and_start_node
 
         ; lifegrd.h
         _heartbeatError
@@ -61,11 +61,12 @@
         sendPDOevent
         _sendPDOevent
         sendOnePDOevent
-		PDOInit
-		PDOStop
-		PDOEventTimerAlarm
-		PDOInhibitTimerAlarm
-		CopyBits
+        PDOInit
+        PDOStop
+        PDOEventTimerAlarm
+        PDOInhibitTimerAlarm
+        CopyBits
+        _RxPDO_EventTimers_Handler
 
         ; sdo.h
         SDOTimeoutAlarm