From 50a8014b6edcba05890049040e73fc0bd4330fe7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Adamczewski-Musch?= Date: Mon, 9 Dec 2013 12:54:54 +0100 Subject: [PATCH] apply Ludwigs changes to my git copy --- hadaq/Makefile.am | 2 +- hadaq/ansiTape.h | 8 +++++++- hadaq/args.h | 7 +++++++ hadaq/ctu.h | 7 +++++++ hadaq/debug.h | 8 +++++++- hadaq/evt.h | 9 +++++++-- hadaq/genid32.h | 8 +++++++- hadaq/hadtu.h | 7 ++++++- hadaq/hadtuqueue.h | 8 +++++++- hadaq/hardware.h | 8 +++++++- hadaq/hldread.h | 9 ++++++++- hadaq/logger.h | 8 +++++++- hadaq/nettrans.h | 8 +++++++- hadaq/psxshm.h | 8 +++++++- hadaq/resdata.h | 7 +++++++ hadaq/shmtrans.h | 7 +++++++ hadaq/stats.h | 7 +++++++ hadaq/subevt.h | 9 +++++++-- hadaq/worker.h | 8 +++++++- 19 files changed, 127 insertions(+), 16 deletions(-) diff --git a/hadaq/Makefile.am b/hadaq/Makefile.am index 18204ec..4e56132 100644 --- a/hadaq/Makefile.am +++ b/hadaq/Makefile.am @@ -37,7 +37,7 @@ libhadaq_a_SOURCES = readout.c\ shmtrans.c hadtuqueue.c \ psxshm.c \ hadtu.c -include_HEADERS = worker.h subevt.h shmtrans.h hadtuqueue.h psxshm.h hadtu.h \ +include_HEADERS = worker.h evt.h subevt.h shmtrans.h hadtuqueue.h psxshm.h hadtu.h \ hardware.h daq_xmanage_SOURCES = tcldaq.c tkAppInit.c \ diff --git a/hadaq/ansiTape.h b/hadaq/ansiTape.h index dbbc1b4..f1c5509 100644 --- a/hadaq/ansiTape.h +++ b/hadaq/ansiTape.h @@ -1,7 +1,10 @@ - #ifndef ANSITAPE_H #define ANSITAPE_H +#ifdef __cplusplus +extern "C" { +#endif + #define BLOCKSIZE 8192 typedef struct AnsiTapeS { @@ -22,4 +25,7 @@ AnsiTape *openAnsiTape(const char *, const char *); int writeAnsiTape(AnsiTape *, const char *, size_t); int closeAnsiTape(AnsiTape *); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/args.h b/hadaq/args.h index 5b6343c..3115316 100644 --- a/hadaq/args.h +++ b/hadaq/args.h @@ -7,6 +7,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct TheArgsS { char progName[PARAM_MAX_VALUE_LEN]; unsigned long nrOfMsgs; @@ -87,4 +91,7 @@ int Args_fromParam(TheArgs *my, int argc, char *argv[]); void Args_dump(TheArgs *my); int Args_prefixCode(TheArgs *my); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/ctu.h b/hadaq/ctu.h index a10a8fb..4a12f76 100644 --- a/hadaq/ctu.h +++ b/hadaq/ctu.h @@ -27,6 +27,10 @@ #define MEM_RESET 0x38 #define MAGIC 0x3c +#ifdef __cplusplus +extern "C" { +#endif + typedef struct CtuS { volatile uint8_t *base; uint16_t internalTrigNr; @@ -233,4 +237,7 @@ static void desCtu(Ctu * my) return_controller((unsigned long) my->base, 0x10000UL); } +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/debug.h b/hadaq/debug.h index f6932ca..de978c2 100644 --- a/hadaq/debug.h +++ b/hadaq/debug.h @@ -8,6 +8,10 @@ #define MAXDEBUGEVTS 20 #define MAXINPATH 100 +#ifdef __cplusplus +extern "C" { +#endif + typedef struct TheDebugS { unsigned long *evtsBroken[MAXINPATH]; unsigned long evtsBrokenS[MAXINPATH][MAXDEBUGEVTS]; @@ -31,5 +35,7 @@ void Debug_print(TheArgs *theArgs, TheStats *theStats, TheDebug * theDebug); void Debug_printBrokenTrigMismatch(TheArgs *theArgs, TheStats *theStats); void Debug_printPopTrigMismatch(TheArgs *theArgs, TheStats *theStats, TheDebug * theDebug, int qi); - +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/evt.h b/hadaq/evt.h index 5f0577e..0cc2a87 100644 --- a/hadaq/evt.h +++ b/hadaq/evt.h @@ -1,4 +1,3 @@ - #ifndef EVT_H #define EVT_H @@ -6,12 +5,15 @@ #include #include - #include "hadtu.h" #include "subevt.h" #define EVT_MAXSIZE (1024 * 1024) +#ifdef __cplusplus +extern "C" { +#endif + static const int evtBlockSize = 8 * 1024; enum EvtId { @@ -89,4 +91,7 @@ void deleteEvt(void *my); void *Evt_fget(FILE *file); void *Evt_appendSubEvt(void *my, void *subEvt); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/genid32.h b/hadaq/genid32.h index b34cb8a..f4cda77 100644 --- a/hadaq/genid32.h +++ b/hadaq/genid32.h @@ -1,9 +1,15 @@ - #ifndef GENID32_H #define GENID32_H #include +#ifdef __cplusplus +extern "C" { +#endif + uint32_t genId32(void); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/hadtu.h b/hadaq/hadtu.h index f7c0878..dfaad94 100644 --- a/hadaq/hadtu.h +++ b/hadaq/hadtu.h @@ -1,10 +1,12 @@ - #ifndef HADTU_H #define HADTU_H #include #include +#ifdef __cplusplus +extern "C" { +#endif enum HadTu_Decoding { HadTu_queueDecoding = 3 << 16 | 99 @@ -153,4 +155,7 @@ static void *HadTu_next(const void *my, const void *hadTu) return (void *) ((char *) hadTu + paddedSize); } +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/hadtuqueue.h b/hadaq/hadtuqueue.h index 5f44bfc..30462a0 100644 --- a/hadaq/hadtuqueue.h +++ b/hadaq/hadtuqueue.h @@ -1,10 +1,13 @@ - #ifndef HADTUQUEUE_H #define HADTUQUEUE_H #include #include "hadtu.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct HadTuQueueS HadTuQueue; typedef enum HadTuQueueProtE { @@ -28,4 +31,7 @@ void *HadTuQueue_2voidP(const HadTuQueue *my); void *HadTuQueue_front(const HadTuQueue *my); void HadTuQueue_pop(HadTuQueue *my); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/hardware.h b/hadaq/hardware.h index 420a0dd..b48b010 100644 --- a/hadaq/hardware.h +++ b/hadaq/hardware.h @@ -1,9 +1,12 @@ - #ifndef HARDWARE_H #define HARDWARE_H #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct HardwareS Hardware; int readoutMain(int argc, char *argv[]); @@ -68,4 +71,7 @@ static int getCards(Param *param, const char *subsystem, const char *cardtype, i return getCardsR; } +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/hldread.h b/hadaq/hldread.h index f640436..e9ee7be 100644 --- a/hadaq/hldread.h +++ b/hadaq/hldread.h @@ -1,11 +1,18 @@ - #ifndef HLDREAD_H #define HLDREAD_H #include "evt.h" +#ifdef __cplusplus +extern "C" { +#endif + int startAnalysis(int argc, char **argv); int analyseEvt(void *evt); int stopAnalysis(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/hadaq/logger.h b/hadaq/logger.h index 9ad5afb..8b8c95a 100644 --- a/hadaq/logger.h +++ b/hadaq/logger.h @@ -1,4 +1,3 @@ - #ifndef LOGGER_H #define LOGGER_H @@ -6,10 +5,17 @@ #include "stats.h" #include "worker.h" +#ifdef __cplusplus +extern "C" { +#endif + void storeLogInfo(TheArgs *theArgs, const char *msg); void storeRunInfoStart(time_t t, TheArgs *myArgs); void storeRunInfoStop(time_t t, TheArgs *myArgs, TheStats *myStats); void storeInfoStart(const char *n, time_t t, TheArgs *my); void storeInfoStop(const char *n, time_t t, Worker *w, TheArgs *my); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/nettrans.h b/hadaq/nettrans.h index a37e5bc..1471dae 100644 --- a/hadaq/nettrans.h +++ b/hadaq/nettrans.h @@ -1,4 +1,3 @@ - #ifndef NETTRANS_H #define NETTRANS_H @@ -10,6 +9,10 @@ #include "worker.h" #include "hadtu.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef enum NetTransTypeE { NetTransType_invalid, NetTransType_udp @@ -49,4 +52,7 @@ void NetTrans_recv(NetTrans *my, void *hadTu, size_t size); unsigned long NetTrans_multiRecv(NetTrans *my[], void *hadTu[], size_t size[], int nrOfMsgs); void NetTrans_multiReceive(NetTrans *my[], fd_set *fdSet, int nrOfMsgs); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/psxshm.h b/hadaq/psxshm.h index d350cf0..bed0202 100644 --- a/hadaq/psxshm.h +++ b/hadaq/psxshm.h @@ -1,9 +1,12 @@ - #ifndef PSXSHM_H #define PSXSHM_H #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct PsxShmS { int fd; void *addr; @@ -16,4 +19,7 @@ PsxShm *PsxShm_open(const char *name, int oflag, mode_t mode, off_t size); int PsxShm_close(PsxShm *my); int PsxShm_unlink(const char *name); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/resdata.h b/hadaq/resdata.h index 32b4854..20b7dc0 100644 --- a/hadaq/resdata.h +++ b/hadaq/resdata.h @@ -8,10 +8,17 @@ #define EVENT_NUM_OFFSET 100 +#ifdef __cplusplus +extern "C" { +#endif + int Res_openFile(TheArgs *theArgs, time_t res_time); int Res_writeFile(void *evt, uint32_t runNr, uint32_t seqNr); int Res_closeFile(TheArgs *theArgs); int Res_smartThreshold(TheArgs *theArgs, TheStats *theStats); int remove_file(char *path); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/shmtrans.h b/hadaq/shmtrans.h index 0069af4..756e22c 100644 --- a/hadaq/shmtrans.h +++ b/hadaq/shmtrans.h @@ -17,6 +17,10 @@ #define _POSIX_PATH_MAX 255 #endif +#ifdef __cplusplus +extern "C" { +#endif + typedef struct ShmTransS { char name[_POSIX_PATH_MAX]; PsxShm *shm; @@ -44,4 +48,7 @@ void ShmTrans_requestData(ShmTrans *my); void ShmTrans_free(ShmTrans *my); void ShmTrans_freeWhole(ShmTrans *my); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/stats.h b/hadaq/stats.h index f03f8bf..18a566f 100644 --- a/hadaq/stats.h +++ b/hadaq/stats.h @@ -12,6 +12,10 @@ #define NEVTIDS 64UL /* must be 2^n */ #define ERRBITPTRNMAX 5 +#ifdef __cplusplus +extern "C" { +#endif + typedef struct TheStatsS { unsigned long *evtsDiscarded; unsigned long *evtsComplete; @@ -46,4 +50,7 @@ void Stats_coreAffinity(TheStats *theStats, int interval); void Stats_buffFillLvls(TheArgs *theArgs, TheStats *my, float interval, ShmTrans **shmtr); void Stats_dump(TheArgs *theArgs, TheStats *my, int interval); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/subevt.h b/hadaq/subevt.h index 16960a2..4988b4b 100644 --- a/hadaq/subevt.h +++ b/hadaq/subevt.h @@ -1,12 +1,14 @@ - #ifndef SUBEVT_H #define SUBEVT_H #include - #include "hadtu.h" +#ifdef __cplusplus +extern "C" { +#endif + enum SubEvtId { SubEvtId_invalid = 0, SubEvtId_test1 = 1, @@ -138,4 +140,7 @@ void *newSubEvt(uint32_t decoding, uint32_t id, uint32_t trigNr); void deleteSubEvt(void *my); void *SubEvt_appendData(void *my, const void *data, size_t size); +#ifdef __cplusplus +} +#endif #endif diff --git a/hadaq/worker.h b/hadaq/worker.h index 4b0108c..4841ad0 100644 --- a/hadaq/worker.h +++ b/hadaq/worker.h @@ -1,4 +1,3 @@ - #ifndef WORKER_H #define WORKER_H @@ -10,6 +9,10 @@ #define WORKER_MAX_NUM_STATS 850 #define WORKER_MAX_NAME_LEN 32 +#ifdef __cplusplus +extern "C" { +#endif + typedef struct StatisticS { char name[WORKER_MAX_NAME_LEN]; unsigned long value; @@ -47,4 +50,7 @@ void Worker_dump(Worker *my, time_t interval); int Worker_getStatistic(const char *name, const char *stat, unsigned long int *value); int Worker_setStatistic(const char *name, const char *stat, unsigned long int *value); +#ifdef __cplusplus +} +#endif #endif -- 2.43.0