win32: sync vs2010 projects and wrong param when starting the bootloader

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index 5b3c6f039153f78667a4caf5c466d95a6af3aa3c..aed370cb44fbe04e1eff5e0cdd524018cf7a26ca 100644 (file)
--- a/project/libcec.vcxproj
+++ b/project/libcec.vcxproj
@@ -24,9 +24,11 @@
     <ClInclude Include="..\include\cecloader.h" />
     <ClInclude Include="..\include\cectypes.h" />
     <ClInclude Include="..\src\lib\adapter\AdapterCommunication.h" />
+    <ClInclude Include="..\src\lib\adapter\USBCECAdapterCommands.h" />
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterCommunication.h" />
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterDetection.h" />
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessage.h" />
+    <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h" />
     <ClInclude Include="..\src\lib\CECProcessor.h" />
     <ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
     <ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
@@ -56,8 +58,11 @@
     <ClInclude Include="..\src\lib\platform\windows\stdint.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterCommands.cpp" />
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterCommunication.cpp" />
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterDetection.cpp" />
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessage.cpp" />
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp" />
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
     <ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
     <ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
@@ -239,4 +244,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/project/libcec.vcxproj.filters b/project/libcec.vcxproj.filters
index 50ae8df5c3e8f261fd53a10085a5137fd1546374..fdd9df3bf76398d27b6b680502dc402da9d0885a 100644 (file)
--- a/project/libcec.vcxproj.filters
+++ b/project/libcec.vcxproj.filters
@@ -131,6 +131,12 @@
     <ClInclude Include="..\src\lib\implementations\RLCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lib\adapter\USBCECAdapterCommands.h">
+      <Filter>adapter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h">
+      <Filter>adapter</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
@@ -182,8 +188,17 @@
     <ClCompile Include="..\src\lib\implementations\RLCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterCommands.cpp">
+      <Filter>adapter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessage.cpp">
+      <Filter>adapter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp">
+      <Filter>adapter</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libcec.rc" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index e957a371c7a7c00fa2901a8b067c504938a7c80b..a8f40c55709c382f4f6d9dd8efc1b7080b2c4f52 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -1480,7 +1480,7 @@ bool CCECProcessor::StartBootloader(const char *strPort /* = NULL */)
     IAdapterCommunication *comm = new CUSBCECAdapterCommunication(this, strPort);
     CTimeout timeout(10000);
     int iConnectTry(0);
-    while (timeout.TimeLeft() > 0 && (bReturn = comm->Open(NULL, (timeout.TimeLeft() / CEC_CONNECT_TRIES)), true) == false)
+    while (timeout.TimeLeft() > 0 && (bReturn = comm->Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
     {
       CLibCEC::AddLog(CEC_LOG_ERROR, "could not open a connection (try %d)", ++iConnectTry);
       comm->Close();

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 0eca6a2c5e9b5eaf2cb1f8f24ed7c81bc5e0e33d..3230e684d9779aaa21e068932b9fb2be0ec0d274 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -510,7 +510,7 @@ bool CECStartBootloader(void)
   {
     CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
     CTimeout timeout(10000);
-    while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(NULL, (timeout.TimeLeft() / CEC_CONNECT_TRIES)), true) == false)
+    while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
     {
       comm.Close();
       CEvent::Sleep(500);