From 972e191795eadb3e6d4407746eb5b3fb38698ad4 Mon Sep 17 00:00:00 2001
From: Koennecke Mark <mark.koennecke@psi.ch>
Date: Wed, 17 Feb 2016 16:44:53 +0100
Subject: [PATCH] Switched to new SICS logging system

---
 amilevel.c     | 1 -
 el755driv.c    | 1 -
 euro2kdriv.c   | 1 -
 eurodriv.c     | 1 -
 haakedriv.c    | 1 -
 ighdriv.c      | 1 -
 ilmdriv.c      | 1 -
 ipsdriv.c      | 1 -
 itc4driv.c     | 1 -
 itcdriv.c      | 1 -
 linadriv.c     | 1 -
 lmd200.c       | 3 +--
 lsc370driv.c   | 1 -
 pardef.c       | 3 +--
 slsvme.c       | 1 -
 sps.c          | 5 ++---
 tricssupport.c | 2 +-
 17 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/amilevel.c b/amilevel.c
index fee05f3..4654212 100644
--- a/amilevel.c
+++ b/amilevel.c
@@ -22,7 +22,6 @@ Markus Zolliker, May 2007
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/el755driv.c b/el755driv.c
index 5fe9394..86d82d0 100644
--- a/el755driv.c
+++ b/el755driv.c
@@ -17,7 +17,6 @@
 #include <strlutil.h>
 
 #include <conman.h>
-#include <servlog.h>
 #include <fortify.h>
 #include "evdriver.h"
 #include "hardsup/el755_def.h"
diff --git a/euro2kdriv.c b/euro2kdriv.c
index d641e36..c568137 100644
--- a/euro2kdriv.c
+++ b/euro2kdriv.c
@@ -22,7 +22,6 @@ Markus Zolliker, August 2005
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/eurodriv.c b/eurodriv.c
index 955be10..f0524ea 100644
--- a/eurodriv.c
+++ b/eurodriv.c
@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <fortify.h>
 #include <conman.h>
-#include <servlog.h>
 #include <fortify.h>
 #include <strlutil.h>
 
diff --git a/haakedriv.c b/haakedriv.c
index 0c1e936..9090584 100644
--- a/haakedriv.c
+++ b/haakedriv.c
@@ -22,7 +22,6 @@ Markus Zolliker, Nov 2006
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/ighdriv.c b/ighdriv.c
index dc9753b..e0b2722 100644
--- a/ighdriv.c
+++ b/ighdriv.c
@@ -23,7 +23,6 @@ Markus Zolliker, May 2005
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/ilmdriv.c b/ilmdriv.c
index 7346698..335b9bc 100644
--- a/ilmdriv.c
+++ b/ilmdriv.c
@@ -20,7 +20,6 @@ Markus Zolliker, April 2005
 #include <nserver.h>
 #include <interrupt.h>
 #include <emon.h>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <rs232controller.h>
 #include "oxinst.h"
diff --git a/ipsdriv.c b/ipsdriv.c
index 933b753..1af592c 100644
--- a/ipsdriv.c
+++ b/ipsdriv.c
@@ -23,7 +23,6 @@ Markus Zolliker, May 2005
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/itc4driv.c b/itc4driv.c
index a99005a..83475c8 100644
--- a/itc4driv.c
+++ b/itc4driv.c
@@ -44,7 +44,6 @@
 #include <assert.h>
 #include <fortify.h>
 #include <conman.h>
-#include <servlog.h>
 #include <fortify.h>
 #include <strlutil.h>
 #include "evdriver.h"
diff --git a/itcdriv.c b/itcdriv.c
index 5474e96..694bf10 100644
--- a/itcdriv.c
+++ b/itcdriv.c
@@ -23,7 +23,6 @@ Markus Zolliker, May 2005
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/linadriv.c b/linadriv.c
index 619ebe0..6f4e8f8 100644
--- a/linadriv.c
+++ b/linadriv.c
@@ -22,7 +22,6 @@ Markus Zolliker, Oct 2006
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/lmd200.c b/lmd200.c
index afc329e..0628a1f 100644
--- a/lmd200.c
+++ b/lmd200.c
@@ -21,7 +21,6 @@
 #include <sicsobj.h>
 #include <sicshipadaba.h>
 #include <asynnet.h> 
