diff --git a/nserver.c b/nserver.c index 85984f51..37364fe3 100644 --- a/nserver.c +++ b/nserver.c @@ -52,6 +52,7 @@ extern void NetWatchInit(void); /* in nwatch.c */ #define DEFAULTINIFILE "servo.tcl" #define DEFAULTSTATUSFILE "sicsstat.tcl" +#define INIT(F) { void F(void); F(); } static int iFortifyScope; @@ -259,6 +260,8 @@ int InitServer(char *file, pServer * pServ) SCInvoke(self->dummyCon, self->pSics, pBueffel); } + INIT(StatusFileInit); + /* exit handlers need to be installed here */ atexit(StopExit); (void)Fortify_CheckAllMemory(); diff --git a/ofac.c b/ofac.c index 1d2fe6cd..a40791f9 100644 --- a/ofac.c +++ b/ofac.c @@ -34,7 +34,6 @@ static void InitGeneral(void) INIT(SctDriveAdapterInit); INIT(LogReaderInit); INIT(LogSetupInit); - INIT(StatusFileInit); INIT(InstallBackground); INIT(MakeProtocol); INIT(CommandLogInit); diff --git a/sctdriveobj.c b/sctdriveobj.c index a50bcd5e..dc0d4b18 100644 --- a/sctdriveobj.c +++ b/sctdriveobj.c @@ -384,6 +384,7 @@ int SctMakeDriveObject(SConnection * pCon, SicsInterp * pSics, RegisterSICSOBJKillCmd(pNew, argv[1]); } SetHdbProperty(pNew->objectNode, "sicsdev", argv[1]); + SetHdbProperty(pNew->objectNode, "type", "drivable"); status = AddCommand(pSics, argv[1], InterInvokeSICSOBJ, KillDriveOBJ, pNew); if (status != 1) { diff --git a/tcl/slsecho.tcl b/tcl/slsecho.tcl index 175d0421..98056666 100644 --- a/tcl/slsecho.tcl +++ b/tcl/slsecho.tcl @@ -25,7 +25,8 @@ proc slsecho::readreply {} { proc slsecho::sendwrite {num} { set val [sct target] hupdate [sct]/stop 0 - sct send "$num:w:0x90:$val:write" +# sct send "$num:w:0x90:$val:write" + sct send "$num:s:0x9c:$val:write" return readreply } #-------------------------------------------------------------- diff --git a/test/testini.tcl b/test/testini.tcl index dbae45bb..56b96b54 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -718,8 +718,8 @@ makesctcontroller echo testprot testprot.dat source ../tcl/stddrive.tcl source ../tcl/slsecho.tcl -makesctcontroller slssct slsecho taspmagnet:5001 -#makesctcontroller slssct slsecho localhost:8080 +#makesctcontroller slssct slsecho taspmagnet:5001 +makesctcontroller slssct slsecho localhost:8080 slsecho::makeslsecho ma1 0 slssct }