From c4c209ff18a0809cd7517f13c69e610d41891902 Mon Sep 17 00:00:00 2001 From: piotr Date: Thu, 4 Jun 2009 13:26:55 +0200 Subject: removed compute_energy function --- src/lib/gsm_receiver_cf.cc | 12 ------------ src/lib/gsm_receiver_cf.h | 9 +++------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/lib/gsm_receiver_cf.cc b/src/lib/gsm_receiver_cf.cc index 8e3bad0..b58b108 100644 --- a/src/lib/gsm_receiver_cf.cc +++ b/src/lib/gsm_receiver_cf.cc @@ -577,18 +577,6 @@ gr_complex gsm_receiver_cf::correlate_sequence(const gr_complex * sequence, cons return result; } -// gr_complex gsm_receiver_cf::compute_energy(const gr_complex * input_signal, int length) -// { -// float result = 0; -// int sample_number = 0; -// -// for (int ii = 0; ii < length; ii++) { -// result += input_signal[(ii * d_OSR)]; -// } -// -// return result; -// } - //computes autocorrelation for positive values //TODO consider placing this funtion in a separate class for signal processing inline void gsm_receiver_cf::autocorrelation(const gr_complex * input, gr_complex * out, int length) diff --git a/src/lib/gsm_receiver_cf.h b/src/lib/gsm_receiver_cf.h index 796bb5b..978576b 100644 --- a/src/lib/gsm_receiver_cf.h +++ b/src/lib/gsm_receiver_cf.h @@ -269,9 +269,8 @@ class gsm_receiver_cf : public gr_block int d_bcc; enum states { - //synchronization search part - first_fcch_search, next_fcch_search, sch_search, synchronized - // + first_fcch_search, next_fcch_search, sch_search, //synchronization search part + synchronized //receiver is synchronized in this state } d_state; friend gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, int osr); @@ -290,9 +289,7 @@ class gsm_receiver_cf : public gr_block inline void autocorrelation(const gr_complex * input, gr_complex * out, int length); inline void mafi(const gr_complex * input, int input_length, gr_complex * filter, int filter_length, gr_complex * output); int get_norm_chan_imp_resp(const gr_complex *in, gr_complex * chan_imp_resp, unsigned search_range); - void detect_norm_burst(const gr_complex * in, gr_complex * chan_imp_resp, int burst_start, unsigned char * output_binary); - inline void mafi_norm(const gr_complex * input, int input_length, gr_complex * filter, int filter_length, gr_complex * output); - + public: ~gsm_receiver_cf(); void forecast(int noutput_items, gr_vector_int &ninput_items_required); -- cgit v1.2.3