# HG changeset patch # User Christian Taedcke # Date 1327347127 -3600 # Node ID 7c35870a66ea0e4b7124ff400805ffc91abbad7c # Parent 3a4fa09f11bbf216454c03c2d6509a4d69260211 can_uvccm_win32: - added can_uvccm_win32 to solution file and fixed compilation errors for current driver - renamed project file to include vc9 diff -r 3a4fa09f11bb -r 7c35870a66ea CanFestival-3.vc9.sln --- a/CanFestival-3.vc9.sln Mon Jan 23 20:28:25 2012 +0100 +++ b/CanFestival-3.vc9.sln Mon Jan 23 20:32:07 2012 +0100 @@ -23,6 +23,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_peak_win32", "drivers\can_peak_win32\can_peak_win32.vc9.vcproj", "{732EC5B6-C6F1-4783-9BC8-924FFF67BF5A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_uvccm_win32", "drivers\can_uvccm_win32\can_uvccm_win32.vc9.vcproj", "{39E3300A-29B4-4AA7-AF62-3B181FC26155}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug UNICODE|Win32 = Debug UNICODE|Win32 @@ -79,6 +81,14 @@ {732EC5B6-C6F1-4783-9BC8-924FFF67BF5A}.Debug|Win32.ActiveCfg = Debug|Win32 {732EC5B6-C6F1-4783-9BC8-924FFF67BF5A}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32 {732EC5B6-C6F1-4783-9BC8-924FFF67BF5A}.Release|Win32.ActiveCfg = Release|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Debug UNICODE|Win32.ActiveCfg = Debug UNICODE|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Debug UNICODE|Win32.Build.0 = Debug UNICODE|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Debug|Win32.ActiveCfg = Debug|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Debug|Win32.Build.0 = Debug|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Release UNICODE|Win32.Build.0 = Release UNICODE|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Release|Win32.ActiveCfg = Release|Win32 + {39E3300A-29B4-4AA7-AF62-3B181FC26155}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 3a4fa09f11bb -r 7c35870a66ea drivers/can_uvccm_win32/can_uvccm_win32.cpp --- a/drivers/can_uvccm_win32/can_uvccm_win32.cpp Mon Jan 23 20:28:25 2012 +0100 +++ b/drivers/can_uvccm_win32/can_uvccm_win32.cpp Mon Jan 23 20:32:07 2012 +0100 @@ -317,19 +317,19 @@ //------------------------------------------------------------------------ extern "C" - UNS8 canReceive_driver(CAN_HANDLE fd0, Message *m) + UNS8 __stdcall canReceive_driver(CAN_HANDLE fd0, Message *m) { return (UNS8)(!(reinterpret_cast(fd0)->receive(m))); } extern "C" - UNS8 canSend_driver(CAN_HANDLE fd0, Message const *m) + UNS8 __stdcall canSend_driver(CAN_HANDLE fd0, Message const *m) { return (UNS8)reinterpret_cast(fd0)->send(m); } extern "C" - CAN_HANDLE canOpen_driver(s_BOARD *board) + CAN_HANDLE __stdcall canOpen_driver(s_BOARD *board) { try { @@ -342,14 +342,14 @@ } extern "C" - int canClose_driver(CAN_HANDLE inst) + int __stdcall canClose_driver(CAN_HANDLE inst) { delete reinterpret_cast(inst); return 1; } extern "C" - UNS8 canChangeBaudRate_driver( CAN_HANDLE fd, char* baud) + UNS8 __stdcall canChangeBaudRate_driver( CAN_HANDLE fd, char* baud) { return 0; } diff -r 3a4fa09f11bb -r 7c35870a66ea drivers/can_uvccm_win32/can_uvccm_win32.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/drivers/can_uvccm_win32/can_uvccm_win32.vc9.vcproj Mon Jan 23 20:32:07 2012 +0100 @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3a4fa09f11bb -r 7c35870a66ea drivers/can_uvccm_win32/can_uvccm_win32.vcproj --- a/drivers/can_uvccm_win32/can_uvccm_win32.vcproj Mon Jan 23 20:28:25 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -