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
This commit is contained in:
Ferdi Franceschini
2015-04-23 20:49:26 +10:00
parent c650788a2c
commit 10d29d597c
1336 changed files with 9430 additions and 226646 deletions

18
event.h
View File

@@ -1,5 +1,5 @@
#line 103 "event.w"
#line 108 "event.w"
/*----------------------------------------------------------------------------
E V E N T
@@ -18,7 +18,7 @@
int Text2Event(char *pText);
#line 116 "event.w"
#line 121 "event.w"
@@ -49,12 +49,10 @@
#define STEND 22
#define NEWTARGET 23
#define DIMCHANGE 24
#define STPAUSE 25
#define STCONTINUE 26
#define STBUSY 27
#define STIDLE 28
#define IPAUSE 25
#define CONTINUE 26
#line 118 "event.w"
#line 123 "event.w"
/*----------------- event data structure for the NEWTARGET event ---------*/
@@ -64,15 +62,15 @@ typedef struct {
} NewTarget, *pNewTarget;
/*--------------- Signals for the Signalfunction of each task ------------*/
#line 85 "event.w"
#line 90 "event.w"
#define SICSINT 300
#define SICSBROADCAST 301
#define TOKENGRAB 302
#define TOKENRELEASE 303
#define COMLOG 304
#define CRONLIST 305
#define CRONFUNC 305
#line 126 "event.w"
#line 131 "event.w"
#endif