Diff: SnSDUtils.cpp

Revision:

5:9cea89700c66

Parent:

4:a91682e19d6b

Child:

6:6f002d202f59

--- a/SnSDUtils.cpp	Thu Aug 02 05:42:47 2012 +0000
+++ b/SnSDUtils.cpp	Fri Aug 03 00:04:34 2012 +0000
@@ -6,13 +6,15 @@
 
 #include "SnConfigFrame.h"
 #include "SnEventFrame.h"
-#include "SnPowerFrame.h"
 
 
 const char* const SnSDUtils::kSDsubDir  = "/sd";
 char              SnSDUtils::fgCurFileName[kFNBufSize]={0};
 FILE*             SnSDUtils::fgCurFile  = 0;
 const uint8_t     SnSDUtils::kIOvers    = 2;
+const uint32_t    SnSDUtils::kMaxSizeOfFileHdr = 
+    sizeof(uint8_t)+sizeof(uint64_t)+sizeof(uint32_t)+sizeof(uint16_t)
+    +SnPowerFrame::kMaxSizeOf;
 
 static const uint16_t __kMaxUShort = ~0;
 
@@ -107,33 +109,6 @@
     return fgCurFile;
 }
 
-bool SnSDUtils::WriteFileHeader(FILE* f, const uint64_t macadr,
-                                const uint32_t run, const uint16_t seq,
-                                const uint16_t v1, const uint16_t v2) {
-    // MUST INCREMENT kIOvers if these writes are altered
-    fwrite(&kIOvers, sizeof(uint8_t), 1, f);
-    fwrite(&macadr, sizeof(uint64_t), 1, f);
-    fwrite(&run, sizeof(uint32_t), 1, f);
-    fwrite(&seq, sizeof(uint16_t), 1, f);
-    SnPowerFrame::WriteTo(f, v1, v2);
-    fflush(f);
-    return ferror(f);
-}
-
-bool SnSDUtils::ReadFileHeader(FILE* f, uint64_t& macadr,
-                               uint32_t& run, uint16_t& seq,
-                               uint16_t& v1, uint16_t& v2) {
-    uint8_t Rv=0;
-    fread(&Rv, sizeof(uint8_t), 1, f);
-    fread(&macadr, sizeof(uint64_t), 1, f);
-    fread(&run, sizeof(uint32_t), 1, f);
-    fread(&seq, sizeof(uint16_t), 1, f);
-    if (Rv>1) {
-        SnPowerFrame::ReadFrom(f, v1, v2);
-    }
-    return ferror(f);
-}
-
 bool SnSDUtils::WriteEventTo(FILE* efile, char* const evtBuf,
                              const SnEventFrame& evt,
                              const SnConfigFrame& conf) {