wip

slsDetectorServers/moenchDetectorServer/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(moenchDetectorServer_virtual
     ../slsDetectorServer/src/LTC2620.c
     ../slsDetectorServer/src/MAX1932.c
     ../slsDetectorServer/src/programFpgaBlackfin.c   
-    ../slsDetectorServer/src/readDefaultPattern.c         
+    ../slsDetectorServer/src/loadPattern.c         
     ../slsDetectorServer/src/sharedMemory.c
 )
 

slsDetectorServers/moenchDetectorServer/Makefile

@@ -13,7 +13,7 @@ DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
 SRCS 		= 	slsDetectorFunctionList.c 
-SRCS		+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)blackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c $(main_src)communication_funcs_UDP.c $(main_src)UDPPacketHeaderGenerator.c $(main_src)AD9257.c $(main_src)ALTERA_PLL.c $(main_src)LTC2620.c $(main_src)MAX1932.c $(main_src)programFpgaBlackfin.c $(main_src)readDefaultPattern.c $(main_src)/sharedMemory.c
+SRCS		+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)blackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c $(main_src)communication_funcs_UDP.c $(main_src)UDPPacketHeaderGenerator.c $(main_src)AD9257.c $(main_src)ALTERA_PLL.c $(main_src)LTC2620.c $(main_src)MAX1932.c $(main_src)programFpgaBlackfin.c $(main_src)loadPattern.c $(main_src)/sharedMemory.c
 
 OBJS 		= 	$(SRCS:.c=.o) 
 

slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c

@@ -9,6 +9,7 @@
 #include "UDPPacketHeaderGenerator.h"
 #include "common.h"
 #include "communication_funcs_UDP.h"
+#include "loadPattern.h"
 
 #include <netinet/in.h>
 #include <string.h>
@@ -551,7 +552,7 @@ void setupDetector() {
     }
     setPipeline(ADC_CLK, DEFAULT_PIPELINE);
     if (initError != FAIL) {
-        initError = loadDefaultPattern(DEFAULT_PATTERN_FILE, initErrorMessage);
+        initError = loadPatternFile(DEFAULT_PATTERN_FILE, initErrorMessage);
     }
     setSettings(DEFAULT_SETTINGS);
 

slsDetectorServers/mythen3DetectorServer/CMakeLists.txt

@@ -11,7 +11,7 @@ add_executable(mythen3DetectorServer_virtual
     ../slsDetectorServer/src/LTC2620_Driver.c
     ../slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c   
     ../slsDetectorServer/src/programFpgaNios.c
-    ../slsDetectorServer/src/readDefaultPattern.c 
+    ../slsDetectorServer/src/loadPattern.c 
     ../slsDetectorServer/src/loadPattern.c         
     ../slsDetectorServer/src/sharedMemory.c
 )

slsDetectorServers/mythen3DetectorServer/Makefile

@@ -13,7 +13,7 @@ DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
 SRCS	=	slsDetectorFunctionList.c 
-SRCS	+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c $(main_src)/programFpgaNios.c $(main_src)readDefaultPattern.c $(main_src)/sharedMemory.c $(main_src)/loadPattern.c mythen3.c
+SRCS	+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c $(main_src)/programFpgaNios.c $(main_src)loadPattern.c $(main_src)/sharedMemory.c $(main_src)/loadPattern.c mythen3.c
 
 OBJS 	= 	$(SRCS:.c=.o) 
  

slsDetectorServers/slsDetectorServer/include/loadPattern.h

@@ -3,14 +3,16 @@
 #include "Pattern.h"
 #include "clogger.h"
 
-int loadPattern(char *mess, enum TLogLevel printLevel, patternParameters *pat);
 int pattern_writeWord(char *message, uint32_t addr, uint64_t word);
 #ifndef MYTHEN3D
 int pattern_writeIOControl(char *message, uint64_t arg);
 #endif
 int pattern_setLoopLimits(char *message, uint32_t startAddr, uint32_t stopAddr);
-int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr, uint32_t stopAddr);
+int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr,
+                             uint32_t stopAddr);
 int pattern_setLoopCycles(char *message, int level, int numLoops);
 int pattern_setWaitAddresses(char *message, int level, uint32_t addr);
 int pattern_setWaitTime(char *message, int level, uint64_t waittime);
+int loadPattern(char *mess, enum TLogLevel printLevel, patternParameters *pat);
+int loadPatternFile(char *patFname, char *errMessage);
 #endif

slsDetectorServers/slsDetectorServer/include/readDefaultPattern.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <inttypes.h>
-#include <sys/types.h>
-
-int loadDefaultPattern(char *patFname, char *errMessage);
-
-int default_writePatternWord(char *line, uint32_t addr, uint64_t word);
-
-#ifndef MYTHEN3D
-int default_writePatternIOControl(char *line, uint64_t arg);
-#endif
-
-int default_setPatternLoopLimits(char *line, uint32_t startAddr,
-                                 uint32_t stopAddr);
-
-int default_setPatternLoopAddresses(char *line, int level, uint32_t startAddr,
-                                    uint32_t stopAddr);
-
-int default_setPatternLoopCycles(char *line, int level, int numLoops);
-
-int default_setPatternWaitAddresses(char *line, int level, uint32_t addr);
-
-int default_setPatternWaitTime(char *line, int level, uint64_t waittime);

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -8,9 +8,6 @@
     defined(MOENCHD)
 #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
 #endif
-#if defined(MOENCHD) || defined(MYTHEN3D)
-#include "readDefaultPattern.h"
-#endif
 
 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 #include "programFpgaNios.h"

slsDetectorServers/slsDetectorServer/src/loadPattern.c

@@ -1,22 +1,17 @@
 #include "loadPattern.h"
-#include "clogger.h"
 #include "common.h"
 #include "sls/ansi.h"
 #include "sls/sls_detector_defs.h"
 #include "slsDetectorServer_defs.h"
 
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(MYTHEN3D)
-#include "Pattern.h"
-#endif
-
 #include <string.h>
 #include <unistd.h>
 
-extern char initErrorMessage[MAX_STR_LENGTH];
-extern enum TLogLevel trimmingPrint;
-
 #ifndef MYTHEN3D
 extern uint64_t writePatternIOControl(uint64_t word);
+#else
+extern enum TLogLevel trimmingPrint;
+extern uint64_t readPatternWord(int addr);
 #endif
 extern uint64_t writePatternWord(int addr, uint64_t word);
 extern int setPatternWaitAddress(int level, int addr);
@@ -24,62 +19,6 @@ extern uint64_t setPatternWaitTime(int level, uint64_t t);
 extern void setPatternLoop(int level, int *startAddr, int *stopAddr,
                            int *nLoop);
 
-int loadPattern(char *message, enum TLogLevel printLevel, patternParameters *pat) {
-    LOG(logINFOBLUE, ("Loading Pattern\n"));
-    int ret = OK;
-    trimmingPrint = printLevel;
-
-    for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {
-        if ((i % 10 == 0) && pat->word[i] != 0) {
-            LOG(logDEBUG5, ("Setting Pattern Word (addr:0x%x, word:0x%llx)\n",
-                            i, (long long int)pat->word[i]));
-        }
-        ret = pattern_writeWord(message, i, pat->word[i]);
-        if (ret == FAIL) {
-            break;
-        }
-    }
-#ifndef MYTHEN3D
-    if (ret == OK) {
-        ret = pattern_writeIOControl(message, pat->ioctrl);
-    }
-#endif
-    if (ret == OK) {
-        ret = pattern_setLoopLimits(message, pat->limits[0], pat->limits[1]);
-    }
-
-    if (ret == OK) {
-        for (int i = 0; i <= 2; ++i) {
-            // loop addr
-            ret = pattern_setLoopAddresses(message, i, pat->loop[i * 2 + 0], pat->loop[i * 2 + 1]);
-            if (ret == FAIL) {
-                break;
-            }
-
-            // num loops
-            ret = pattern_setLoopCycles(message, i, pat->nloop[i]);
-            if (ret == FAIL) {
-                break;
-            }
-           
-            // wait addr
-            ret = pattern_setWaitAddresses(message, i, pat->wait[i]);
-            if (ret == FAIL) {
-                break;
-            }
-
-            // wait time
-            ret = pattern_setWaitTime(message, i, pat->waittime[i]);
-            if (ret == FAIL) {
-                break;
-            }
-        }
-    }
-    trimmingPrint = logINFO;
-
-    return ret;
-}
-
 int pattern_writeWord(char *message, uint32_t addr, uint64_t word) {
     // vaiidate input
     if ((int32_t)addr < 0 || addr >= MAX_PATTERN_LENGTH) {
@@ -91,7 +30,7 @@ int pattern_writeWord(char *message, uint32_t addr, uint64_t word) {
     }
 
     writePatternWord(addr, word);
-    
+
     // validate result
     int ret = OK;
     // cannot validate for moench, ctb ( same as executing pattern word)
@@ -117,7 +56,7 @@ int pattern_writeIOControl(char *message, uint64_t arg) {
 #endif
 
 int pattern_setLoopLimits(char *message, uint32_t startAddr,
-                                 uint32_t stopAddr) {
+                          uint32_t stopAddr) {
     // vaiidate input
     if ((int32_t)startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
         (int32_t)stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
@@ -133,20 +72,22 @@ int pattern_setLoopLimits(char *message, uint32_t startAddr,
     int r_startAddr = startAddr, r_stopAddr = stopAddr;
     setPatternLoop(-1, &r_startAddr, &r_stopAddr, &numLoops);
 
-     // validate result
+    // validate result
     int ret = OK;
     // start addr
-    validate(&ret, message, startAddr, r_startAddr, "set pattern Limits start addr", HEX);
+    validate(&ret, message, startAddr, r_startAddr,
+             "set pattern Limits start addr", HEX);
     if (ret == FAIL) {
         return FAIL;
     }
     // stop addr
-    validate(&ret, message, stopAddr, r_stopAddr, "set pattern Limits stop addr", HEX);
+    validate(&ret, message, stopAddr, r_stopAddr,
+             "set pattern Limits stop addr", HEX);
     return ret;
-
 }
 
-int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr, uint32_t stopAddr) {
+int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr,
+                             uint32_t stopAddr) {
     // vaiidate input
     if (level < 0 || level > 2) {
         sprintf(message,
@@ -157,7 +98,8 @@ int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr, uint3
     if ((int32_t)startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
         (int32_t)stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
         sprintf(message,
-                "Cannot set patloop (level: %d). Addr must be between 0 and 0x%x.\n",
+                "Cannot set patloop (level: %d). Addr must be between 0 and "
+                "0x%x.\n",
                 level, MAX_PATTERN_LENGTH);
         LOG(logERROR, (message));
         return FAIL;
@@ -167,7 +109,7 @@ int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr, uint3
     int r_startAddr = startAddr, r_stopAddr = stopAddr;
     setPatternLoop(level, &r_startAddr, &r_stopAddr, &numLoops);
 
-     // validate result
+    // validate result
     int ret = OK;
     char mode[128];
     // start addr
@@ -223,7 +165,9 @@ int pattern_setWaitAddresses(char *message, int level, uint32_t addr) {
     }
     if ((int32_t)addr < 0 || addr >= MAX_PATTERN_LENGTH) {
         sprintf(message,
-                "Cannot set patwait address (level: %d). Addr must be between 0 and 0x%x.\n", level, MAX_PATTERN_LENGTH);
+                "Cannot set patwait address (level: %d). Addr must be between "
+                "0 and 0x%x.\n",
+                level, MAX_PATTERN_LENGTH);
         LOG(logERROR, (message));
         return FAIL;
     }
@@ -240,8 +184,6 @@ int pattern_setWaitAddresses(char *message, int level, uint32_t addr) {
 }
 
 int pattern_setWaitTime(char *message, int level, uint64_t waittime) {
-    memset(message, 0, sizeof(message));
-
     // validate input
     if (level < 0 || level > 2) {
         sprintf(message,
@@ -260,3 +202,319 @@ int pattern_setWaitTime(char *message, int level, uint64_t waittime) {
     validate64(&ret, message, waittime, retval, mode, DEC);
     return ret;
 }
+
+int loadPattern(char *message, enum TLogLevel printLevel,
+                patternParameters *pat) {
+    LOG(logINFOBLUE, ("Loading Pattern\n"));
+    int ret = OK;
+#ifdef MYTHEN3D
+    trimmingPrint = printLevel;
+#endif
+
+    for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {
+        if ((i % 10 == 0) && pat->word[i] != 0) {
+            LOG(logDEBUG5, ("Setting Pattern Word (addr:0x%x, word:0x%llx)\n",
+                            i, (long long int)pat->word[i]));
+        }
+        ret = pattern_writeWord(message, i, pat->word[i]);
+        if (ret == FAIL) {
+            break;
+        }
+    }
+#ifndef MYTHEN3D
+    if (ret == OK) {
+        ret = pattern_writeIOControl(message, pat->ioctrl);
+    }
+#endif
+    if (ret == OK) {
+        ret = pattern_setLoopLimits(message, pat->limits[0], pat->limits[1]);
+    }
+
+    if (ret == OK) {
+        for (int i = 0; i <= 2; ++i) {
+            // loop addr
+            ret = pattern_setLoopAddresses(message, i, pat->loop[i * 2 + 0],
+                                           pat->loop[i * 2 + 1]);
+            if (ret == FAIL) {
+                break;
+            }
+
+            // num loops
+            ret = pattern_setLoopCycles(message, i, pat->nloop[i]);
+            if (ret == FAIL) {
+                break;
+            }
+
+            // wait addr
+            ret = pattern_setWaitAddresses(message, i, pat->wait[i]);
+            if (ret == FAIL) {
+                break;
+            }
+
+            // wait time
+            ret = pattern_setWaitTime(message, i, pat->waittime[i]);
+            if (ret == FAIL) {
+                break;
+            }
+        }
+    }
+#ifdef MYTHEN3D
+    trimmingPrint = logINFO;
+#endif
+    return ret;
+}
+
+int loadPatternFile(char *patFname, char *errMessage) {
+    char fname[128];
+    if (getAbsPath(fname, 128, patFname) == FAIL) {
+        return FAIL;
+    }
+
+    // open config file
+    FILE *fd = fopen(fname, "r");
+    if (fd == NULL) {
+        sprintf(errMessage, "Could not open pattern file [%s].\n", patFname);
+        LOG(logERROR, ("%s\n\n", errMessage));
+        return FAIL;
+    }
+    LOG(logINFOBLUE, ("Reading default pattern file %s\n", patFname));
+
+    // Initialization
+    const size_t LZ = 256;
+    char line[LZ];
+    memset(line, 0, LZ);
+    char command[LZ];
+    char temp[MAX_STR_LENGTH];
+    memset(temp, 0, MAX_STR_LENGTH);
+
+    // keep reading a line
+    while (fgets(line, LZ, fd)) {
+
+        // ignore comments
+        if (line[0] == '#') {
+            LOG(logDEBUG1, ("Ignoring Comment\n"));
+            continue;
+        }
+
+        // ignore empty lines
+        if (strlen(line) <= 1) {
+            LOG(logDEBUG1, ("Ignoring Empty line\n"));
+            continue;
+        }
+
+        // removing leading spaces
+        if (line[0] == ' ' || line[0] == '\t') {
+            int len = strlen(line);
+            // find first valid character
+            int i = 0;
+            for (i = 0; i < len; ++i) {
+                if (line[i] != ' ' && line[i] != '\t') {
+                    break;
+                }
+            }
+            // ignore the line full of spaces (last char \n)
+            if (i >= len - 1) {
+                LOG(logDEBUG1, ("Ignoring line full of spaces\n"));
+                continue;
+            }
+            // copying only valid char
+            char temp[LZ];
+            memset(temp, 0, LZ);
+            memcpy(temp, line + i, strlen(line) - i);
+            memset(line, 0, LZ);
+            memcpy(line, temp, strlen(temp));
+            LOG(logDEBUG1, ("Removing leading spaces.\n"));
+        }
+
+        LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n", strlen(line),
+                        strlen(line) - 1, line));
+        memset(command, 0, LZ);
+
+        // patword
+        if (!strncmp(line, "patword", strlen("patword"))) {
+            uint32_t addr = 0;
+            uint64_t word = 0;
+
+            // cannot scan values
+#ifdef VIRTUAL
+            if (sscanf(line, "%s 0x%x 0x%lx", command, &addr, &word) != 3) {
+#else
+            if (sscanf(line, "%s 0x%x 0x%llx", command, &addr, &word) != 3) {
+#endif
+                strcpy(temp, "Could not scan patword arguments.\n");
+                break;
+            }
+
+            if (pattern_writeWord(temp, addr, word) == FAIL) {
+                break;
+            }
+        }
+
+        // patioctrl
+#ifndef MYTHEN3D
+        if (!strncmp(line, "patioctrl", strlen("patioctrl"))) {
+            uint64_t arg = 0;
+
+            // cannot scan values
+#ifdef VIRTUAL
+            if (sscanf(line, "%s 0x%lx", command, &arg) != 2) {
+#else
+            if (sscanf(line, "%s 0x%llx", command, &arg) != 2) {
+#endif
+                strcpy(temp, "Could not scan patioctrl arguments.\n");
+                break;
+            }
+
+            if (pattern_writeIOControl(temp, arg) == FAIL) {
+                break;
+            }
+        }
+#endif
+
+        // patlimits
+        if (!strncmp(line, "patlimits", strlen("patlimits"))) {
+            uint32_t startAddr = 0;
+            uint32_t stopAddr = 0;
+
+            // cannot scan values
+            if (sscanf(line, "%s 0x%x 0x%x", command, &startAddr, &stopAddr) !=
+                3) {
+                strcpy(temp, "Could not scan patlimits arguments.\n");
+                break;
+            }
+
+            if (pattern_setLoopLimits(temp, startAddr, stopAddr) == FAIL) {
+                break;
+            }
+        }
+
+        // patloop
+        if ((!strncmp(line, "patloop0", strlen("patloop0"))) ||
+            (!strncmp(line, "patloop1", strlen("patloop1"))) ||
+            (!strncmp(line, "patloop2", strlen("patloop2")))) {
+
+            // level
+            int level = -1;
+            if (!strncmp(line, "patloop0", strlen("patloop0"))) {
+                level = 0;
+            } else if (!strncmp(line, "patloop1", strlen("patloop1"))) {
+                level = 1;
+            } else {
+                level = 2;
+            }
+
+            uint32_t startAddr = 0;
+            uint32_t stopAddr = 0;
+            // cannot scan values
+            if (sscanf(line, "%s 0x%x 0x%x", command, &startAddr, &stopAddr) !=
+                3) {
+                sprintf(temp, "Could not scan patloop%d arguments.\n", level);
+                break;
+            }
+
+            if (pattern_setLoopAddresses(temp, level, startAddr, stopAddr) ==
+                FAIL) {
+                break;
+            }
+        }
+
+        // patnloop
+        if ((!strncmp(line, "patnloop0", strlen("patnloop0"))) ||
+            (!strncmp(line, "patnloop1", strlen("patnloop1"))) ||
+            (!strncmp(line, "patnloop2", strlen("patnloop2")))) {
+
+            // level
+            int level = -1;
+            if (!strncmp(line, "patnloop0", strlen("patnloop0"))) {
+                level = 0;
+            } else if (!strncmp(line, "patnloop1", strlen("patnloop1"))) {
+                level = 1;
+            } else {
+                level = 2;
+            }
+
+            int numLoops = -1;
+            // cannot scan values
+            if (sscanf(line, "%s %d", command, &numLoops) != 2) {
+                sprintf(temp, "Could not scan patnloop %d arguments.\n", level);
+                break;
+            }
+
+            if (pattern_setLoopCycles(temp, level, numLoops) == FAIL) {
+                break;
+            }
+        }
+
+        // patwait
+        if ((!strncmp(line, "patwait0", strlen("patwait0"))) ||
+            (!strncmp(line, "patwait1", strlen("patwait1"))) ||
+            (!strncmp(line, "patwait2", strlen("patwait2")))) {
+
+            // level
+            int level = -1;
+            if (!strncmp(line, "patwait0", strlen("patwait0"))) {
+                level = 0;
+            } else if (!strncmp(line, "patwait1", strlen("patwait1"))) {
+                level = 1;
+            } else {
+                level = 2;
+            }
+
+            uint32_t addr = 0;
+            // cannot scan values
+            if (sscanf(line, "%s 0x%x", command, &addr) != 2) {
+                sprintf(temp, "Could not scan patwait%d arguments.\n", level);
+                break;
+            }
+
+            if (pattern_setWaitAddresses(temp, level, addr) == FAIL) {
+                break;
+            }
+        }
+
+        // patwaittime
+        if ((!strncmp(line, "patwaittime0", strlen("patwaittime0"))) ||
+            (!strncmp(line, "patwaittime1", strlen("patwaittime1"))) ||
+            (!strncmp(line, "patwaittime2", strlen("patwaittime2")))) {
+
+            // level
+            int level = -1;
+            if (!strncmp(line, "patwaittime0", strlen("patwaittime0"))) {
+                level = 0;
+            } else if (!strncmp(line, "patwaittime1", strlen("patwaittime1"))) {
+                level = 1;
+            } else {
+                level = 2;
+            }
+
+            uint64_t waittime = 0;
+
+            // cannot scan values
+#ifdef VIRTUAL
+            if (sscanf(line, "%s %ld", command, &waittime) != 2) {
+#else
+            if (sscanf(line, "%s %lld", command, &waittime) != 2) {
+#endif
+                sprintf(temp, "Could not scan patwaittime%d arguments.\n",
+                        level);
+                break;
+            }
+
+            if (pattern_setWaitTime(temp, level, waittime) == FAIL) {
+                break;
+            }
+        }
+
+        memset(line, 0, LZ);
+    }
+
+    fclose(fd);
+
+    if (strlen(temp)) {
+        sprintf(errMessage, "%s(Default pattern file. Line: %s)\n", temp, line);
+        return FAIL;
+    }
+
+    LOG(logINFOBLUE, ("Successfully read default pattern file\n"));
+    return OK;
+}

slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c

@@ -1,293 +0,0 @@
-#include "readDefaultPattern.h"
-#include "clogger.h"
-#include "common.h"
-#include "Pattern.h"
-#include "sls/ansi.h"
-#include "sls/sls_detector_defs.h"
-#include "slsDetectorServer_defs.h"
-
-#include <string.h>
-
-#ifndef MYTHEN3D
-extern uint64_t writePatternIOControl(uint64_t word);
-#else
-extern uint64_t readPatternWord(int addr);
-#endif
-extern uint64_t writePatternWord(int addr, uint64_t word);
-extern int setPatternWaitAddress(int level, int addr);
-extern uint64_t setPatternWaitTime(int level, uint64_t t);
-extern void setPatternLoop(int level, int *startAddr, int *stopAddr,
-                           int *nLoop);
-extern int pattern_writeWord(char *message, uint32_t addr, uint64_t word);
-#ifndef MYTHEN3D
-extern int pattern_writeIOControl(char *message, uint64_t arg);
-#endif
-extern int pattern_setLoopLimits(char *message, uint32_t startAddr, uint32_t stopAddr);
-extern int pattern_setLoopAddresses(char *message, int level, uint32_t startAddr, uint32_t stopAddr);
-extern int pattern_setLoopCycles(char *message, int level, int numLoops);
-extern int pattern_setWaitAddresses(char *message, int level, uint32_t addr);
-extern int pattern_setWaitTime(char *message, int level, uint64_t waittime); 
-
-
-int loadDefaultPattern(char *patFname,
-                       char *errMessage) { // this needs to be copied to
-                                           // initeerrormessage at function call
-    char fname[128];
-    if (getAbsPath(fname, 128, patFname) == FAIL) {
-        return FAIL;
-    }
-
-    // open config file
-    FILE *fd = fopen(fname, "r");
-    if (fd == NULL) {
-        sprintf(errMessage, "Could not open pattern file [%s].\n", patFname);
-        LOG(logERROR, ("%s\n\n", errMessage));
-        return FAIL;
-    }
-    LOG(logINFOBLUE, ("Reading default pattern file %s\n", patFname));
-
-    // Initialization
-    const size_t LZ = 256;
-    char line[LZ];
-    memset(line, 0, LZ);
-    char command[LZ];
-    char temp[MAX_STR_LENGTH];
-    memset(temp, 0, MAX_STR_LENGTH);
-
-    // keep reading a line
-    while (fgets(line, LZ, fd)) {
-
-        // ignore comments
-        if (line[0] == '#') {
-            LOG(logDEBUG1, ("Ignoring Comment\n"));
-            continue;
-        }
-
-        // ignore empty lines
-        if (strlen(line) <= 1) {
-            LOG(logDEBUG1, ("Ignoring Empty line\n"));
-            continue;
-        }
-
-        // removing leading spaces
-        if (line[0] == ' ' || line[0] == '\t') {
-            int len = strlen(line);
-            // find first valid character
-            int i = 0;
-            for (i = 0; i < len; ++i) {
-                if (line[i] != ' ' && line[i] != '\t') {
-                    break;
-                }
-            }
-            // ignore the line full of spaces (last char \n)
-            if (i >= len - 1) {
-                LOG(logDEBUG1, ("Ignoring line full of spaces\n"));
-                continue;
-            }
-            // copying only valid char
-            char temp[LZ];
-            memset(temp, 0, LZ);
-            memcpy(temp, line + i, strlen(line) - i);
-            memset(line, 0, LZ);
-            memcpy(line, temp, strlen(temp));
-            LOG(logDEBUG1, ("Removing leading spaces.\n"));
-        }
-
-        LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n", strlen(line),
-                        strlen(line) - 1, line));
-        memset(command, 0, LZ);
-
-        // patword
-        if (!strncmp(line, "patword", strlen("patword"))) {
-            uint32_t addr = 0;
-            uint64_t word = 0;
-
-            // cannot scan values
-#ifdef VIRTUAL
-            if (sscanf(line, "%s 0x%x 0x%lx", command, &addr, &word) != 3) {
-#else
-            if (sscanf(line, "%s 0x%x 0x%llx", command, &addr, &word) != 3) {
-#endif
-                strcpy(temp, "Could not scan patword arguments.\n");
-                break;
-            }
-
-            if (pattern_writeWord(temp, addr, word) == FAIL) {
-                break;
-            }
-        }
-
-        // patioctrl
-#ifndef MYTHEN3D
-        if (!strncmp(line, "patioctrl", strlen("patioctrl"))) {
-            uint64_t arg = 0;
-
-            // cannot scan values
-#ifdef VIRTUAL
-            if (sscanf(line, "%s 0x%lx", command, &arg) != 2) {
-#else
-            if (sscanf(line, "%s 0x%llx", command, &arg) != 2) {
-#endif
-                strcpy(temp, "Could not scan patioctrl arguments.\n");
-                break;
-            }
-
-            if (pattern_writeIOControl(temp, arg) == FAIL) {
-                break;
-            }
-        }
-#endif
-
-        // patlimits
-        if (!strncmp(line, "patlimits", strlen("patlimits"))) {
-            uint32_t startAddr = 0;
-            uint32_t stopAddr = 0;
-
-            // cannot scan values
-            if (sscanf(line, "%s 0x%x 0x%x", command, &startAddr, &stopAddr) !=
-                3) {
-                strcpy(temp, "Could not scan patlimits arguments.\n");
-                break;
-            }
-
-            if (pattern_setLoopLimits(temp, startAddr, stopAddr) == FAIL) {
-                break;
-            }
-        }
-
-        // patloop
-        if ((!strncmp(line, "patloop0", strlen("patloop0"))) ||
-            (!strncmp(line, "patloop1", strlen("patloop1"))) ||
-            (!strncmp(line, "patloop2", strlen("patloop2")))) {
-
-            // level
-            int level = -1;
-            if (!strncmp(line, "patloop0", strlen("patloop0"))) {
-                level = 0;
-            } else if (!strncmp(line, "patloop1", strlen("patloop1"))) {
-                level = 1;
-            } else {
-                level = 2;
-            }
-
-            uint32_t startAddr = 0;
-            uint32_t stopAddr = 0;
-            // cannot scan values
-            if (sscanf(line, "%s 0x%x 0x%x", command, &startAddr, &stopAddr) !=
-                3) {
-                sprintf(temp, "Could not scan patloop%d arguments.\n", level);
-                break;
-            }
-
-            if (pattern_setLoopAddresses(temp, level, startAddr, stopAddr) == FAIL) {
-                break;
-            }
-        }
-
-        // patnloop
-        if ((!strncmp(line, "patnloop0", strlen("patnloop0"))) ||
-            (!strncmp(line, "patnloop1", strlen("patnloop1"))) ||
-            (!strncmp(line, "patnloop2", strlen("patnloop2")))) {
-
-            // level
-            int level = -1;
-            if (!strncmp(line, "patnloop0", strlen("patnloop0"))) {
-                level = 0;
-            } else if (!strncmp(line, "patnloop1", strlen("patnloop1"))) {
-                level = 1;
-            } else {
-                level = 2;
-            }
-
-            int numLoops = -1;
-            // cannot scan values
-            if (sscanf(line, "%s %d", command, &numLoops) != 2) {
-                sprintf(temp, "Could not scan patnloop %d arguments.\n", level);
-                break;
-            }
-
-            if (pattern_setLoopCycles(temp, level, numLoops) == FAIL) {
-                break;
-            }
-        }
-
-        // patwait
-        if ((!strncmp(line, "patwait0", strlen("patwait0"))) ||
-            (!strncmp(line, "patwait1", strlen("patwait1"))) ||
-            (!strncmp(line, "patwait2", strlen("patwait2")))) {
-
-            // level
-            int level = -1;
-            if (!strncmp(line, "patwait0", strlen("patwait0"))) {
-                level = 0;
-            } else if (!strncmp(line, "patwait1", strlen("patwait1"))) {
-                level = 1;
-            } else {
-                level = 2;
-            }
-
-            uint32_t addr = 0;
-            // cannot scan values
-            if (sscanf(line, "%s 0x%x", command, &addr) != 2) {
-                sprintf(temp, "Could not scan patwait%d arguments.\n", level);
-                break;
-            }
-
-            if (pattern_setWaitAddresses(temp, level, addr) == FAIL) {
-                break;
-            }
-        }
-
-        // patwaittime
-        if ((!strncmp(line, "patwaittime0", strlen("patwaittime0"))) ||
-            (!strncmp(line, "patwaittime1", strlen("patwaittime1"))) ||
-            (!strncmp(line, "patwaittime2", strlen("patwaittime2")))) {
-
-            // level
-            int level = -1;
-            if (!strncmp(line, "patwaittime0", strlen("patwaittime0"))) {
-                level = 0;
-            } else if (!strncmp(line, "patwaittime1", strlen("patwaittime1"))) {
-                level = 1;
-            } else {
-                level = 2;
-            }
-
-            uint64_t waittime = 0;
-
-            // cannot scan values
-#ifdef VIRTUAL
-            if (sscanf(line, "%s %ld", command, &waittime) != 2) {
-#else
-            if (sscanf(line, "%s %lld", command, &waittime) != 2) {
-#endif
-                sprintf(temp, "Could not scan patwaittime%d arguments.\n", level);
-                break;
-            }
-
-            if (pattern_setWaitTime(temp, level, waittime) == FAIL) {
-                break;
-            }
-        }
-
-        memset(line, 0, LZ);
-    }
-
-    fclose(fd);
-
-    if (strlen(temp)) {
-        sprintf(errMessage, "%s(Default pattern file. Line: %s)\n", temp, line);
-        return FAIL;
-    }
-
-    LOG(logINFOBLUE, ("Successfully read default pattern file\n"));
-    return OK;
-}
-
-
-
-
-
-
-
-

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -7,6 +7,7 @@
 
 #if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(MYTHEN3D)
 #include "Pattern.h"
+#include "loadPattern.h"
 #endif
 
 #include <arpa/inet.h>
@@ -8331,7 +8332,7 @@ int load_default_pattern(int file_des) {
     functionNotImplemented();
 #else
     if (Server_VerifyLock() == OK) {
-        ret = loadDefaultPattern(DEFAULT_PATTERN_FILE, mess);
+        ret = loadPatternFile(DEFAULT_PATTERN_FILE, mess);
         if (ret == FAIL) {
             LOG(logERROR, (mess));
         }