Cleaned up ANSTO code to merge with sinqdev.sics

This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h

devser.c

@@ -228,7 +228,7 @@ void DevAsconStatistics(DevSer *self, double *avg, \
 	*longCount = self->maxCount;
 }
 
-static int DevQueueTask(void *ds)
+int DevQueueTask(void *ds)
 {
   DevSer *devser = ds;
   DevAction *action;
@@ -256,17 +256,19 @@ static int DevQueueTask(void *ds)
        * TODO: this may be a place to record the end time
        */
       if(devser->startTime > 0){
-    	  LogResponse(devser,1);
+        LogResponse(devser,1);
       } else {
-    	/* This is a follow up error and should not go into statistics */
+        /* This is a follow up error and should not go into statistics */
       }
     } else if (devser->status == AsconReady) {
       replyData = AsconRead(devser->ascon);
       if(replyData != NULL){
-    	  LogResponse(devser,0);
+        LogResponse(devser,0);
       }
+    } else if (devser->status == AsconOffline) {
+      replyData = "ASCERR: offline";
     } else {
-    	return 1;
+      return 1;
     }
     if (devser->steps > 0) {    /* debugging mode */
       devser->steps--;
@@ -308,7 +310,8 @@ DevSer *DevMake(SConnection * con, int argc, char *argv[])
   devser->steps = -1;           /* no debugging by default */
   devser->status = AsconUnconnected;
   devser->startTime = -1;
-  TaskRegister(pServ->pTasker, DevQueueTask, NULL, NULL, devser, 0);
+  TaskRegisterN(pServ->pTasker, AsconHostport(ascon),
+		DevQueueTask, NULL, NULL, devser, 0);
   return devser;
 }
 
@@ -330,7 +333,8 @@ static void DevReset(DevSer * devser)
       devser->current->kill(devser->current->data);
     }
     devser->killCurrent = 0;
-   /* free(devser->current); */
+    free(devser->current); 
+    devser->current = NULL;
   }
 }
 
@@ -601,3 +605,7 @@ char *DevStatus(DevSer *devser) {
 double DevGetSetTimeout(DevSer *devser, double timeout, int setmode) {
   return AsconGetSetTimeout(devser->ascon, timeout, setmode);
 }
+
+int DevReconnectInterval(DevSer *devser, int interval) {
+  return AsconReconnectInterval(devser->ascon, interval);
+}