A bit more TDMA work; preparing to add 'burst' mode to FSK

git-svn-id: https://svn.code.sf.net/p/freetel/code@3361 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/fsk.c b/codec2-dev/src/fsk.c
index 931f8468502222399fb736e8b0e409e9ca48960c..bd97e3a1c2e31d55dd8256ba09a369b4ea291f90 100644 (file)
--- a/codec2-dev/src/fsk.c
+++ b/codec2-dev/src/fsk.c
@@ -110,6 +110,8 @@ static void fsk_generate_hann_table(struct FSK* fsk){
 }
 #endif
 
+
+
 /*---------------------------------------------------------------------------*\
 
   FUNCTION....: fsk_create_hbr

diff --git a/codec2-dev/src/tdma.c b/codec2-dev/src/tdma.c
index 6674e662660305913755636b9551cb40fc98d31f..50d400ff31ee97b166dc1321170bcc8b4b4dff5b 100644 (file)
--- a/codec2-dev/src/tdma.c
+++ b/codec2-dev/src/tdma.c
@@ -119,7 +119,9 @@ void tdma_rx_no_sync(struct TDMA_MODEM * tdma, COMP * samps, u64 timestamp){
 
     /*
     Pseudocode:
-        copy into samp buffer (? may want to let the downstream stuff do this; We may not even really need a local samp buffer)
+        copy into samp buffer 
+            (? may want to let the downstream stuff do this; We may not even really need a local samp buffer)
+            (could/probably should do this in tdma_rx)
         demod a half slot
         look for UW in slot-wide bit buffer
         if UW found
@@ -127,7 +129,8 @@ void tdma_rx_no_sync(struct TDMA_MODEM * tdma, COMP * samps, u64 timestamp){
           set slot offset to match where a frame should be
           go to slot_sync_rx to try and decode found frame
         else  
-          set up for next half slot, repeat        
+          set up for next half slot, repeat 
+            next half slot overlaps current slot      
    */
 }
 

diff --git a/codec2-dev/src/tdma.h b/codec2-dev/src/tdma.h
index 7e473b9cc7006bd73860905847bf9406cd2a8552..c00b222c9416b686ea10c6b21a2d31c606454f3f 100644 (file)
--- a/codec2-dev/src/tdma.h
+++ b/codec2-dev/src/tdma.h
@@ -122,7 +122,7 @@ u32 tdma_get_N(struct TDMA_MODEM * tdma);
  Put 1 slot's worth of samples into the TDMA modem
  TODO: I'm still not entirely sure of what I want the semantics of this to look like
 */
-void tdma_rx(struct TDMA_MODEM * tdma, COMP * samps);
+void tdma_rx(struct TDMA_MODEM * tdma, COMP * samps,u64 timestamp);
 
 /* Hideous debug function */
 void tdma_print_stuff(struct TDMA_MODEM * tdma);