--- yoda/techmodel/LogReader.cpp 2004/12/09 08:48:41 2.2 +++ yoda/techmodel/LogReader.cpp 2005/03/04 15:54:11 3.0 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v $ - * $Id: LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $ + * $Id: LogReader.cpp,v 2.4 2005/03/03 13:06:39 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -41,7 +41,7 @@ */ std::string LogReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.4 2005/03/03 13:06:39 kusanagi Exp $\n"; } /** @@ -68,12 +68,14 @@ dataLength = length - (long int)2; subData = new char[dataLength]; - InputFile->read(subData, sizeof(unsigned char)*dataLength); - subCRC = CM_Compute_CRC16(0, (BYTE*)&subData, dataLength); + //InputFile->read(subData, sizeof(unsigned char)*dataLength); + InputFile->read(subData, length); + subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength); //took the final CRC to compare it with the previous calculated CRC of the data - InputFile->read(eventCRC, sizeof(eventCRC)); - readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF); + readCRC = (((UINT16)(eventCRC[length - 2]<<8))&0xFF00) + (((UINT16)eventCRC[length - 1])&0x00FF); + + //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet "); Log->COMPILATION_TIMESTAMP = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) + (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF); long int offset = 4; @@ -91,5 +93,5 @@ rec->INFO1 = (((UINT32)subData[offset+8]<<24)&0xFF000000) + (((UINT32)subData[offset+9]<<16)&0x00FF0000) + (((UINT32)subData[offset+10]<<8)&0x0000FF00) + (((UINT32)subData[offset+11])&0x000000FF); offset = offset + 12; } - delete [] subData; + //delete [] subData; }