- Added Sycamore protocol and command context to SICS

- Added sinfo to SICS
- Added driver for TCP/IP Astrium velocity selector
- Added driver for TCP/IP Astrium chopper controller


SKIPPED:
	psi/amor2t.c
	psi/amorstat.c
	psi/dornier2.c
	psi/ecb.c
	psi/el734hp.c
	psi/fowrite.c
	psi/libpsi.a
	psi/make_gen
	psi/nextrics.c
	psi/pardef.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/scontroller.c
	psi/serial.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tcpdocho.c
	psi/tcpdornier.c
	psi/tricssupport.c
	psi/velodornier.c
This commit is contained in:
koennecke
2005-12-22 22:16:10 +00:00
parent 603a4fc14b
commit b3138f1197
67 changed files with 4650 additions and 682 deletions

88
obdes.c
View File

@ -66,6 +66,9 @@
return NULL;
}
pRes->name = strdup(name);
pRes->pKeys = NULL;
pRes->description = NULL;
pRes->group = NULL;
pRes->SaveStatus = DefaultSave;
pRes->GetInterface = DefaultGetInterface;
return pRes;
@ -74,10 +77,10 @@
void DeleteDescriptor(pObjectDescriptor self)
{
assert(self);
if(self->name)
free(self->name);
if(self->name) free(self->name);
if(self->description) free(self->description);
if(self->group) free(self->group);
if(self->pKeys) IFDeleteOptions(self->pKeys);
free(self);
}
@ -134,11 +137,72 @@
return 0;
}
/*------------------------------------------------------------------------*/
pObjectDescriptor FindDescriptor(void *pData)
{
pDummy pDum = NULL;
assert(pData);
pDum = (pDummy)pData;
return pDum->pDescriptor;
}
pObjectDescriptor FindDescriptor(void *pData)
{
pDummy pDum = NULL;
assert(pData);
pDum = (pDummy)pData;
return pDum->pDescriptor;
}
/*--------------------------------------------------------------------------*/
void SetDescriptorKey(pObjectDescriptor self, char *keyName, char *eltValue)
{
if(NULL!=self)
{
IFSetOption(self->pKeys,keyName,eltValue);
}
}
/*--------------------------------------------------------------------------*/
void SetDescriptorGroup(pObjectDescriptor self, char *group)
{
if(NULL==self)
{
return;
}
if(NULL != self->group)
{
free(self->group);
}
self->group = strdup(group);
}
/*--------------------------------------------------------------------------*/
void SetDescriptorDescription(pObjectDescriptor self, char *description)
{
if(NULL==self)
{
return;
}
if(NULL != self->description)
{
free(self->description);
}
self->description = strdup(description);
}
/*--------------------------------------------------------------------------*/
char * GetDescriptorKey(pObjectDescriptor self, char *keyName)
{
if(NULL==self)
{
return NULL;
}
return IFindOption(self->pKeys,keyName);
}
/*--------------------------------------------------------------------------*/
char * GetDescriptorGroup(pObjectDescriptor self)
{
if(NULL==self)
{
return NULL;
}
return self->group;
}
/*--------------------------------------------------------------------------*/
char * GetDescriptorDescription(pObjectDescriptor self)
{
if(NULL==self)
{
return NULL;
}
return self->description;
}