From f6241f7a5eee333eff1c53b71a66d2554e933e07 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 18 Nov 2022 14:26:58 +0100
Subject: [PATCH] formatting

---
 patternGenerator/deserializer.cpp             | 176 ++++++-----
 patternGenerator/generator.c                  | 275 ++++++++----------
 .../slsDetectorFunctionList.c                 |   3 +-
 .../slsDetectorServer/src/sharedMemory.c      |   7 +-
 slsReceiverSoftware/src/Arping.cpp            |   3 +-
 5 files changed, 209 insertions(+), 255 deletions(-)

diff --git a/patternGenerator/deserializer.cpp b/patternGenerator/deserializer.cpp
index 0a52f4ad9..a77fe1077 100644
--- a/patternGenerator/deserializer.cpp
+++ b/patternGenerator/deserializer.cpp
@@ -1,112 +1,110 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 
-#include <stdlib.h>  
-#include <stdint.h>  
-#include <string.h>  
-#include <sys/utsname.h>   
-#include <sys/types.h>
-#include <unistd.h>  
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <math.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
 int main(int argc, char *argv[]) {
 
-  int iarg;
-  char fname[10000];
-  uint64_t word;
-  int val[64];
-  int bit[64];
-  FILE *fdin;
-  
-  int nb=2;
-  int off=0;
-  int ioff=0;
-  int dr=24;
-  int idr=0;
-  int ib=0;
-  int iw=0;
-  bit[0]=19;
-  bit[1]=8;
-  //  for (iarg=0; iarg<argc; iarg++) printf("%d %s\n",iarg, argv[iarg]);
-  
-  if (argc<2) printf("Error: usage is %s fname [dr off  b0 b1 bn]\n");
-  
-  if (argc>2) dr=atoi(argv[2]);
-  if (argc>3) off=atoi(argv[3]);
-  if (argc>4) {
-  for (ib=0; ib<64; ib++) {
-    if (argc>4+ib) {
-      bit[ib]=atoi(argv[4+ib]);
-      nb++;
+    int iarg;
+    char fname[10000];
+    uint64_t word;
+    int val[64];
+    int bit[64];
+    FILE *fdin;
+
+    int nb = 2;
+    int off = 0;
+    int ioff = 0;
+    int dr = 24;
+    int idr = 0;
+    int ib = 0;
+    int iw = 0;
+    bit[0] = 19;
+    bit[1] = 8;
+    //  for (iarg=0; iarg<argc; iarg++) printf("%d %s\n",iarg, argv[iarg]);
+
+    if (argc < 2)
+        printf("Error: usage is %s fname [dr off  b0 b1 bn]\n");
+
+    if (argc > 2)
+        dr = atoi(argv[2]);
+    if (argc > 3)
+        off = atoi(argv[3]);
+    if (argc > 4) {
+        for (ib = 0; ib < 64; ib++) {
+            if (argc > 4 + ib) {
+                bit[ib] = atoi(argv[4 + ib]);
+                nb++;
+            }
+        }
     }
-  }
-  
-  }
-  
-  idr=0;
-  for (ib=0; ib<nb; ib++) {
-    val[ib]=0;
-  }
-  
-  
-  fdin=fopen(argv[1],"rb");
-  if (fdin==NULL) {
-    printf("Cannot open input file %s for reading\n",argv[1]);
-    return 200;
-  } 
-  
-  while (fread((void*)&word, 8, 1, fdin)) {
-    //   printf("%llx\n",word);
-    if (ioff<off) ioff++;
-    else {
-      
-      for (ib=0; ib<nb; ib++) {
-	if (word&(1<<bit[ib])) 	  val[ib]|=(1<<idr);
-      }
-      idr++;
-      if (idr==dr) {
-	idr=0;
-	fprintf(stdout,"%d\t",iw++);
-	for (ib=0; ib<nb; ib++) {
+
+    idr = 0;
+    for (ib = 0; ib < nb; ib++) {
+        val[ib] = 0;
+    }
+
+    fdin = fopen(argv[1], "rb");
+    if (fdin == NULL) {
+        printf("Cannot open input file %s for reading\n", argv[1]);
+        return 200;
+    }
+
+    while (fread((void *)&word, 8, 1, fdin)) {
+        //   printf("%llx\n",word);
+        if (ioff < off)
+            ioff++;
+        else {
+
+            for (ib = 0; ib < nb; ib++) {
+                if (word & (1 << bit[ib]))
+                    val[ib] |= (1 << idr);
+            }
+            idr++;
+            if (idr == dr) {
+                idr = 0;
+                fprintf(stdout, "%d\t", iw++);
+                for (ib = 0; ib < nb; ib++) {
 #ifdef HEX
-	  fprintf(stdout,"%08llx\t",val[ib]);
+                    fprintf(stdout, "%08llx\t", val[ib]);
 #else
-	  fprintf(stdout,"%lld\t",val[ib]);
-	  
-#endif
-	  
-	  val[ib]=0;
-	}
-	fprintf(stdout,"\n");
-      }
-      
-    }
+                    fprintf(stdout, "%lld\t", val[ib]);
 
-  }
-  if (idr!=0) {
-    fprintf(stdout,"%d\t",iw++);
-    for (ib=0; ib<nb; ib++) {
+#endif
+
+                    val[ib] = 0;
+                }
+                fprintf(stdout, "\n");
+            }
+        }
+    }
+    if (idr != 0) {
+        fprintf(stdout, "%d\t", iw++);
+        for (ib = 0; ib < nb; ib++) {
 #ifdef HEX
-	  fprintf(stdout,"%08llx\t",val[ib]);
+            fprintf(stdout, "%08llx\t", val[ib]);
 #else
-	  fprintf(stdout,"%lld\t",val[ib]);
-	  
+            fprintf(stdout, "%lld\t", val[ib]);
+
 #endif
-	  
-	  val[ib]=0;
+
+            val[ib] = 0;
+        }
+        fprintf(stdout, "\n");
     }
-    fprintf(stdout,"\n");
-  }
 
-  fclose(fdin);
+    fclose(fdin);
 
-  return 0;
+    return 0;
 }
diff --git a/patternGenerator/generator.c b/patternGenerator/generator.c
index 85f8b6310..5d8d94bff 100644
--- a/patternGenerator/generator.c
+++ b/patternGenerator/generator.c
@@ -3,44 +3,43 @@
 /****************************************************************************
 usage to generate a patter test.pat from test.p
 
-gcc -DINFILE="\"test.p\"" -DOUTFILE="\"test.pat\"" -o test.exe generator.c ; ./test.exe ; rm test.exe
+gcc -DINFILE="\"test.p\"" -DOUTFILE="\"test.pat\"" -o test.exe generator.c ;
+./test.exe ; rm test.exe
 
 
 *************************************************************************/
 
-#include <stdlib.h>  
-#include <stdint.h>  
-#include <string.h>  
-#include <sys/utsname.h>   
-#include <sys/types.h>
-#include <unistd.h>  
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <math.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
-#define MAXLOOPS 6
+#define MAXLOOPS  6
 #define MAXTIMERS 6
-#define MAXWORDS 8191
+#define MAXWORDS  8191
 
+uint64_t pat = 0;
+uint64_t iopat = 0;
+uint64_t clkpat = 0;
 
-
-uint64_t pat=0;
-uint64_t iopat=0;
-uint64_t clkpat=0;
-
-unsigned iaddr=0;
-unsigned waitaddr[MAXTIMERS]={MAXWORDS,MAXWORDS,MAXWORDS, MAXWORDS, MAXWORDS, MAXWORDS};
-unsigned startloopaddr[MAXLOOPS]={MAXWORDS,MAXWORDS,MAXWORDS, MAXWORDS, MAXWORDS, MAXWORDS}; 
-unsigned stoploopaddr[MAXLOOPS]={MAXWORDS,MAXWORDS,MAXWORDS, MAXWORDS, MAXWORDS, MAXWORDS}; 
-unsigned start=0, stop=0;
-uint64_t waittime[MAXTIMERS]={0,0,0,0,0,0};
-unsigned nloop[MAXLOOPS]={0,0,0,0,0,0};
+unsigned iaddr = 0;
+unsigned waitaddr[MAXTIMERS] = {MAXWORDS, MAXWORDS, MAXWORDS,
+                                MAXWORDS, MAXWORDS, MAXWORDS};
+unsigned startloopaddr[MAXLOOPS] = {MAXWORDS, MAXWORDS, MAXWORDS,
+                                    MAXWORDS, MAXWORDS, MAXWORDS};
+unsigned stoploopaddr[MAXLOOPS] = {MAXWORDS, MAXWORDS, MAXWORDS,
+                                   MAXWORDS, MAXWORDS, MAXWORDS};
+unsigned start = 0, stop = 0;
+uint64_t waittime[MAXTIMERS] = {0, 0, 0, 0, 0, 0};
+unsigned nloop[MAXLOOPS] = {0, 0, 0, 0, 0, 0};
 
 char infile[10000], outfile[10000];
 
@@ -48,175 +47,137 @@ FILE *fd, *fd1;
 uint64_t PAT[MAXWORDS];
 int iopat_enable = 0;
 
+int i, ii, iii, j, jj, jjj, pixx, pixy, memx, memy, muxout, memclk, colclk,
+    rowclk, muxclk, memcol, memrow, loopcounter;
 
-int i,ii,iii,j,jj,jjj,pixx,pixy,memx,memy,muxout,memclk,colclk,rowclk,muxclk,memcol,memrow,loopcounter;
+void setstart() { start = iaddr; }
 
-void setstart() 
-{
-  start=iaddr;
+void setstop() { stop = iaddr; }
+
+void setinput(int bit) {
+    uint64_t mask = 1;
+    mask = mask << bit;
+    iopat &= ~mask;
+    iopat_enable = 1;
 }
 
-void setstop() 
-{
-  stop=iaddr;
+void setoutput(int bit) {
+    uint64_t mask = 1;
+    mask = mask << bit;
+    iopat |= mask;
+    iopat_enable = 1;
 }
 
-void setinput(int bit) 
-{
-  uint64_t mask=1;
-  mask=mask<<bit;
-  iopat &= ~mask;
-  iopat_enable = 1;
+void clearbit(int bit) {
+    uint64_t mask = 1;
+    mask = mask << bit;
+    pat &= ~mask;
+}
+void setbit(int bit) {
+    uint64_t mask = 1;
+    mask = mask << bit;
+    pat |= mask;
 }
 
-void setoutput(int bit) 
-{
-  uint64_t mask=1;
-  mask=mask<<bit;
-  iopat |= mask;
-  iopat_enable = 1;
+int checkbit(int bit) {
+    uint64_t mask = 1;
+    mask = mask << bit;
+    return (pat & mask) >> bit;
 }
 
-void clearbit(int bit)
-{
-  uint64_t mask=1;
-  mask=mask<<bit;
-  pat &= ~mask;
-}
-void setbit(int bit)
-{
-  uint64_t mask=1;
-  mask=mask<<bit;
-  pat |= mask;
-}
-
-int checkbit(int bit)
-{
-  uint64_t mask=1;
-  mask=mask<<bit;
-  return (pat & mask ) >>bit;
-}
-
-void setstartloop(int iloop)
-{
-  if (iloop>=0 && iloop<MAXLOOPS)
-    {
-      startloopaddr[iloop]=iaddr;
+void setstartloop(int iloop) {
+    if (iloop >= 0 && iloop < MAXLOOPS) {
+        startloopaddr[iloop] = iaddr;
     }
 }
 
-
-void setstoploop(int iloop)
-{
-  if (iloop>=0 && iloop<MAXLOOPS)
-    {
-      stoploopaddr[iloop]=iaddr;
+void setstoploop(int iloop) {
+    if (iloop >= 0 && iloop < MAXLOOPS) {
+        stoploopaddr[iloop] = iaddr;
     }
 }
 
-
-void setnloop(int iloop, int n)
-{
-  if (iloop>=0 && iloop<MAXLOOPS)
-    {
-      nloop[iloop]=n;
+void setnloop(int iloop, int n) {
+    if (iloop >= 0 && iloop < MAXLOOPS) {
+        nloop[iloop] = n;
     }
 }
 
-void setwaitpoint(int iloop)
-{
-  if (iloop>=0 && iloop<MAXTIMERS)
-    {
-      waitaddr[iloop]=iaddr;
+void setwaitpoint(int iloop) {
+    if (iloop >= 0 && iloop < MAXTIMERS) {
+        waitaddr[iloop] = iaddr;
     }
 }
 
-
-void setwaittime(int iloop, uint64_t t)
-{
-  if (iloop>=0 && iloop<MAXTIMERS)
-    {
-      waittime[iloop]=t;
+void setwaittime(int iloop, uint64_t t) {
+    if (iloop >= 0 && iloop < MAXTIMERS) {
+        waittime[iloop] = t;
     }
 }
 
-
-void pw()
-{
-  if (iaddr<MAXWORDS)
-    {
-      PAT[iaddr]= pat;
+void pw() {
+    if (iaddr < MAXWORDS) {
+        PAT[iaddr] = pat;
     }
-  fprintf(fd,"patword 0x%04x 0x%016llx\n",iaddr, pat);
-  iaddr++;
-  if (iaddr>=MAXWORDS)
-    {
-      printf("ERROR: too many word in the pattern (%d instead of %d)!",iaddr, MAXWORDS);
+    fprintf(fd, "patword 0x%04x 0x%016llx\n", iaddr, pat);
+    iaddr++;
+    if (iaddr >= MAXWORDS) {
+        printf("ERROR: too many word in the pattern (%d instead of %d)!", iaddr,
+               MAXWORDS);
     }
 }
 
-int parseCommand(int clk, int cmdbit, int cmd, int length)
-{
-  int ibit;
-  clearbit(clk);
-  for (ibit=0; ibit<length; ibit++)
-    {
-      if (cmd&(1>>ibit))
-	{
-	  setbit(cmdbit);
-	}
-      else
-	{ 
-	  clearbit(cmdbit);
-	}
-      pw();
-      /******/
-      setbit(clk);
-      pw();
-      /******/
+int parseCommand(int clk, int cmdbit, int cmd, int length) {
+    int ibit;
+    clearbit(clk);
+    for (ibit = 0; ibit < length; ibit++) {
+        if (cmd & (1 >> ibit)) {
+            setbit(cmdbit);
+        } else {
+            clearbit(cmdbit);
+        }
+        pw();
+        /******/
+        setbit(clk);
+        pw();
+        /******/
     }
 };
 
-
-
 int main() {
-  int iloop=0;
-  fd=fopen(OUTFILE,"w");
+    int iloop = 0;
+    fd = fopen(OUTFILE, "w");
 #include INFILE
 
-  fprintf(fd,"patlimits 0x%04x 0x%04x\n",start, stop);
+    fprintf(fd, "patlimits 0x%04x 0x%04x\n", start, stop);
 
-  if (iopat_enable == 1)
-  {
-    fprintf(fd,"patioctrl 0x%016llx\n",iopat);
-  }
-
-  for (iloop=0; iloop<MAXLOOPS; iloop++) 
-  {
-    if ( (startloopaddr[iloop] != MAXWORDS) && (stoploopaddr[iloop] != MAXWORDS) )
-    {
-      fprintf(fd,"patloop %d 0x%04x 0x%04x\n",iloop, startloopaddr[iloop], stoploopaddr[iloop]);
-      if (stoploopaddr[iloop]<= startloopaddr[iloop]) 
-        {
-          nloop[iloop]=0;
-        }
-      fprintf(fd,"patnloop %d %u\n",iloop, nloop[iloop]);
-    }    
-  }
-
-  for (iloop=0; iloop<MAXTIMERS; iloop++) 
-  {
-    if (waitaddr[iloop] != MAXWORDS)
-    {
-      fprintf(fd,"patwait %d 0x%04x\n",iloop, waitaddr[iloop]);
-      fprintf(fd,"patwaittime %d %llu\n",iloop, waittime[iloop]);
+    if (iopat_enable == 1) {
+        fprintf(fd, "patioctrl 0x%016llx\n", iopat);
     }
-  }
-  
-  fclose(fd);
-  fd1=fopen(OUTFILEBIN,"w");
-  fwrite(PAT,sizeof(uint64_t),iaddr, fd1);
-  fclose(fd1);
 
-  return 0;
+    for (iloop = 0; iloop < MAXLOOPS; iloop++) {
+        if ((startloopaddr[iloop] != MAXWORDS) &&
+            (stoploopaddr[iloop] != MAXWORDS)) {
+            fprintf(fd, "patloop %d 0x%04x 0x%04x\n", iloop,
+                    startloopaddr[iloop], stoploopaddr[iloop]);
+            if (stoploopaddr[iloop] <= startloopaddr[iloop]) {
+                nloop[iloop] = 0;
+            }
+            fprintf(fd, "patnloop %d %u\n", iloop, nloop[iloop]);
+        }
+    }
+
+    for (iloop = 0; iloop < MAXTIMERS; iloop++) {
+        if (waitaddr[iloop] != MAXWORDS) {
+            fprintf(fd, "patwait %d 0x%04x\n", iloop, waitaddr[iloop]);
+            fprintf(fd, "patwaittime %d %llu\n", iloop, waittime[iloop]);
+        }
+    }
+
+    fclose(fd);
+    fd1 = fopen(OUTFILEBIN, "w");
+    fwrite(PAT, sizeof(uint64_t), iaddr, fd1);
+    fclose(fd1);
+
+    return 0;
 }
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index 3d2fa7832..815db9050 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -2461,7 +2461,6 @@ int startStateMachine() {
                   Feb_Control_Get_Counter_Bit()));
     Feb_Control_PrepareForAcquisition();
 
-
     LOG(logINFO, ("Acquisition started bit toggled\n"));
     int ret = OK, prev_flag;
     // get the DAQ toggle bit
@@ -2779,7 +2778,7 @@ void *start_timer(void *arg) {
 #endif
 
 int stopStateMachine() {
-    
+
     // acq lock for seamless stop
     sharedMemory_lockAcqFlag();
 
diff --git a/slsDetectorServers/slsDetectorServer/src/sharedMemory.c b/slsDetectorServers/slsDetectorServer/src/sharedMemory.c
index b14fe29c3..ae8922d2f 100644
--- a/slsDetectorServers/slsDetectorServer/src/sharedMemory.c
+++ b/slsDetectorServers/slsDetectorServer/src/sharedMemory.c
@@ -159,8 +159,7 @@ int sharedMemory_initialize() {
         return FAIL;
     }
 
-    if (pthread_mutex_init(&(shm->lockAcqFlag), &lockAcqFlagAttribute) !=
-        0) {
+    if (pthread_mutex_init(&(shm->lockAcqFlag), &lockAcqFlagAttribute) != 0) {
         LOG(logERROR, ("Failed to initialize pthread_mutex_t lockAcqFlag for "
                        "shared memory\n"));
         return FAIL;
@@ -293,7 +292,5 @@ void sharedMemory_unlockLocalLink() {
 
 void sharedMemory_lockAcqFlag() { pthread_mutex_lock(&(shm->lockAcqFlag)); }
 
-void sharedMemory_unlockAcqFlag() {
-    pthread_mutex_unlock(&(shm->lockAcqFlag));
-}
+void sharedMemory_unlockAcqFlag() { pthread_mutex_unlock(&(shm->lockAcqFlag)); }
 #endif
\ No newline at end of file
diff --git a/slsReceiverSoftware/src/Arping.cpp b/slsReceiverSoftware/src/Arping.cpp
index 01330a216..3431737f5 100644
--- a/slsReceiverSoftware/src/Arping.cpp
+++ b/slsReceiverSoftware/src/Arping.cpp
@@ -14,8 +14,7 @@ namespace sls {
 #define gettid() syscall(SYS_gettid)
 #endif
 
-
-Arping::Arping(){}
+Arping::Arping() {}
 
 Arping::~Arping() {
     if (IsRunning()) {