merged from 2.3 without udpstandard

This commit is contained in:
Dhanya Maliakal
2017-03-24 10:34:31 +01:00
13 changed files with 42 additions and 55 deletions

View File

@ -67,8 +67,7 @@ class slsReceiver : private virtual slsReceiverDefs {
*
* return value is
* 0 callback takes care of open,close,wrie file
* 1 callback writes file, we have to open, close it
* 2 we open, close, write file, callback does not do anything
* 1 we open, close, write file, callback does not do anything
*/
void registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg);
@ -97,10 +96,10 @@ class slsReceiver : private virtual slsReceiverDefs {
* version is the version number of this structure format
* dataPointer is the pointer to the data
* dataSize in bytes is the size of the data in bytes
* fileDescriptor is the file descriptor
*/
void registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t,
char*, uint32_t, FILE*, void*),void *arg);
char*, uint32_t, void*),void *arg);
private: