CleanUp
authoretisserant
Fri, 11 May 2007 13:31:31 +0200
changeset 186 5220b201fac7
parent 185 d529e20c323c
child 187 d3930d3f1323
CleanUp
examples/TestMasterSlave/TestSlaveC.c
examples/TestMasterSlave/TestSlaveC.h
include/can_lincan/cancfg.h
include/can_lincan/canmsg.h
include/can_lincan/lincan.h
include/can_peak/cancfg.h
include/can_peak_win32/.cvsignore
include/can_peak_win32/cancfg.h.head
include/can_peak_win32/cancfg.h.tail
include/can_socket/cancfg.h
include/can_virtual/cancfg.h
--- a/examples/TestMasterSlave/TestSlaveC.c	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,329 +0,0 @@
-
-/* File generated by gen_cfile.py. Should not be modified. */
-
-#include "TestSlaveC.h"
-
-/**************************************************************************/
-/* Declaration of the mapped variables                                    */
-/**************************************************************************/
-UNS8 SlaveMap1 = 0x0;		/* Mapped at index 0x2000, subindex 0x00 */
-UNS8 SlaveMap2 = 0x0;		/* Mapped at index 0x2001, subindex 0x00 */
-UNS8 SlaveMap3 = 0x0;		/* Mapped at index 0x2002, subindex 0x00 */
-UNS8 SlaveMap4 = 0x0;		/* Mapped at index 0x2003, subindex 0x00 */
-
-/**************************************************************************/
-/* Declaration of the value range types                                   */
-/**************************************************************************/
-
-UNS32 TestSlave_valueRangeTest (UNS8 typeValue, void * value)
-{
-  switch (typeValue) {
-  }
-  return 0;
-}
-
-/**************************************************************************/
-/* The node id                                                            */
-/**************************************************************************/
-/* node_id default value.*/
-UNS8 TestSlave_bDeviceNodeId = 0x00;
-
-/**************************************************************************/
-/* Array of message processing information */
-
-const UNS8 TestSlave_iam_a_slave = 1;
-
-TIMER_HANDLE TestSlave_heartBeatTimers[1];
-
-/*
-$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-
-                               OBJECT DICTIONARY
-
-$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-*/
-
-/* index 0x1000 :   Device Type. */
-                    UNS32 TestSlave_obj1000 = 0x12D;	/* 301 */
-                    subindex TestSlave_Index1000[] = 
-                     {
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1000 }
-                     };
-
-/* index 0x1001 :   Error Register. */
-                    UNS8 TestSlave_obj1001 = 0x0;	/* 0 */
-                    subindex TestSlave_Index1001[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_obj1001 }
-                     };
-
-/* index 0x1005 :   SYNC COB ID. */
-                    UNS32 TestSlave_obj1005 = 0x80;	/* 128 */
-                    ODCallback_t TestSlave_Index1005_callbacks[] = 
-                     {
-                       NULL,
-                     };
-                    subindex TestSlave_Index1005[] = 
-                     {
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1005 }
-                     };
-
-/* index 0x1006 :   Communication / Cycle Period. */
-                    UNS32 TestSlave_obj1006 = 0x0;	/* 0 */
-                    ODCallback_t TestSlave_Index1006_callbacks[] = 
-                     {
-                       NULL,
-                     };
-                    subindex TestSlave_Index1006[] = 
-                     {
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1006 }
-                     };
-
-/* index 0x1010 :   Store parameters. */
-                    UNS8 TestSlave_highestSubIndex_obj1010 = 4; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1010_Save_All_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1010_Save_Communication_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1010_Save_Application_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1010_Save_Manufacturer_Parameters = 0x0;	/* 0 */
-                    ODCallback_t TestSlave_Index1010_callbacks[] = 
-                     {
-                       NULL,
-                       NULL,
-                       NULL,
-                       NULL,
-                       NULL,
-                     };
-                    subindex TestSlave_Index1010[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1010 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1010_Save_All_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1010_Save_Communication_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1010_Save_Application_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1010_Save_Manufacturer_Parameters }
-                     };
-
-/* index 0x1011 :   Restore Default Parameters. */
-                    UNS8 TestSlave_highestSubIndex_obj1011 = 4; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1011_Restore_All_Default_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1011_Restore_Communication_Default_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1011_Restore_Application_Default_Parameters = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1011_Restore_Manufacturer_Default_Parameters = 0x0;	/* 0 */
-                    ODCallback_t TestSlave_Index1011_callbacks[] = 
-                     {
-                       NULL,
-                       NULL,
-                       NULL,
-                       NULL,
-                       NULL,
-                     };
-                    subindex TestSlave_Index1011[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1011 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1011_Restore_All_Default_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1011_Restore_Communication_Default_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1011_Restore_Application_Default_Parameters },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1011_Restore_Manufacturer_Default_Parameters }
-                     };
-
-/* index 0x1016 :   Consumer Heartbeat Time */
-                    UNS8 TestSlave_highestSubIndex_obj1016 = 0;
-                    UNS32 TestSlave_obj1016[]={0};
-
-/* index 0x1017 :   Producer Heartbeat Time. */
-                    UNS16 TestSlave_obj1017 = 0x0;	/* 0 */
-                    subindex TestSlave_Index1017[] = 
-                     {
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1017 }
-                     };
-
-/* index 0x1018 :   Identity. */
-                    UNS8 TestSlave_highestSubIndex_obj1018 = 4; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1018_Vendor_ID = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1018_Product_Code = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1018_Revision_Number = 0x0;	/* 0 */
-                    UNS32 TestSlave_obj1018_Serial_Number = 0x0;	/* 0 */
-                    subindex TestSlave_Index1018[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1018 },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1018_Vendor_ID },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1018_Product_Code },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1018_Revision_Number },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1018_Serial_Number }
-                     };
-
-/* index 0x1200 :   Server SDO Parameter. */
-                    UNS8 TestSlave_highestSubIndex_obj1200 = 2; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1200_COB_ID_Client_to_Server_Receive_SDO = 0x601;	/* 1537 */
-                    UNS32 TestSlave_obj1200_COB_ID_Server_to_Client_Transmit_SDO = 0x581;	/* 1409 */
-                    subindex TestSlave_Index1200[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1200 },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1200_COB_ID_Client_to_Server_Receive_SDO },
-                       { RO, uint32, sizeof (UNS32), (void*)&TestSlave_obj1200_COB_ID_Server_to_Client_Transmit_SDO }
-                     };
-
-/* index 0x1800 :   Transmit PDO 1 Parameter. */
-                    UNS8 TestSlave_highestSubIndex_obj1800 = 5; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1800_COB_ID_used_by_PDO = 0x182;	/* 386 */
-                    UNS8 TestSlave_obj1800_Transmission_Type = 0x1;	/* 1 */
-                    UNS16 TestSlave_obj1800_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestSlave_obj1800_Compatibility_Entry = 0x0;	/* 0 */
-                    UNS16 TestSlave_obj1800_Event_Timer = 0x0;	/* 0 */
-                    subindex TestSlave_Index1800[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1800 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1800_COB_ID_used_by_PDO },
-                       { RW|TO_BE_SAVE, uint8, sizeof (UNS8), (void*)&TestSlave_obj1800_Transmission_Type },
-                       { RW|TO_BE_SAVE, uint16, sizeof (UNS16), (void*)&TestSlave_obj1800_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1800_Compatibility_Entry },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1800_Event_Timer }
-                     };
-
-/* index 0x1801 :   Transmit PDO 2 Parameter. */
-                    UNS8 TestSlave_highestSubIndex_obj1801 = 5; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1801_COB_ID_used_by_PDO = 0x282;	/* 642 */
-                    UNS8 TestSlave_obj1801_Transmission_Type = 0x1;	/* 1 */
-                    UNS16 TestSlave_obj1801_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestSlave_obj1801_Compatibility_Entry = 0x0;	/* 0 */
-                    UNS16 TestSlave_obj1801_Event_Timer = 0x0;	/* 0 */
-                    subindex TestSlave_Index1801[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1801 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1801_COB_ID_used_by_PDO },
-                       { RW, uint8, sizeof (UNS8), (void*)&TestSlave_obj1801_Transmission_Type },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1801_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1801_Compatibility_Entry },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestSlave_obj1801_Event_Timer }
-                     };
-
-/* index 0x1A00 :   Transmit PDO 1 Mapping. */
-                    UNS8 TestSlave_highestSubIndex_obj1A00 = 2; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1A00[] = 
-                    {
-                      0x20000008,	/* 536870920 */
-                      0x20010008	/* 536936456 */
-                    };
-                    subindex TestSlave_Index1A00[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1A00 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1A00[0] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1A00[1] }
-                     };
-
-/* index 0x1A01 :   Transmit PDO 2 Mapping. */
-                    UNS8 TestSlave_highestSubIndex_obj1A01 = 2; /* number of subindex - 1*/
-                    UNS32 TestSlave_obj1A01[] = 
-                    {
-                      0x20020008,	/* 537001992 */
-                      0x20030008	/* 537067528 */
-                    };
-                    subindex TestSlave_Index1A01[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&TestSlave_highestSubIndex_obj1A01 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1A01[0] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestSlave_obj1A01[1] }
-                     };
-
-/* index 0x2000 :   Mapped variable SlaveMap1 */
-                    subindex TestSlave_Index2000[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&SlaveMap1 }
-                     };
-
-/* index 0x2001 :   Mapped variable SlaveMap2 */
-                    subindex TestSlave_Index2001[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&SlaveMap2 }
-                     };
-
-/* index 0x2002 :   Mapped variable SlaveMap3 */
-                    subindex TestSlave_Index2002[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&SlaveMap3 }
-                     };
-
-/* index 0x2003 :   Mapped variable SlaveMap4 */
-                    subindex TestSlave_Index2003[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&SlaveMap4 }
-                     };
-
-const indextable TestSlave_objdict[] = 
-{
-  { (subindex*)TestSlave_Index1000,sizeof(TestSlave_Index1000)/sizeof(TestSlave_Index1000[0]), 0x1000},
-  { (subindex*)TestSlave_Index1001,sizeof(TestSlave_Index1001)/sizeof(TestSlave_Index1001[0]), 0x1001},
-  { (subindex*)TestSlave_Index1005,sizeof(TestSlave_Index1005)/sizeof(TestSlave_Index1005[0]), 0x1005},
-  { (subindex*)TestSlave_Index1006,sizeof(TestSlave_Index1006)/sizeof(TestSlave_Index1006[0]), 0x1006},
-  { (subindex*)TestSlave_Index1010,sizeof(TestSlave_Index1010)/sizeof(TestSlave_Index1010[0]), 0x1010},
-  { (subindex*)TestSlave_Index1011,sizeof(TestSlave_Index1011)/sizeof(TestSlave_Index1011[0]), 0x1011},
-  { (subindex*)TestSlave_Index1017,sizeof(TestSlave_Index1017)/sizeof(TestSlave_Index1017[0]), 0x1017},
-  { (subindex*)TestSlave_Index1018,sizeof(TestSlave_Index1018)/sizeof(TestSlave_Index1018[0]), 0x1018},
-  { (subindex*)TestSlave_Index1200,sizeof(TestSlave_Index1200)/sizeof(TestSlave_Index1200[0]), 0x1200},
-  { (subindex*)TestSlave_Index1800,sizeof(TestSlave_Index1800)/sizeof(TestSlave_Index1800[0]), 0x1800},
-  { (subindex*)TestSlave_Index1801,sizeof(TestSlave_Index1801)/sizeof(TestSlave_Index1801[0]), 0x1801},
-  { (subindex*)TestSlave_Index1A00,sizeof(TestSlave_Index1A00)/sizeof(TestSlave_Index1A00[0]), 0x1A00},
-  { (subindex*)TestSlave_Index1A01,sizeof(TestSlave_Index1A01)/sizeof(TestSlave_Index1A01[0]), 0x1A01},
-  { (subindex*)TestSlave_Index2000,sizeof(TestSlave_Index2000)/sizeof(TestSlave_Index2000[0]), 0x2000},
-  { (subindex*)TestSlave_Index2001,sizeof(TestSlave_Index2001)/sizeof(TestSlave_Index2001[0]), 0x2001},
-  { (subindex*)TestSlave_Index2002,sizeof(TestSlave_Index2002)/sizeof(TestSlave_Index2002[0]), 0x2002},
-  { (subindex*)TestSlave_Index2003,sizeof(TestSlave_Index2003)/sizeof(TestSlave_Index2003[0]), 0x2003},
-};
-
-const indextable * TestSlave_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks)
-{
-	int i;
-	*callbacks = NULL;
-	switch(wIndex){
-		case 0x1000: i = 0;break;
-		case 0x1001: i = 1;break;
-		case 0x1005: i = 2;*callbacks = TestSlave_Index1005_callbacks; break;
-		case 0x1006: i = 3;*callbacks = TestSlave_Index1006_callbacks; break;
-		case 0x1010: i = 4;*callbacks = TestSlave_Index1010_callbacks; break;
-		case 0x1011: i = 5;*callbacks = TestSlave_Index1011_callbacks; break;
-		case 0x1017: i = 6;break;
-		case 0x1018: i = 7;break;
-		case 0x1200: i = 8;break;
-		case 0x1800: i = 9;break;
-		case 0x1801: i = 10;break;
-		case 0x1A00: i = 11;break;
-		case 0x1A01: i = 12;break;
-		case 0x2000: i = 13;break;
-		case 0x2001: i = 14;break;
-		case 0x2002: i = 15;break;
-		case 0x2003: i = 16;break;
-		default:
-			*errorCode = OD_NO_SUCH_OBJECT;
-			return NULL;
-	}
-	*errorCode = OD_SUCCESSFUL;
-	return &TestSlave_objdict[i];
-}
-
-/* To count at which received SYNC a PDO must be sent.
- * Even if no pdoTransmit are defined, at least one entry is computed
- * for compilations issues.
- */
-UNS8 TestSlave_count_sync[2] = {0,};
-
-quick_index TestSlave_firstIndex = {
-  8, /* SDO_SVR */
-  0, /* SDO_CLT */
-  0, /* PDO_RCV */
-  0, /* PDO_RCV_MAP */
-  9, /* PDO_TRS */
-  11 /* PDO_TRS_MAP */
-};
-
-quick_index TestSlave_lastIndex = {
-  8, /* SDO_SVR */
-  0, /* SDO_CLT */
-  0, /* PDO_RCV */
-  0, /* PDO_RCV_MAP */
-  10, /* PDO_TRS */
-  12 /* PDO_TRS_MAP */
-};
-
-UNS16 TestSlave_ObjdictSize = sizeof(TestSlave_objdict)/sizeof(TestSlave_objdict[0]); 
-
-CO_Data TestSlave_Data = CANOPEN_NODE_DATA_INITIALIZER(TestSlave);
-
--- a/examples/TestMasterSlave/TestSlaveC.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-/* File generated by gen_cfile.py. Should not be modified. */
-
-#include "data.h"
-
-/* Prototypes of function provided by object dictionnary */
-UNS32 TestSlave_valueRangeTest (UNS8 typeValue, void * value);
-const indextable * TestSlave_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks);
-
-/* Master node data struct */
-extern CO_Data TestSlave_Data;
-
-extern ODCallback_t Store_parameters_callbacks[];		/* Callbacks of index0x1010 */
-extern ODCallback_t Restore_Default_Parameters_callbacks[];		/* Callbacks of index0x1011 */
-extern UNS8 SlaveMap1;		/* Mapped at index 0x2000, subindex 0x00*/
-extern UNS8 SlaveMap2;		/* Mapped at index 0x2001, subindex 0x00*/
-extern UNS8 SlaveMap3;		/* Mapped at index 0x2002, subindex 0x00*/
-extern UNS8 SlaveMap4;		/* Mapped at index 0x2003, subindex 0x00*/
--- a/include/can_lincan/cancfg.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack. 
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __CANCFG_H__
-#define __CANCFG_H__
-
-#define HANDLE		int
-#ifndef CAN_HANDLE
-#define CAN_HANDLE	void*
-#endif /*CAN_HANDLE*/
-
-#endif
--- a/include/can_lincan/canmsg.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/* canmsg.h - common kernel-space and user-space CAN message structure
- * Linux CAN-bus device driver.
- * Written by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.3  17 Jun 2004
- */
-
-#ifndef _CANMSG_T_H
-#define _CANMSG_T_H
-
-#ifdef __KERNEL__
-
-#include <linux/time.h>
-#include <linux/types.h>
-
-#else /* __KERNEL__ */
-
-#include <sys/time.h>
-#include <sys/types.h>
-
-#endif /* __KERNEL__ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * CAN_MSG_VERSION_2 enables new canmsg_t layout compatible with
- * can4linux project from http://www.port.de/
- *
- */
-#define CAN_MSG_VERSION_2
-
-/* Number of data bytes in one CAN message */
-#define CAN_MSG_LENGTH 8
-
-#ifdef CAN_MSG_VERSION_2
-
-typedef struct timeval canmsg_tstamp_t ;
-
-typedef unsigned long canmsg_id_t;
-
-/**
- * struct canmsg_t - structure representing CAN message
- * @flags:  message flags
- *      %MSG_RTR .. message is Remote Transmission Request,
- *	%MSG_EXT .. message with extended ID,
- *      %MSG_OVR .. indication of queue overflow condition,
- *	%MSG_LOCAL .. message originates from this node.
- * @cob:    communication object number (not used)
- * @id:     ID of CAN message
- * @timestamp: not used
- * @length: length of used data
- * @data:   data bytes buffer
- *
- * Header: canmsg.h
- */
-struct canmsg_t {
-	int             flags;
-	int             cob;
-	canmsg_id_t     id;
-	canmsg_tstamp_t timestamp;
-	unsigned short  length;
-	unsigned char   data[CAN_MSG_LENGTH];
-};
-
-#else /*CAN_MSG_VERSION_2*/
-#ifndef PACKED
-#define PACKED __attribute__((packed))
-#endif
-/* Old, deprecated version of canmsg_t structure */
-struct canmsg_t {
-	short		flags;
-	int		cob;
-	canmsg_id_t	id;
-	unsigned long	timestamp;
-	unsigned int	length;
-	unsigned char	data[CAN_MSG_LENGTH];
-} PACKED;
-#endif /*CAN_MSG_VERSION_2*/
-
-typedef struct canmsg_t canmsg_t;
-
-/**
- * struct canfilt_t - structure for acceptance filter setup
- * @flags:  message flags
- *      %MSG_RTR .. message is Remote Transmission Request,
- *	%MSG_EXT .. message with extended ID,
- *      %MSG_OVR .. indication of queue overflow condition,
- *	%MSG_LOCAL .. message originates from this node.
- *	there are corresponding mask bits
- *	%MSG_RTR_MASK, %MSG_EXT_MASK, %MSG_LOCAL_MASK.
- *	%MSG_PROCESSLOCAL enables local messages processing in the
- *	combination with global setting
- * @queid:  CAN queue identification in the case of the multiple
- *	    queues per one user (open instance)
- * @cob:    communication object number (not used)
- * @id:     selected required value of cared ID id bits
- * @mask:   select bits significand for the comparation;
- *          1 .. take care about corresponding ID bit, 0 .. don't care
- *
- * Header: canmsg.h
- */
-struct canfilt_t {
-	int		flags;
-	int		queid;
-	int		cob;
-	canmsg_id_t	id;
-	canmsg_id_t	mask;
-};
-
-typedef struct canfilt_t canfilt_t;
-
-/* Definitions to use for canmsg_t and canfilt_t flags */
-#define MSG_RTR   (1<<0)
-#define MSG_OVR   (1<<1)
-#define MSG_EXT   (1<<2)
-#define MSG_LOCAL (1<<3)
-/* If you change above lines, check canque_filtid2internal function */
-
-/* Additional definitions used for canfilt_t only */
-#define MSG_FILT_MASK_SHIFT   8
-#define MSG_RTR_MASK   (MSG_RTR<<MSG_FILT_MASK_SHIFT)
-#define MSG_EXT_MASK   (MSG_EXT<<MSG_FILT_MASK_SHIFT)
-#define MSG_LOCAL_MASK (MSG_LOCAL<<MSG_FILT_MASK_SHIFT)
-#define MSG_PROCESSLOCAL (MSG_OVR<<MSG_FILT_MASK_SHIFT)
-
-/* Can message ID mask */
-#define MSG_ID_MASK ((1l<<29)-1)
-
-#ifdef __cplusplus
-} /* extern "C"*/
-#endif
-
-#endif /*_CANMSG_T_H*/
--- a/include/can_lincan/lincan.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/* can.h
- * Header file for the Linux CAN-bus driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.3  17 Jun 2004
- */
-
-#ifndef _CAN_DRVAPI_T_H
-#define _CAN_DRVAPI_T_H
-
-#ifdef __KERNEL__
-
-#include <linux/time.h>
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#else /* __KERNEL__ */
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#endif /* __KERNEL__ */
-
-#include "./canmsg.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* CAN ioctl magic number */
-#define CAN_IOC_MAGIC 'd'
-
-typedef unsigned long bittiming_t;
-typedef unsigned short channel_t;
-
-/**
- * struct can_baudparams_t - datatype for calling CONF_BAUDPARAMS IOCTL
- * @flags: reserved for additional flags for chip configuration, should be written -1 or 0
- * @baudrate: baud rate in Hz
- * @sjw: synchronization jump width (0-3) prescaled clock cycles
- * @sampl_pt: sample point in % (0-100) sets (TSEG1+1)/(TSEG1+TSEG2+2) ratio
- *
- * The structure is used to configure new set of parameters into CAN controller chip.
- * If default value of some field should be preserved, fill field by value -1.
- */
-struct can_baudparams_t {
-	long flags;
-	long baudrate;
-	long sjw;
-	long sample_pt;
-};
-
-/* CAN ioctl functions */
-#define CAN_DRV_QUERY _IO(CAN_IOC_MAGIC, 0)
-#define CAN_DRV_QRY_BRANCH    0	/* returns driver branch value - "LINC" for LinCAN driver */
-#define CAN_DRV_QRY_VERSION   1	/* returns driver version as (major<<16) | (minor<<8) | patch */
-#define CAN_DRV_QRY_MSGFORMAT 2	/* format of canmsg_t structure */
-
-#define CMD_START _IOW(CAN_IOC_MAGIC, 1, channel_t)
-#define CMD_STOP _IOW(CAN_IOC_MAGIC, 2, channel_t)
-//#define CMD_RESET 3
-
-#define CONF_BAUD _IOW(CAN_IOC_MAGIC, 4, bittiming_t)
-//#define CONF_ACCM
-//#define CONF_XTDACCM
-//#define CONF_TIMING
-//#define CONF_OMODE
-#define CONF_FILTER _IOW(CAN_IOC_MAGIC, 8, unsigned char)
-
-//#define CONF_FENABLE
-//#define CONF_FDISABLE
-
-#define STAT _IO(CAN_IOC_MAGIC, 9)
-#define CANQUE_FILTER _IOW(CAN_IOC_MAGIC, 10, struct canfilt_t)
-#define CANQUE_FLUSH  _IO(CAN_IOC_MAGIC, 11)
-#define CONF_BAUDPARAMS  _IOW(CAN_IOC_MAGIC, 11, struct can_baudparams_t)
-#define CANRTR_READ  _IOWR(CAN_IOC_MAGIC, 12, struct canmsg_t)
-
-#ifdef __cplusplus
-} /* extern "C"*/
-#endif
-
-#endif /*_CAN_DRVAPI_T_H*/
--- a/include/can_peak/cancfg.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack. 
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __CANCFG_H__
-#define __CANCFG_H__
-
-#include "libpcan.h" // for Baudrates defines
-#define CAN_HANDLE	void*
-
-#endif
--- a/include/can_peak_win32/.cvsignore	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-cancfg.h
--- a/include/can_peak_win32/cancfg.h.head	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack. 
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __CANCFG_H__
-#define __CANCFG_H__
-
-#include <windef.h>
-
-// Following part of the file is copied by configure script
-// from choosen PcanLight header file
-//-------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------
--- a/include/can_peak_win32/cancfg.h.tail	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-//-------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------
-
-#define CAN_HANDLE	void*
-
-#endif
--- a/include/can_socket/cancfg.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack. 
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __CANCFG_H__
-#define __CANCFG_H__
-
-#ifndef CAN_HANDLE
-#define CAN_HANDLE     void *
-#endif
-
-#endif
--- a/include/can_virtual/cancfg.h	Fri May 11 11:52:05 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack. 
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __CANCFG_H__
-#define __CANCFG_H__
-
-#define CAN_HANDLE	void*
-
-#endif