- SICS cleanup: removed unused code

psi.c

@@ -16,16 +16,10 @@
 #include <tcl.h>
 #include <site.h>
 #include "buffer.h"
-#include "dmc.h"
-#include "nxsans.h"
-#include "nextrics.h"
 #include "sps.h"
 #include "pimotor.h"
 #include "sanswave.h"
 #include "faverage.h"
-#include "fowrite.h"
-#include "amor2t.h"
-#include "nxamor.h"
 #include "amorstat.h"
 #include "tas.h"
 #include "swmotor.h"
@@ -42,11 +36,9 @@
 #include "bruker.h"
 #include "ltc11.h"
 #include "A1931.h"
-#include "dilludriv.h"
 #include "eurodriv.h"
 #include "el755driv.h"
 #include <evdriver.i>
-#include "amorscan.h"
 #include "serial.h"
 #include "fomerge.h"
 #include "remob.h"
@@ -57,11 +49,6 @@
 #include "sinqhttp.h"
 #include "poldizug.h"
 #include "autowin.h"
-/* 
-  from tcpdornier.c
-*/
-extern int VelSelTcpFactory(SConnection * pCon, SicsInterp * pSics,
-                            void *pData, int argc, char *argv[]);
 /*
  * from julcho.c
  */
@@ -128,17 +115,11 @@ static pSite sitePSI = NULL;
 static void AddPsiCommands(SicsInterp * pInter)
 {
   AddCommand(pInter, "MakeRuenBuffer", InitBufferSys, NULL, NULL);
-  AddCommand(pInter, "InitDMC", InitDmc, NULL, NULL);
-  AddCommand(pInter, "InitSANS", InitSANS, NULL, NULL);
-  AddCommand(pInter, "MakeTRICSNEXUS", NexTricsFactory, NULL, NULL);
   AddCommand(pInter, "MakeTRICSSupport", MakeTricsSupport, NULL, NULL);
   AddCommand(pInter, "MakeSPS", SPSFactory, NULL, NULL);
   AddCommand(pInter, "MakePIMotor", PIMotorFactory, NULL, NULL);
   AddCommand(pInter, "MakeSANSWave", MakeSANSWave, NULL, NULL);
   AddCommand(pInter, "MakeFocusAverager", MakeFA, NULL, NULL);
-  AddCommand(pInter, "FocusInstall", FoInstall, NULL, NULL);
-  AddCommand(pInter, "MakeAmor2T", Amor2TFactory, NULL, NULL);
-  AddCommand(pInter, "MakeStoreAmor", AmorStoreMake, NULL, NULL);
   AddCommand(pInter, "MakeAmorStatus", AmorStatusFactory, NULL, NULL);
   AddCommand(pInter, "MakeTAS", TASFactory, NULL, NULL);
   AddCommand(pInter, "MakeSWMotor", MakeSWMotor, NULL, NULL);
@@ -152,7 +133,6 @@ static void AddPsiCommands(SicsInterp * pInter)
   AddCommand(pInter, "MakeSinq", SinqFactory, NULL, NULL);
   AddCommand(pInter, "MakeTableDrive", TableDriveFactory, NULL, NULL);
   AddCommand(pInter, "MakeAmorSet", AmorSetFactory, NULL, NULL);
-  AddCommand(pInter, "MakeTCPSelector", VelSelTcpFactory, NULL, NULL);
   AddCommand(pInter, "MakeJulCho", JulChoFactory, NULL, NULL);
   AddCommand(pInter, "MakeRitaFix", MakeRitaFix, NULL, NULL);
   AddCommand(pInter, "MakePoldiReiss", MakePoldiReiss, NULL, NULL);
@@ -167,9 +147,6 @@ static void AddPsiCommands(SicsInterp * pInter)
 /*---------------------------------------------------------------------*/
 static void RemovePsiCommands(SicsInterp * pSics)
 {
-  RemoveCommand(pSics, "InitDMC");
-  RemoveCommand(pSics, "InitSANS");
-  RemoveCommand(pSics, "MakeTRICSNEXUS");
   RemoveCommand(pSics, "MakeTRICSSupport");
   RemoveCommand(pSics, "MakeSPS");
   RemoveCommand(pSics, "MakePIMotor");
@@ -177,10 +154,8 @@ static void RemovePsiCommands(SicsInterp * pSics)
   RemoveCommand(pSics, "MakeFocusAverager");
   RemoveCommand(pSics, "FocusInstall");
   RemoveCommand(pSics, "InstallFocusMerge");
-  RemoveCommand(pSics, "MakeAmor2T");
   RemoveCommand(pSics, "MakeStoreAmor");
   RemoveCommand(pSics, "MakeAmorStatus");
-  RemoveCommand(pSics, "MakeTCPSelector");
   RemoveCommand(pSics, "MakeJulCho");
   RemoveCommand(pSics, "MakeRitaFix");
   RemoveCommand(pSics, "MakePoldiReiss");
@@ -370,7 +345,6 @@ static pVelSelDriv CreatePsiVelSelDriv(char *name, char *array,
 extern pCodri MakeDoChoDriver(char *pHost, int iPort, int iChannel,
                               int iSingle);
 extern pCodri MakeCookerDriver(char *pHost, int iPort, int iChannel);
-extern pCodri MakeTcpDoChoDriver(char *tclArray, SConnection * pCon);
 /*-------------------------------------------------------------------*/
 static pCodri CreatePsiController(SConnection * pCon, int argc,
                                   char *argv[])
@@ -412,14 +386,6 @@ static pCodri CreatePsiController(SConnection * pCon, int argc,
       }
     }
     pNew = MakeDoChoDriver(argv[1], iPort, iChannel, iSingle);
-  } else if (strcmp(argv[0], "tcpdocho") == 0) {
-    if (argc < 2) {
-      SCWrite(pCon,
-              "ERROR: insufficient number of argumets for creating TcpDoCho",
-              eError);
-      return NULL;
-    }
-    return MakeTcpDoChoDriver(argv[1], pCon);
   } else if (strcmp(argv[0], "sanscook") == 0) {
     if (argc < 4) {
       SCWrite(pCon,
@@ -545,12 +511,6 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp * pSics,
         commandInstalled = 1;
       }
     }
-  } else if (strcmp(argv[3], "dillu") == 0) {
-    checkError = 1;
-    pDriv = CreateDILLUDriv(argc - 4, &argv[4]);
-    if (pDriv != NULL) {
-      pNew = CreateEVController(pDriv, argv[2], &status);
-    }
   } else if (strcmp(argv[3], "euro") == 0) {
     checkError = 1;
     pDriv = CreateEURODriv(argc - 4, &argv[4]);
@@ -613,10 +573,6 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp * pSics,
 /*-----------------------------------------------------------------*/
 static int ConfigurePsiScan(pScanData self, char *option)
 {
-  if (strcmp(option, "amor") == 0) {
-    ConfigureAmor(self);
-    return 1;
-  }
   return 0;
 }