initial merge complete

9 files changed, 7 insertions, 0 deletions

diff --git a/gsm-tvoid/src/lib/Makefile.am b/gsm-tvoid/src/lib/Makefile.am
index 2d4d7f7..2d4d7f7 100755..100644
--- a/gsm-tvoid/src/lib/Makefile.am
+++ b/gsm-tvoid/src/lib/Makefile.am
diff --git a/gsm-tvoid/src/lib/gsm.i b/gsm-tvoid/src/lib/gsm.i
index 624cc30..624cc30 100755..100644
--- a/gsm-tvoid/src/lib/gsm.i
+++ b/gsm-tvoid/src/lib/gsm.i
diff --git a/gsm-tvoid/src/lib/gsm_burst.cc b/gsm-tvoid/src/lib/gsm_burst.cc
index d83bde4..711d3e7 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst.cc
+++ b/gsm-tvoid/src/lib/gsm_burst.cc
@@ -241,6 +241,7 @@ void gsm_burst::print_bits(const float *data,int length)
 		data[i] < 0 ? fprintf(stderr,"+") : fprintf(stderr,".");
 		
 }
+
 void gsm_burst::soft2hardbit(char *dst, const float *data, int len)
 {
 	for (int i=0; i < len; i++)
diff --git a/gsm-tvoid/src/lib/gsm_burst.h b/gsm-tvoid/src/lib/gsm_burst.h
index 15566a9..d80b9a9 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst.h
+++ b/gsm-tvoid/src/lib/gsm_burst.h
@@ -10,6 +10,8 @@
 #include <gr_math.h>
 //#include <Python.h>		//for callback testing
 #include <gr_feval.h>
+#include "gsmstack.h"
+
 
 //Console printing options
 #define PRINT_NOTHING		0x00000000
@@ -110,6 +112,9 @@ protected:
 	int 			d_corr_maxpos;
 	int				d_corr_center;
 		
+	///// GSM Stack
+	GS_CTX			d_gs_ctx;
+
 	///// Burst information
 	SYNC_STATE		d_sync_state;
 	SYNC_STATE		d_last_sync_state;
@@ -146,6 +151,7 @@ protected:
 
 	void	print_bits(const float *data,int length);
 	void	print_hex(const unsigned char *data,int length);
+	void	soft2hardbit(char *dst, const float *data, int len);
 	void	print_burst(void);
 
 	void	diff_encode(const float *in,float *out,int length,float lastbit = 1.0);	
diff --git a/gsm-tvoid/src/lib/gsm_burst_cf.cc b/gsm-tvoid/src/lib/gsm_burst_cf.cc
index f08424d..f08424d 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst_cf.cc
+++ b/gsm-tvoid/src/lib/gsm_burst_cf.cc
diff --git a/gsm-tvoid/src/lib/gsm_burst_cf.h b/gsm-tvoid/src/lib/gsm_burst_cf.h
index fe742c4..fe742c4 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst_cf.h
+++ b/gsm-tvoid/src/lib/gsm_burst_cf.h
diff --git a/gsm-tvoid/src/lib/gsm_burst_ff.cc b/gsm-tvoid/src/lib/gsm_burst_ff.cc
index 25f9421..25f9421 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst_ff.cc
+++ b/gsm-tvoid/src/lib/gsm_burst_ff.cc
diff --git a/gsm-tvoid/src/lib/gsm_burst_ff.h b/gsm-tvoid/src/lib/gsm_burst_ff.h
index 30047f2..30047f2 100755..100644
--- a/gsm-tvoid/src/lib/gsm_burst_ff.h
+++ b/gsm-tvoid/src/lib/gsm_burst_ff.h
diff --git a/gsm-tvoid/src/lib/gsm_constants.h b/gsm-tvoid/src/lib/gsm_constants.h
index c404b57..c404b57 100755..100644
--- a/gsm-tvoid/src/lib/gsm_constants.h
+++ b/gsm-tvoid/src/lib/gsm_constants.h