Made SICS PSI part compile on OSX Maverick with clang

This commit is contained in:
2014-03-14 09:51:48 +01:00
parent fc0ff43db2
commit 71c03ee3d1
13 changed files with 63 additions and 17 deletions

View File

@ -207,8 +207,8 @@ static int enableTdc(pTdc self)
*/
in.c = 0;
in.b = self->range;
in.d = (char) ((self->n >> 8) && 255);
in.e = (char) (self->n && 255);
in.d = (char) ((self->n >> 8) & 255);
in.e = (char) (self->n & 255);
return ecbExecute(self->tdc, 131, in, &out);
}
@ -286,7 +286,7 @@ static int TDCHalt(pHistDriver self)
static int TDCCountStatus(pHistDriver self, SConnection * pCon)
{
pTdc tdc = NULL;
int tdcstatus, status;
int tdcstatus, status = HWFault;
float fControl, fOldControl;
MonEvent sMon;