-#include <commandlog.h>
 #include <stptok.h>
 /*
  * possible states 
@@ -66,7 +65,7 @@ static void doAlarm(pSICSOBJ self, char *lineBuffer)
 {
 
   setAlarm(self, lineBuffer);
-  WriteToCommandLog("CERCA>> ", lineBuffer);
+  Log(ERROR,"dev","CERCA:%s ", lineBuffer);
   ServerWriteGlobal(lineBuffer, eError);
 }
 
diff --git a/lsc370driv.c b/lsc370driv.c
index 29fb6b3..71420e8 100644
--- a/lsc370driv.c
+++ b/lsc370driv.c
@@ -22,7 +22,6 @@ Markus Zolliker, July 2006
 #include <emon.h>
 #include <evcontroller.h>
 #include <evcontroller.i>
-#include <servlog.h>
 #include <sicsvar.h>
 #include <evdriver.i>
 #include <rs232controller.h>
diff --git a/pardef.c b/pardef.c
index 006e590..4af35cf 100644
--- a/pardef.c
+++ b/pardef.c
@@ -17,7 +17,6 @@ Markus Zolliker, March 2005
 #include "logger.h"
 #include "pardef.h"
 #include "sugar.h"
-#include "commandlog.h"
 #include "dynstring.h"
 
 #define ILLNUM -2
@@ -174,7 +173,7 @@ int ParPrintf(void *object, int iOut, const char *fmt, ...)
   if (con) {
     SCWrite(con, buf, iOut);    /* writes to command log when user or manager */
   } else if (iOut >= 0) {
-    WriteToCommandLog(">", buf);        /* no connection, write to commandlog only */
+    Log(INFO,"par", "%s", buf);        /* no connection, write to commandlog only */
   }
 
   if (dyn)
diff --git a/slsvme.c b/slsvme.c
index d14bec7..8a47c1c 100644
--- a/slsvme.c
+++ b/slsvme.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <fortify.h>
 #include <conman.h>
-#include <servlog.h>
 #include <fortify.h>
 #include <sics.h>
 #include "evdriver.h"
diff --git a/sps.c b/sps.c
index 16a3a96..cfb5ae7 100644
--- a/sps.c
+++ b/sps.c
@@ -30,7 +30,6 @@
 #include "bit.h"
 #include "sps.i"
 #include "sps.h"
-#include "commandlog.h"
 
 /*--------------------- some internal defines ----------------------------*/
 #define SPSOFFLINE -10
@@ -108,7 +107,7 @@ static int SPSCommand(pSPS self, char *pCommand, char *pReply,
       default:
         self->iLastError = iRet;
         getRS232Error(iRet,pError,131);
-        WriteToCommandLog("SYS: SPS-TROUBLE:", pError);
+        Log(ERROR,"dev", "SPS-TROUBLE: %s", pError);
         closeRS232(rs232);
         iRet = initRS232(rs232);
         if (iRet == 0) {
@@ -444,7 +443,7 @@ int SPSGetADC(pSPS self, int iWhich, int *iValue)
   /* decode the result */
   pPtr = strchr(pBueffel, 'A');
   if (pPtr == NULL) {           /* a silly answer was returned */
-    SICSLogWrite("SPS: Silly answer in SPSGetADC", eError);
+    Log(ERROR,"dev","%s:%s", "SPS: Silly answer in SPSGetADC",pBueffel);
     return 0;
   }
   pPtr++;
diff --git a/tricssupport.c b/tricssupport.c
index 587b017..f40c2c9 100644
--- a/tricssupport.c
+++ b/tricssupport.c
@@ -78,7 +78,7 @@ static int FrameSupInterest(int iEvent, void *pEvent, void *pUser)
   iFrame = (int *) pEvent;
   assert(pCon);
   sprintf(pBueffel, "framenumber = %d", *iFrame);
-  SCWrite(pCon, pBueffel, eWarning);
+  SCWrite(pCon, pBueffel, eEvent);
   return 1;
 }