linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some compiler warnings and non-multichan code

Browse Source 
r1512 | dcl | 2007-02-19 12:35:58 +1100 (Mon, 19 Feb 2007) | 2 lines
This commit is contained in:
Douglas Clowes
2007-02-19 12:35:58 +11:00
parent 696227ffc8
commit 75fe8b6d1f
1 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
site_ansto/nhq200driv.c
View File

@@ -56,7 +56,6 @@ typedef struct __EVDriver *pEVDriver;
#include <sics.h> #include <sics.h>
#include <modriv.h> #include <modriv.h>
*/ */
#include <rs232controller.h>
#include <nwatch.h> #include <nwatch.h>
#include <multichan.h> #include <multichan.h>
#include "hardsup/nhq200util.h" #include "hardsup/nhq200util.h"
@@ -137,7 +136,7 @@ static int NHQ200Error(pEVDriver self, int *iCode, char *error, int iErrLen)
*iCode = pMe->iLastError; *iCode = pMe->iLastError;
if(pMe->iLastError == SHITTYVALUE) if(pMe->iLastError == SHITTYVALUE)
{ {
strncpy(error,"Invalid temperature returned form NHQ200, check sensor",iErrLen); strncpy(error,"Invalid voltage returned from NHQ200, check unit",iErrLen);
} }
else else
{ {
@@ -194,7 +193,6 @@ static int NHQ200Init(pEVDriver self)
static int NHQ200Close(pEVDriver self) static int NHQ200Close(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -349,7 +347,6 @@ int ConfigNHQ200(pEVDriver self)
int SetSensorNHQ200(pEVDriver self, int iSensor) int SetSensorNHQ200(pEVDriver self, int iSensor)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -368,7 +365,6 @@ int SetSensorNHQ200(pEVDriver self, int iSensor)
int SetControlNHQ200(pEVDriver self, int iSensor) int SetControlNHQ200(pEVDriver self, int iSensor)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -387,7 +383,6 @@ int SetControlNHQ200(pEVDriver self, int iSensor)
int SetTMONHQ200(pEVDriver self, int iSensor) int SetTMONHQ200(pEVDriver self, int iSensor)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -404,7 +399,6 @@ int SetTMONHQ200(pEVDriver self, int iSensor)
int GetControlNHQ200(pEVDriver self) int GetControlNHQ200(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -416,7 +410,6 @@ int GetControlNHQ200(pEVDriver self)
int GetSensorNHQ200(pEVDriver self) int GetSensorNHQ200(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -428,7 +421,6 @@ int GetSensorNHQ200(pEVDriver self)
int GetTMONHQ200(pEVDriver self) int GetTMONHQ200(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -440,7 +432,6 @@ int GetTMONHQ200(pEVDriver self)
float GetDivisorNHQ200(pEVDriver self) float GetDivisorNHQ200(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -452,7 +443,6 @@ float GetDivisorNHQ200(pEVDriver self)
int SetDivisorNHQ200(pEVDriver self, float fDiv) int SetDivisorNHQ200(pEVDriver self, float fDiv)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -466,7 +456,6 @@ int SetDivisorNHQ200(pEVDriver self, float fDiv)
float GetMultNHQ200(pEVDriver self) float GetMultNHQ200(pEVDriver self)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;
@@ -478,7 +467,6 @@ float GetMultNHQ200(pEVDriver self)
int SetMultNHQ200(pEVDriver self, float fDiv) int SetMultNHQ200(pEVDriver self, float fDiv)
{ {
pNHQ200Driv pMe = NULL; pNHQ200Driv pMe = NULL;
int iRet;
assert(self); assert(self);
pMe = (pNHQ200Driv )self->pPrivate; pMe = (pNHQ200Driv )self->pPrivate;