Fixed freedv_tx issue on 2400A

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

diff --git a/codec2-dev/src/freedv_tx.c b/codec2-dev/src/freedv_tx.c
index df8b481f2d6c6d2f6473bb82f722345773704128..5565fb416d222611f8492b1cc0a2c55b4798a172 100644 (file)
--- a/codec2-dev/src/freedv_tx.c
+++ b/codec2-dev/src/freedv_tx.c
@@ -132,7 +132,6 @@ int main(int argc, char *argv[]) {
     }
 
     freedv = freedv_open(mode);
-    freedv_set_alt_modem_samp_rate(freedv,96000);
     assert(freedv != NULL);
 
     use_codectx = 0;

diff --git a/codec2-dev/src/tdma.h b/codec2-dev/src/tdma.h
index ec7f54aac4fa7564181aae99ab42fdb02a2e02a9..f0e45898e122c9dc700d6d00c4e7b7ef3cddd0b2 100644 (file)
--- a/codec2-dev/src/tdma.h
+++ b/codec2-dev/src/tdma.h
@@ -25,6 +25,8 @@
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __CODEC_2_TDMA_H
+#define __CODEC_2_TDMA_H
 
 #include "fsk.h"
 #include "freedv_vhf_framing.h"
@@ -34,7 +36,7 @@ enum slot_state {
     rx_no_sync,         /* Not synched */
     rx_sync,            /* Sunk */
     tx_client,          /* TX but timed from a different master */
-    tx_master
+    tx_master           /* TX in master mode */
 };
 
 /* The state of the entire TDMA modem */
@@ -42,6 +44,7 @@ enum tdma_state {
     no_sync,            /* No sync */
     pilot_sync,         /* Pilot modem has gotten sync, but slots haven't*/
     slot_sync,          /* One or more slots are sunk */
+    master_sync,        /* This modem is the TDMA master */
 };
 
 /* TDMA slot struct */
@@ -50,4 +53,10 @@ struct TDMA_SLOT {
     struct FSK * fsk;   /* The FSK modem for this slot */
     enum slot_state state;
 };
+
+/* TDMA modem */
+struct TDMA_MODEM {
     
+};
+
+#endif