misc cleanup

4 files changed, 13 insertions, 6 deletions

diff --git a/gsm-tvoid/src/lib/gsm_burst.cc b/gsm-tvoid/src/lib/gsm_burst.cc
index 176b1ad..c52ff38 100755
--- a/gsm-tvoid/src/lib/gsm_burst.cc
+++ b/gsm-tvoid/src/lib/gsm_burst.cc
@@ -737,7 +737,7 @@ int gsm_burst::get_burst(void)
 				//haven't started counting
 				// get some good syncs before trying again
 				if ((SCH == d_burst_type) && (++wait_count > 5)) {	
-					fprintf(stdout,"restarting good_count\n");
+					//fprintf(stdout,"restarting good_count\n");
 					good_count = wait_count = 0;
 					//tune away
 					if (p_tuner) { 
diff --git a/gsm-tvoid/src/lib/gsm_burst.h b/gsm-tvoid/src/lib/gsm_burst.h
index 9287a1d..056516c 100755
--- a/gsm-tvoid/src/lib/gsm_burst.h
+++ b/gsm-tvoid/src/lib/gsm_burst.h
@@ -76,6 +76,7 @@ enum EQ_TYPE {
 	EQ_ADAPTIVE_LINEAR,
 	EQ_FIXED_DFE,
 	EQ_ADAPTIVE_DFE,
+	EQ_ADAPT_TRAINING,
 	EQ_VITERBI
 };
 
diff --git a/gsm-tvoid/src/lib/gsm_burst_cf.cc b/gsm-tvoid/src/lib/gsm_burst_cf.cc
index a7d0e11..caddb5f 100755
--- a/gsm-tvoid/src/lib/gsm_burst_cf.cc
+++ b/gsm-tvoid/src/lib/gsm_burst_cf.cc
@@ -39,6 +39,10 @@ gsm_burst_cf::gsm_burst_cf (gr_feval_ll *t, float sample_rate) :
 	
 //	fprintf(stderr,"Sample interval      : %e\n",d_sample_interval);
 //	fprintf(stderr,"Relative sample rate : %g\n",d_omega);
+	
+	
+	//set_relative_rate( mm.d_omega / 156);
+	set_relative_rate( 1.0 / (mm.d_omega * 156) );
 			
 	set_history(4); //need history for interpolator
 	
@@ -51,9 +55,11 @@ gsm_burst_cf::~gsm_burst_cf ()
 
 void gsm_burst_cf::forecast (int noutput_items, gr_vector_int &ninput_items_required)
 {
-  unsigned ninputs = ninput_items_required.size ();
-  for (unsigned i = 0; i < ninputs; i++)
-    ninput_items_required[i] = noutput_items * (int)ceil(mm.d_omega) * BBUF_SIZE + history();
+	unsigned ninputs = ninput_items_required.size ();
+	for (unsigned i = 0; i < ninputs; i++) {
+		ninput_items_required[i] = noutput_items * (int)ceil(mm.d_omega) * TS_BITS;
+		//fprintf(stderr,"forecast[%d]: %d = %d\n",i,noutput_items,ninput_items_required[i]);
+	}
 }
 
 int gsm_burst_cf::general_work (int noutput_items,
@@ -70,7 +76,7 @@ int gsm_burst_cf::general_work (int noutput_items,
 	int do_output = num_outputs > 0 ? 1 : 0;
 
 	int ninput = ninput_items[0];
-	//fprintf(stderr,"#i=%d/#o=%d",n_input,noutput_items);
+	//fprintf(stderr,"#i=%d/#o=%d",ninput,noutput_items);
 
 	int  ni = ninput - d_interp->ntaps() - 16;  // interpolator need -4/+3 samples NTAPS = 8  , - 16 for safety margin
 	
diff --git a/gsm-tvoid/src/lib/gsm_constants.h b/gsm-tvoid/src/lib/gsm_constants.h
index c404b57..942736d 100644
--- a/gsm-tvoid/src/lib/gsm_constants.h
+++ b/gsm-tvoid/src/lib/gsm_constants.h
@@ -13,7 +13,7 @@
 #define USEFUL_BITS		142	 //(2*DATA_BITS + N_TRAIN_BITS )

 #define FCCH_BITS		USEFUL_BITS

 

-#define TS_BITS			(TAIL_BITS+USEFUL_BITS+TAIL_BITS+GUARD_BITS)  //a full TS

+#define TS_BITS			(TAIL_BITS+USEFUL_BITS+TAIL_BITS+GUARD_BITS)  //a full TS (156)

 #define TS_PER_FRAME	8

 #define FRAME_BITS		(TS_PER_FRAME * TS_BITS + 2)	// +2 for extra 8*0.25 guard bits

 #define FCCH_POS		TAIL_BITS