This file contains hidden or 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); |
This file contains hidden or 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.h 2010-03-25 09:47:26.000000000 +0100 | |
+++ runninginterfaceproxy.h 2010-03-25 12:56:27.774671050 +0100 | |
@@ -91,7 +91,7 @@ | |
virtual int ramRead(unsigned int address,unsigned int nb,unsigned int delta,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0); | |
- virtual int ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,int timeout=4000,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0); | |
+ virtual int ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0,int timeout=4000); | |
virtual int ramWrite(unsigned int address,unsigned int nb,unsigned int delta,unsigned int *data,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0); |
This file contains hidden or 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
94c94 | |
< virtual int ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,int timeout=4000,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0); | |
--- | |
> virtual int ramReadBlocking(unsigned int address,unsigned int nb,unsigned int delta,ubichipcoordaxis_t ubichipX=0,ubichipcoordaxis_t ubichipY=0,int timeout=4000); |
NewerOlder