S K UCI / Mbed 2 deprecated AutonomousDAQ

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
6:6f002d202f59
Parent:
3:24c5f0f50bf1
Child:
8:95a325df1f6b
--- a/SnCommWin.h	Fri Aug 03 00:04:34 2012 +0000
+++ b/SnCommWin.h	Fri Aug 03 23:50:57 2012 +0000
@@ -29,28 +29,15 @@
  private:
     //bool                    fWinOpen;  // whether this comm should listen
     
-            ECommWinResult SendData(FILE* inf, const char* infn,
-                                    const SnConfigFrame& curConf,
-                                    SnEventFrame& evt,
-                                    char* const genBuf,
-                                    const uint32_t nevts,
-                                    const uint32_t firstEvt=0);
-/*
-            ECommWinResult  SendData(const char* infn,
-                                     const SnConfigFrame& curConf,
-                                     SnEventFrame& evt,
-                                     char* const genBuf,
-                                     const uint32_t nevts,
-                                     const uint32_t firstEvt=0);
-*/
 
  protected:
-    virtual ECommWinResult  SendConfAndEvents(FILE* inf,
-                                              const SnConfigFrame& curConf,
-                                              SnEventFrame& evt,
-                                              char* const genBuf,
-                                              const uint32_t nevts,
-                                              const uint32_t firstEvt=0)=0;
+    virtual SnCommWin::ECommWinResult SendFileContents(FILE* inf,
+                                                    const SnConfigFrame& curConf,
+                                                    SnEventFrame& evt,
+                                                    char* const genBuf,
+                                                    uint32_t nevts,
+                                                    const uint32_t timeout_clock,
+                                                    const uint32_t firstEvt=0)=0;
  public:
     virtual ~SnCommWin() {}
     
@@ -64,27 +51,38 @@
 
     virtual ECommWinResult  WaitHandshake(const uint32_t timeout,
                                           char* const buf,
-                                          const uint32_t bsize)=0;
+                                          const uint32_t bsize,
+                                          uint8_t& hndShkCode)=0;
     
     virtual ECommWinResult  GetConfig(SnConfigFrame& conf,
                                       const uint32_t timeOut,
                                       char* const confBuf,
                                       const uint32_t bsize)=0;
     
-    virtual ECommWinResult  SendFilename(const char* fn, char* const genBuf)=0; 
-
     virtual ECommWinResult  SendStatus(const SnConfigFrame& conf,
                                        const SnEventFrame& evt,
-                                       char* const genBuf)=0;
+                                       char* const genBuf,
+                                       const uint32_t timeout_clock)=0;
             
+    virtual SnCommWin::ECommWinResult SendFilename(const char* fn,
+                                                   char* const genBuf,
+                                                   const uint32_t timeout_clock)=0;
+
+            ECommWinResult SendData(FILE* inf, const char* infn,
+                                    const SnConfigFrame& curConf,
+                                    SnEventFrame& evt,
+                                    char* const genBuf,
+                                    const uint32_t bsize,
+                                    const uint32_t nevts,
+                                    const uint32_t timeout_clock,
+                                    const uint32_t firstEvt=0);
+
             ECommWinResult  SendData(SnConfigFrame& conf,
                                      SnEventFrame& evt,
                                      char* const genBuf,
                                      const uint32_t bsize,
                                      const uint32_t timeout);
     
-    virtual ECommWinResult  SendData(FILE* inf)=0;
-    
 };
 
 #endif // SN_SnCommWin