remove unused variables

r2422 | dcl | 2008-04-14 09:23:13 +1000 (Mon, 14 Apr 2008) | 2 lines
This commit is contained in:
Douglas Clowes
2008-04-14 09:23:13 +10:00
parent 6e49b1e6c1
commit 149d825a3a
3 changed files with 7 additions and 27 deletions

View File

@@ -191,7 +191,6 @@
static int LAKESHORE340Close(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -253,12 +252,13 @@
}
/*--------------------------------------------------------------------------*/
static int LAKESHORE340Halt(pEVDriver *self)
/* static int LAKESHORE340Halt(pEVDriver *self)
{
assert(self);
return 1;
}
*/
/*------------------------------------------------------------------------*/
void KillLAKESHORE340(void *pData)
{
@@ -345,7 +345,6 @@
int SetSensorLAKESHORE340(pEVDriver self, int iSensor)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -365,7 +364,6 @@
int SetControlLAKESHORE340(pEVDriver self, int iSensor)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -385,7 +383,6 @@
int SetTMOLAKESHORE340(pEVDriver self, int iSensor)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -402,7 +399,6 @@
int GetControlLAKESHORE340(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -414,7 +410,6 @@
int GetSensorLAKESHORE340(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -426,7 +421,6 @@
int GetTMOLAKESHORE340(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -438,7 +432,6 @@
float GetDivisorLAKESHORE340(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -450,7 +443,6 @@
int SetDivisorLAKESHORE340(pEVDriver self, float fDiv)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -464,7 +456,6 @@
float GetMultLAKESHORE340(pEVDriver self)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;
@@ -476,7 +467,6 @@
int SetMultLAKESHORE340(pEVDriver self, float fDiv)
{
pLAKESHORE340Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLAKESHORE340Driv )self->pPrivate;

View File

@@ -344,7 +344,6 @@
int SetSensorLH45(pEVDriver self, int iSensor)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -364,7 +363,6 @@
int SetControlLH45(pEVDriver self, int iSensor)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -384,7 +382,6 @@
int SetTMOLH45(pEVDriver self, int iSensor)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -401,7 +398,6 @@
int GetControlLH45(pEVDriver self)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -413,7 +409,6 @@
int GetSensorLH45(pEVDriver self)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -425,7 +420,6 @@
int GetTMOLH45(pEVDriver self)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -437,7 +431,6 @@
float GetDivisorLH45(pEVDriver self)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -449,7 +442,6 @@
int SetDivisorLH45(pEVDriver self, float fDiv)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -463,7 +455,6 @@
float GetMultLH45(pEVDriver self)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;
@@ -475,7 +466,6 @@
int SetMultLH45(pEVDriver self, float fDiv)
{
pLH45Driv pMe = NULL;
int iRet;
assert(self);
pMe = (pLH45Driv )self->pPrivate;

View File

@@ -123,7 +123,7 @@ static void UpdateRunningTime(ASIMDriv *);
static void UpdatePosition(ASIMDriv *);
static float SimRandom(void);
static int SimHalt(void *);
static int RunComplete(ASIMDriv *);
/* static int RunComplete(ASIMDriv *); */
static int SimGetPos(void *, float *);
static int SimRun(void *, float);
static void SimError(void *self, int *iCode, char *error, int iErrLen);
@@ -153,17 +153,18 @@ static int SimStat(void *self);
/*----------------------------------------------------------------------------*/
static void UpdatePosition(ASIMDriv *pDriv)
{
float fDirn = 1.0;
UpdateRunningTime(pDriv);
pDriv->fPos = pDriv->fTarget;
pDriv->iStatus = ASIM_IDLE;
}
/*---------------------------------------------------------------------------*/
#if 0
static int RunComplete(ASIMDriv *pDriv)
{
UpdatePosition(pDriv);
if(ASIM_BUSY!=pDriv->iStatus) return 1; else return 0;
}
#endif
/*----------------------------------------------------------------------------*/
static int SimGetPos(void *self, float *fPos)
{
@@ -336,8 +337,6 @@ static int SimStat(void *self);
static int SimFix(void *self, int iError, float fNew)
{
ASIMDriv *pDriv;
int iRet;
float fRand;
assert(self);
pDriv = (ASIMDriv *)self;
@@ -470,8 +469,9 @@ static int SimGetPar(void *self, char *name, float *value)
/*-----------------------------------------------------------------------*/
static void SimListPar(void *self, char *motorName, SConnection *pCon)
{
ASIMDriv *pDriv = (ASIMDriv *) self;
/* ASIMDriv *pDriv = (ASIMDriv *) self;
char pBuffer[256];
*/
assert(self);
assert(pCon);