Created
March 26, 2010 14:11
-
-
Save asok/344921 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- /home/asok/.wine/drive_c/Program Files/HEIG-VD/Ubichip Manager/src/ubimanager/runninginterfaceproxy.cpp 2010-03-25 09:47:26.000000000 +0100 | |
+++ runninginterfaceproxy.cpp 2010-03-25 13:02:21.146728891 +0100 | |
@@ -543,7 +543,7 @@ | |
return ramReadBlocking(address,nb,delta,ubichipX,ubichipY); | |
} | |
-int RunningInterfaceProxy::ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,int timeout,ubichipcoordaxis_t ubichipX,ubichipcoordaxis_t ubichipY) | |
+int RunningInterfaceProxy::ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,ubichipcoordaxis_t ubichipX,ubichipcoordaxis_t ubichipY,int timeout) | |
{ | |
PREPAREBLOCK(COMMAND_RAMCONTENTREQUEST); | |
out << ubichipX; | |
@@ -552,7 +552,7 @@ | |
out << nb; | |
out << delta; | |
ENDBLOCK | |
- UBIMANAGERSENDBLOCK; | |
+ SENDBLOCK(m_socket); | |
if (m_socket->waitForReadyRead(timeout)) | |
{ | |
dataReady(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment