Phtif dietrich 2024 apr 29

.github/workflows/main.yml

@@ -55,3 +55,6 @@ jobs:
 
     - name: Install saftlib
       run: sudo make saftlib-install
+
+    - name: Build phtif
+      run: make phtif

Makefile

@@ -239,6 +239,12 @@ ifeq ($(UNAME), x86_64)
 	$(MAKE) -C ip_cores/wrpc-sw SDBFS=$(PWD)/ip_cores/fpga-config-space/sdbfs/userspace clean
 endif
 
+phtif:
+	$(MAKE) -C tools/phtif
+
+phtif-clean:
+	$(MAKE) -C tools/phtif clean
+
 # #################################################################################################
 # Arria 2 devices
 # #################################################################################################

tools/phtif/Makefile

@@ -2,9 +2,10 @@
 # Note: during compile (all), PREFIX must be set to the final installation path
 # Example usage:
 #   'make clean'                                                 
-#   'make PREFIX= all'                                                (hack: leave PREFIX empty for SCU path)
+#   'make PREFIX= all'                                                    (hack: leave PREFIX empty for SCU path)
 # Example deploy:
-#   'make PREFIX= STAGING=/common/export/timing-rte/phtif deploy'     (hack: leave PREFIX empty for SCU path)
+#   'make PREFIX= STAGING=/common/export/timing-rte/phtif-dev deploy'     (hack: leave PREFIX empty for SCU path)
+#   'make PREFIX= STAGING=/common/export/timing-rte/phtif deploy'         (hack: leave PREFIX empty for SCU path)
 PREFIX      ?= /usr/local
 STAGING     ?=
 ARCH        ?= /x86_64

tools/phtif/asl/phtif.sh

@@ -18,8 +18,12 @@ mkdir /tmp/phtifivt
 cp -a /opt/$NAME/$ARCH/tmp/phtifivt/* /tmp/phtifivt
 chmod a+w -R /tmp/phtifivt/
 
-log 'creating phtif user'
-touch /etc/phtif
+#log 'creating phtif user'
+#touch /etc/phtif
 
-adduser --disabled-password --shell /bin/sh --home / phtif
-echo "phtif:phtif" | chpasswd
+#adduser --disabled-password --shell /bin/sh --home / phtif
+#echo "phtif:phtif" | chpasswd
+
+# there is an issue with user phtif we can't fix; lets be nasty
+log 'change pw to phtif'
+echo "root:phtif" | chpasswd

tools/phtif/x86/.gitignore

@@ -0,0 +1 @@
+phtif

tools/phtif/x86/Makefile

@@ -1,9 +1,9 @@
 # PREFIX  controls where programs and libraries get installed
 # Note: during compile (all), PREFIX must be set to the final installation path
 # Example usage:
-#   'make MASP=YES PRO=NO PREFIX= all'                                                  (hack: leave PREFIX empty for SCU path)
+#   'make PREFIX= all'                                                  (hack: leave PREFIX empty for SCU path)
 # Example deploy:
-#   'make MASP=YES PRO=NO PREFIX= STAGING=/common/export/timing-rte/XYZ deploy'         (hack: leave PREFIX empty for SCU path)
+#   'make PREFIX= STAGING=/whateverPath deploy'                         (hack: leave PREFIX empty for SCU path)
 PREFIX      ?= /usr/local
 STAGING     ?=
 ARCH        ?= x86_64

tools/phtif/x86/phtif.c

@@ -3,7 +3,7 @@
  *
  *  created : 2021
  *  author  : Dietrich Beck, GSI-Darmstadt
- *  version : 19-Apr-2021
+ *  version : 29-Apr-2024
  *
  *  Poor Humans TIF; this is a quick and dirty hack for the 2021 beam time; configure pulses
  *  for certain Event IDs.
@@ -35,7 +35,7 @@
  * For all questions and ideas contact: d.beck@gsi.de
  * Last update: 15-April-2021
  *********************************************************************************************/
-#define PHTIF_X86_VERSION 0x000002
+#define PHTIF_X86_VERSION 0x000003
 
 // standard includes 
 #include <unistd.h> // getopt
@@ -59,6 +59,7 @@
 
 const char*  program;
 char path[MAXLEN];
+int  flagScu;
 
 
 static void die(const char* where, uint32_t  status) {
@@ -73,7 +74,8 @@ static void help(void)
   fprintf(stderr, "Usage: %s [OPTION]\n", program);
   fprintf(stderr, "\n");
   fprintf(stderr, "  -h                  display this help and exit\n");
-  fprintf(stderr, "  -p <path>           specify alternative location for menu settings\n");  
+  fprintf(stderr, "  -p <path>           specify alternative location for menu settings\n");
+  fprintf(stderr, "  -s                  target is an SCU; default is non-SCU\n");
   fprintf(stderr, "\n");
   fprintf(stderr, "Use this tool as quick and dirty hack to configure IOs \n");
   fprintf(stderr, "\n");
@@ -209,7 +211,8 @@ void cmdCreateCondition(char *parname)
 
   // configure output
   // build and execute command
-  sprintf(cmd, "saft-io-ctl %s -n IO%d -o1 -t0 -a1", device, io);
+  if (flagScu) sprintf(cmd, "saft-io-ctl %s -n B%d  -o1 -a1"    , device, io);
+  else         sprintf(cmd, "saft-io-ctl %s -n IO%d -o1 -t0 -a1", device, io);
   executeCommand(cmd, out);
   if (strlen(out) > 1) {
     printf("result:\n%s\npress RETURN to continue\n", out); 
@@ -279,7 +282,8 @@ void cmdCreateCondition(char *parname)
   if (offset < 0) sprintf(negFlag, "-g");
   else            sprintf(negFlag, " ");
 
-  sprintf(cmd, "saft-io-ctl %s -n IO%d -c 0x%lx 0x%lx %d 0x0 1 -u %s", device, io, evtId, mask, abs(offset), negFlag);
+  if (flagScu) sprintf(cmd, "saft-io-ctl %s -n B%d -c 0x%lx 0x%lx %d 0x0 1 -u %s" , device, io, evtId, mask, abs(offset), negFlag);
+  else         sprintf(cmd, "saft-io-ctl %s -n IO%d -c 0x%lx 0x%lx %d 0x0 1 -u %s", device, io, evtId, mask, abs(offset), negFlag);
   executeCommand(cmd, out);
   if (strlen(out) > 1) {
     printf("result:\n%s\npress RETURN to continue\n", out); 
@@ -291,7 +295,8 @@ void cmdCreateCondition(char *parname)
   if ((offset + length) < 0) sprintf(negFlag, "-g");
   else                       sprintf(negFlag, " ");
 
-  sprintf(cmd, "saft-io-ctl %s -n IO%d -c 0x%lx 0x%lx %d 0x0 0 -u %s", device, io, evtId, mask, abs(offset+length), negFlag);
+  if (flagScu) sprintf(cmd, "saft-io-ctl %s -n B%d -c 0x%lx 0x%lx %d 0x0 0 -u %s" , device, io, evtId, mask, abs(offset+length), negFlag);
+  else         sprintf(cmd, "saft-io-ctl %s -n IO%d -c 0x%lx 0x%lx %d 0x0 0 -u %s", device, io, evtId, mask, abs(offset+length), negFlag);
   executeCommand(cmd, out);
   if (strlen(out) > 1) {
     printf("result:\n%s\npress RETURN to continue\n", out); 
@@ -405,17 +410,21 @@ int main(int argc, char** argv)
   char   txtname[MAXLEN];
 
   // local variables
-  program = argv[0];                      
+  program = argv[0];         
   sprintf(path, "/tmp/phtifivt");
+  flagScu = 0;
 
-  while ((opt = getopt(argc, argv, "p:h")) != -1) {
+  while ((opt = getopt(argc, argv, "p:hs")) != -1) {
     switch (opt) {
       case 'h':
         help();
         return 0;
       case 'p':
         sprintf(path, "%s", optarg);
         break;
+      case 's':
+        flagScu = 1;
+        break;
       case ':':
       case '?':
         error = 1;