# HG changeset patch # User leonid # Date 1186590595 -7200 # Node ID 7b9f36dbfe5fcaf3c21323fb8dc10ca999141a54 # Parent f2b0acb54e659a6a68af47dce8e9b601d1bd7855 *** empty log message *** diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_ixxat_win32/async_access_que.h --- a/drivers/can_ixxat_win32/async_access_que.h Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_ixxat_win32/async_access_que.h Wed Aug 08 18:29:55 2007 +0200 @@ -1,6 +1,30 @@ +/* +This file is part of CanFestival, a library implementing CanOpen Stack. + +CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. + +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 +*/ + // thread safe que -// Tochinski Leonid, Chatten Associayes, Inc. -#pragma once +#ifndef __async_access_que_h__ +#define __async_access_que_h__ + #include #include "AutoReleaseCS.h" @@ -43,3 +67,4 @@ std::deque m_data; CRITICAL_SECTION m_cs; }; +#endif //__async_access_que_h__ \ No newline at end of file diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_ixxat_win32/autoreleasecs.h --- a/drivers/can_ixxat_win32/autoreleasecs.h Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_ixxat_win32/autoreleasecs.h Wed Aug 08 18:29:55 2007 +0200 @@ -1,6 +1,29 @@ +/* +This file is part of CanFestival, a library implementing CanOpen Stack. + +CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. + +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 +*/ + // Critical Section Autorelease -// Tochinski Leonid, Chatten Associates, Inc. 2007 -#pragma once +#ifndef __autoreleasecs_h__ +#define __autoreleasecs_h__ class AutoReleaseCS { @@ -15,3 +38,4 @@ } CRITICAL_SECTION& m_cs; }; + #endif // __autoreleasecs_h__ \ No newline at end of file diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_ixxat_win32/ixxat.cpp --- a/drivers/can_ixxat_win32/ixxat.cpp Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_ixxat_win32/ixxat.cpp Wed Aug 08 18:29:55 2007 +0200 @@ -1,5 +1,39 @@ +/* +This file is part of CanFestival, a library implementing CanOpen Stack. + +CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. + +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 +*/ +// pragma based message +// http://www.codeproject.com/macro/location_pragma.asp +#define __STR2__(x) #x +#define __STR1__(x) __STR2__(x) +#define __LOC2__ __FILE__ "("__STR1__(__LINE__)") : " + + +#pragma message("*********************************************************************************") +#pragma message(" NOTE: IXXAT Win32 drivers and API should be installed in order to build this project!") +#pragma message(__LOC2__ "See IXXAT.Cpp header for details.") +#pragma message("*********************************************************************************") + + // IXXAT adapter driver for CanFestival-3 Win32 port -// Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. // // Notes //-------------------------------------------- @@ -13,6 +47,7 @@ // // Copy Vci2.h & Vci11un6.lib files to can_ixxat_win32 folder of add path to them in Project settings. + #include extern "C" { #include "applicfg.h" diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_ixxat_win32/ixxat.def --- a/drivers/can_ixxat_win32/ixxat.def Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_ixxat_win32/ixxat.def Wed Aug 08 18:29:55 2007 +0200 @@ -1,3 +1,24 @@ +; This file is part of CanFestival, a library implementing CanOpen Stack. +; +; CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +; CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. +; +; 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 + LIBRARY IXXAT EXPORTS diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_uvccm_win32/can_uvccm_win32.cpp --- a/drivers/can_uvccm_win32/can_uvccm_win32.cpp Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_uvccm_win32/can_uvccm_win32.cpp Wed Aug 08 18:29:55 2007 +0200 @@ -1,7 +1,28 @@ +/* +This file is part of CanFestival, a library implementing CanOpen Stack. + +CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. + +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 +*/ + // can_uvccm_win32 adapter (http://www.gridconnect.com) // driver for CanFestival-3 Win32 port -// Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. - #include #include diff -r f2b0acb54e65 -r 7b9f36dbfe5f drivers/can_uvccm_win32/can_uvccm_win32.def --- a/drivers/can_uvccm_win32/can_uvccm_win32.def Wed Aug 08 14:55:15 2007 +0200 +++ b/drivers/can_uvccm_win32/can_uvccm_win32.def Wed Aug 08 18:29:55 2007 +0200 @@ -1,3 +1,24 @@ +; This file is part of CanFestival, a library implementing CanOpen Stack. +; +; CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +; CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. +; +; 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 + LIBRARY can_uvccm_win32 EXPORTS diff -r f2b0acb54e65 -r 7b9f36dbfe5f examples/win32test/main.c --- a/examples/win32test/main.c Wed Aug 08 14:55:15 2007 +0200 +++ b/examples/win32test/main.c Wed Aug 08 18:29:55 2007 +0200 @@ -1,3 +1,26 @@ +/* +This file is part of CanFestival, a library implementing CanOpen Stack. + +CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. + +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 +*/ + /************************************************************************** CanFestival3 win32 port example @@ -16,8 +39,6 @@ Code will work with non-UNICODE CanFestival-3.dll CAN-uVCCM.dll libraries. Sample can work on other platdorms as well. - -Copyright (C) 2007 Leonid Tochinski (ltochinski AT chattenassociates DOT com) ***************************************************************************/ #include diff -r f2b0acb54e65 -r 7b9f36dbfe5f examples/win32test/win32test.c --- a/examples/win32test/win32test.c Wed Aug 08 14:55:15 2007 +0200 +++ b/examples/win32test/win32test.c Wed Aug 08 18:29:55 2007 +0200 @@ -93,13 +93,13 @@ UNS8 win32test_highestSubIndex_obj1280 = 3; /* number of subindex - 1*/ UNS32 win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO = 0x0; /* 0 */ UNS32 win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO = 0x0; /* 0 */ - UNS32 win32test_obj1280_Node_ID_of_the_SDO_Server = 0x0; /* 0 */ + INTEGER32 win32test_obj1280_Node_ID_of_the_SDO_Server = 0x0; /* 0 */ subindex win32test_Index1280[] = { { RO, uint8, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1280 }, { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO }, { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO }, - { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_Node_ID_of_the_SDO_Server } + { RW, int32, sizeof (INTEGER32), (void*)&win32test_obj1280_Node_ID_of_the_SDO_Server } }; const indextable win32test_objdict[] = @@ -129,11 +129,12 @@ return &win32test_objdict[i]; } -/* To count at which received SYNC a PDO must be sent. +/* + * 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 win32test_count_sync[1] = {0,}; +s_PDO_status win32test_PDO_status[1] = {s_PDO_staus_Initializer}; quick_index win32test_firstIndex = { 0, /* SDO_SVR */ diff -r f2b0acb54e65 -r 7b9f36dbfe5f examples/win32test/win32test.h --- a/examples/win32test/win32test.h Wed Aug 08 14:55:15 2007 +0200 +++ b/examples/win32test/win32test.h Wed Aug 08 18:29:55 2007 +0200 @@ -1,25 +1,16 @@ /* File generated by gen_cfile.py. Should not be modified. */ +#ifndef WIN32TEST_H +#define WIN32TEST_H + #include "data.h" /* Prototypes of function provided by object dictionnary */ UNS32 win32test_valueRangeTest (UNS8 typeValue, void * value); const indextable * win32test_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks); -/* prototypes of function to be filled by app. */ -void win32test_heartbeatError(UNS8); - -UNS8 win32test_canSend(Message *); - -void win32test_initialisation(void); -void win32test_preOperational(void); -void win32test_operational(void); -void win32test_stopped(void); - -void win32test_post_sync(void); -void win32test_post_TPDO(void); - /* Master node data struct */ extern CO_Data win32test_Data; +#endif // WIN32TEST_H diff -r f2b0acb54e65 -r 7b9f36dbfe5f src/win32/CanFestival-3.def --- a/src/win32/CanFestival-3.def Wed Aug 08 14:55:15 2007 +0200 +++ b/src/win32/CanFestival-3.def Wed Aug 08 18:29:55 2007 +0200 @@ -1,3 +1,24 @@ +; This file is part of CanFestival, a library implementing CanOpen Stack. +; +; CanFestival Copyright (C): Edouard TISSERANT and Francis DUPIN +; CanFestival Win32 port Copyright (C) 2007 Leonid Tochinski, ChattenAssociates, Inc. +; +; 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 + ; CanFestival-3.def : Declares DLL exports. LIBRARY "CanFestival-3.DLL"