detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

merged from 2.3 without udpstandard

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-24 10:34:31 +01:00
parent b9eb3d5a52 e450f5ec6a
commit bb52676f50
13 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@ -66,8 +66,7 @@ class slsReceiverTCPIPInterface : 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);
@ -96,11 +95,9 @@ class slsReceiverTCPIPInterface : 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:
/**
@ -311,8 +308,7 @@ private:
*
* 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
*/
int (*startAcquisitionCallBack)(char*, char*, uint64_t, uint32_t, void*);
void *pStartAcquisition;
@ -344,10 +340,9 @@ private:
* 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 (*rawDataReadyCallBack)(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*);
char*, uint32_t, void*);
void *pRawDataReady;